Remove unneeded export * from augmentation (#5031)

* Remove unneeded export * from augmentation

* Adjust lookup augmentation

packages/api-augment/src/kusama/consts.ts

@@ -10,7 +10,7 @@ import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSys
 export type __AugmentedConst<ApiType extends ApiTypes> = AugmentedConst<ApiType>;
 
 declare module '@polkadot/api-base/types/consts' {
-  export interface AugmentedConsts<ApiType extends ApiTypes> {
+  interface AugmentedConsts<ApiType extends ApiTypes> {
     auctions: {
       /**
        * The number of blocks over which an auction may be retroactively ended.

packages/api-augment/src/kusama/errors.ts

@@ -6,7 +6,7 @@ import type { ApiTypes, AugmentedError } from '@polkadot/api-base/types';
 export type __AugmentedError<ApiType extends ApiTypes> = AugmentedError<ApiType>;
 
 declare module '@polkadot/api-base/types/errors' {
-  export interface AugmentedErrors<ApiType extends ApiTypes> {
+  interface AugmentedErrors<ApiType extends ApiTypes> {
     auctions: {
       /**
        * The para is already leased out for part of this range.

packages/api-augment/src/kusama/events.ts

@@ -11,7 +11,7 @@ import type { FrameSupportScheduleLookupError, FrameSupportTokensMiscBalanceStat
 export type __AugmentedEvent<ApiType extends ApiTypes> = AugmentedEvent<ApiType>;
 
 declare module '@polkadot/api-base/types/events' {
-  export interface AugmentedEvents<ApiType extends ApiTypes> {
+  interface AugmentedEvents<ApiType extends ApiTypes> {
     auctions: {
       /**
        * An auction ended. All funds become unreserved.

packages/api-augment/src/kusama/query.ts

@@ -14,7 +14,7 @@ export type __AugmentedQuery<ApiType extends ApiTypes> = AugmentedQuery<ApiType,
 export type __QueryableStorageEntry<ApiType extends ApiTypes> = QueryableStorageEntry<ApiType>;
 
 declare module '@polkadot/api-base/types/storage' {
-  export interface AugmentedQueries<ApiType extends ApiTypes> {
+  interface AugmentedQueries<ApiType extends ApiTypes> {
     auctions: {
       /**
        * Number of auctions started so far.

packages/api-augment/src/kusama/runtime.ts

@@ -26,7 +26,7 @@ export type __AugmentedCall<ApiType extends ApiTypes> = AugmentedCall<ApiType>;
 export type __DecoratedCallBase<ApiType extends ApiTypes> = DecoratedCallBase<ApiType>;
 
 declare module '@polkadot/api-base/types/calls' {
-  export interface AugmentedCalls<ApiType extends ApiTypes> {
+  interface AugmentedCalls<ApiType extends ApiTypes> {
     /** 0xbc9d89904f5b923f/1 */
     accountNonceApi: {
       /**

packages/api-augment/src/kusama/tx.ts

@@ -14,7 +14,7 @@ export type __SubmittableExtrinsic<ApiType extends ApiTypes> = SubmittableExtrin
 export type __SubmittableExtrinsicFunction<ApiType extends ApiTypes> = SubmittableExtrinsicFunction<ApiType>;
 
 declare module '@polkadot/api-base/types/submittable' {
-  export interface AugmentedSubmittables<ApiType extends ApiTypes> {
+  interface AugmentedSubmittables<ApiType extends ApiTypes> {
     auctions: {
       /**
        * Make a new bid from an account (including a parachain account) for deploying a new

packages/api-augment/src/polkadot/consts.ts

@@ -10,7 +10,7 @@ import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSys
 export type __AugmentedConst<ApiType extends ApiTypes> = AugmentedConst<ApiType>;
 
 declare module '@polkadot/api-base/types/consts' {
-  export interface AugmentedConsts<ApiType extends ApiTypes> {
+  interface AugmentedConsts<ApiType extends ApiTypes> {
     auctions: {
       /**
        * The number of blocks over which an auction may be retroactively ended.

packages/api-augment/src/polkadot/errors.ts

@@ -6,7 +6,7 @@ import type { ApiTypes, AugmentedError } from '@polkadot/api-base/types';
 export type __AugmentedError<ApiType extends ApiTypes> = AugmentedError<ApiType>;
 
 declare module '@polkadot/api-base/types/errors' {
-  export interface AugmentedErrors<ApiType extends ApiTypes> {
+  interface AugmentedErrors<ApiType extends ApiTypes> {
     auctions: {
       /**
        * The para is already leased out for part of this range.

packages/api-augment/src/polkadot/events.ts

@@ -11,7 +11,7 @@ import type { FrameSupportScheduleLookupError, FrameSupportTokensMiscBalanceStat
 export type __AugmentedEvent<ApiType extends ApiTypes> = AugmentedEvent<ApiType>;
 
 declare module '@polkadot/api-base/types/events' {
-  export interface AugmentedEvents<ApiType extends ApiTypes> {
+  interface AugmentedEvents<ApiType extends ApiTypes> {
     auctions: {
       /**
        * An auction ended. All funds become unreserved.

packages/api-augment/src/polkadot/query.ts

@@ -14,7 +14,7 @@ export type __AugmentedQuery<ApiType extends ApiTypes> = AugmentedQuery<ApiType,
 export type __QueryableStorageEntry<ApiType extends ApiTypes> = QueryableStorageEntry<ApiType>;
 
 declare module '@polkadot/api-base/types/storage' {
-  export interface AugmentedQueries<ApiType extends ApiTypes> {
+  interface AugmentedQueries<ApiType extends ApiTypes> {
     auctions: {
       /**
        * Number of auctions started so far.

packages/api-augment/src/polkadot/runtime.ts

@@ -26,7 +26,7 @@ export type __AugmentedCall<ApiType extends ApiTypes> = AugmentedCall<ApiType>;
 export type __DecoratedCallBase<ApiType extends ApiTypes> = DecoratedCallBase<ApiType>;
 
 declare module '@polkadot/api-base/types/calls' {
-  export interface AugmentedCalls<ApiType extends ApiTypes> {
+  interface AugmentedCalls<ApiType extends ApiTypes> {
     /** 0xbc9d89904f5b923f/1 */
     accountNonceApi: {
       /**

packages/api-augment/src/polkadot/tx.ts

@@ -14,7 +14,7 @@ export type __SubmittableExtrinsic<ApiType extends ApiTypes> = SubmittableExtrin
 export type __SubmittableExtrinsicFunction<ApiType extends ApiTypes> = SubmittableExtrinsicFunction<ApiType>;
 
 declare module '@polkadot/api-base/types/submittable' {
-  export interface AugmentedSubmittables<ApiType extends ApiTypes> {
+  interface AugmentedSubmittables<ApiType extends ApiTypes> {
     auctions: {
       /**
        * Make a new bid from an account (including a parachain account) for deploying a new

packages/api-augment/src/substrate/consts.ts

@@ -10,7 +10,7 @@ import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSys
 export type __AugmentedConst<ApiType extends ApiTypes> = AugmentedConst<ApiType>;
 
 declare module '@polkadot/api-base/types/consts' {
-  export interface AugmentedConsts<ApiType extends ApiTypes> {
+  interface AugmentedConsts<ApiType extends ApiTypes> {
     alliance: {
       /**
        * The deposit required for submitting candidacy.

packages/api-augment/src/substrate/errors.ts

@@ -6,7 +6,7 @@ import type { ApiTypes, AugmentedError } from '@polkadot/api-base/types';
 export type __AugmentedError<ApiType extends ApiTypes> = AugmentedError<ApiType>;
 
 declare module '@polkadot/api-base/types/errors' {
-  export interface AugmentedErrors<ApiType extends ApiTypes> {
+  interface AugmentedErrors<ApiType extends ApiTypes> {
     alliance: {
       /**
        * Account has been deemed unscrupulous by the Alliance and is not welcome to join or be

packages/api-augment/src/substrate/events.ts

@@ -10,7 +10,7 @@ import type { FrameSupportScheduleLookupError, FrameSupportTokensMiscBalanceStat
 export type __AugmentedEvent<ApiType extends ApiTypes> = AugmentedEvent<ApiType>;
 
 declare module '@polkadot/api-base/types/events' {
-  export interface AugmentedEvents<ApiType extends ApiTypes> {
+  interface AugmentedEvents<ApiType extends ApiTypes> {
     alliance: {
       /**
        * An ally has been elevated to Fellow.

packages/api-augment/src/substrate/query.ts

@@ -13,7 +13,7 @@ export type __AugmentedQuery<ApiType extends ApiTypes> = AugmentedQuery<ApiType,
 export type __QueryableStorageEntry<ApiType extends ApiTypes> = QueryableStorageEntry<ApiType>;
 
 declare module '@polkadot/api-base/types/storage' {
-  export interface AugmentedQueries<ApiType extends ApiTypes> {
+  interface AugmentedQueries<ApiType extends ApiTypes> {
     alliance: {
       /**
        * The current IPFS CIDs of any announcements.

packages/api-augment/src/substrate/runtime.ts

@@ -24,7 +24,7 @@ export type __AugmentedCall<ApiType extends ApiTypes> = AugmentedCall<ApiType>;
 export type __DecoratedCallBase<ApiType extends ApiTypes> = DecoratedCallBase<ApiType>;
 
 declare module '@polkadot/api-base/types/calls' {
-  export interface AugmentedCalls<ApiType extends ApiTypes> {
+  interface AugmentedCalls<ApiType extends ApiTypes> {
     /** 0xbc9d89904f5b923f/1 */
     accountNonceApi: {
       /**

packages/api-augment/src/substrate/tx.ts

@@ -13,7 +13,7 @@ export type __SubmittableExtrinsic<ApiType extends ApiTypes> = SubmittableExtrin
 export type __SubmittableExtrinsicFunction<ApiType extends ApiTypes> = SubmittableExtrinsicFunction<ApiType>;
 
 declare module '@polkadot/api-base/types/submittable' {
-  export interface AugmentedSubmittables<ApiType extends ApiTypes> {
+  interface AugmentedSubmittables<ApiType extends ApiTypes> {
     alliance: {
       /**
        * Add accounts or websites to the list of unscrupulous items.

packages/rpc-augment/src/augment/jsonrpc.ts

@@ -27,7 +27,7 @@ import type { ApplyExtrinsicResult, ChainProperties, ChainType, Health, NetworkS
 import type { IExtrinsic, Observable } from '@polkadot/types/types';
 
 declare module '@polkadot/rpc-core/types/jsonrpc' {
-  export interface RpcInterface {
+  interface RpcInterface {
     author: {
       /**
        * Returns true if the keystore has private keys for the given public key and key type.

packages/typegen/src/generate/lookup.ts

@@ -188,13 +188,16 @@ function generateLookupTypes (registry: Registry, filtered: [PortableType, TypeD
     ),
     interfaces: []
   };
-  const items = filtered.map(([, typeDef]) => {
-    typeDef.name = typeDef.lookupName;
+  const items = filtered
+    .map(([, typeDef]) => {
+      typeDef.name = typeDef.lookupName;
 
-    return typeDef.lookupNameRoot && typeDef.lookupName
-      ? exportInterface(typeDef.lookupIndex, typeDef.lookupName, typeDef.lookupNameRoot)
-      : typeEncoders[typeDef.info](registry, imports.definitions, typeDef, imports);
-  }).filter((t): t is string => !!t);
+      return typeDef.lookupNameRoot && typeDef.lookupName
+        ? exportInterface(typeDef.lookupIndex, typeDef.lookupName, typeDef.lookupNameRoot)
+        : typeEncoders[typeDef.info](registry, imports.definitions, typeDef, imports);
+    })
+    .filter((t): t is string => !!t)
+    .map((t) => t.replace(/\nexport /, '\n'));
 
   writeFile(path.join(destDir, `types${subPath ? `-${subPath}` : ''}.ts`), () => generateLookupTypesTmpl({
     headerType: 'defs',

packages/typegen/src/templates/calls.hbs

@@ -6,7 +6,7 @@ export type __AugmentedCall<ApiType extends ApiTypes> = AugmentedCall<ApiType>;
 export type __DecoratedCallBase<ApiType extends ApiTypes> = DecoratedCallBase<ApiType>;
 
 declare module '@polkadot/api-base/types/calls' {
-  export interface AugmentedCalls<ApiType extends ApiTypes> {
+  interface AugmentedCalls<ApiType extends ApiTypes> {
     {{#each modules}}
     /** {{{sectionHash}}}/{{{sectionVersion}}} */
     {{{name}}}: {

packages/typegen/src/templates/consts.hbs

@@ -5,7 +5,7 @@
 export type __AugmentedConst<ApiType extends ApiTypes> = AugmentedConst<ApiType>;
 
 declare module '@polkadot/api-base/types/consts' {
-  export interface AugmentedConsts<ApiType extends ApiTypes> {
+  interface AugmentedConsts<ApiType extends ApiTypes> {
     {{#each modules}}
     {{{name}}}: {
       {{#each items}}

packages/typegen/src/templates/errors.hbs

@@ -5,7 +5,7 @@
 export type __AugmentedError<ApiType extends ApiTypes> = AugmentedError<ApiType>;
 
 declare module '@polkadot/api-base/types/errors' {
-  export interface AugmentedErrors<ApiType extends ApiTypes> {
+  interface AugmentedErrors<ApiType extends ApiTypes> {
     {{#each modules}}
     {{{name}}}: {
       {{#each items}}

packages/typegen/src/templates/events.hbs

@@ -5,7 +5,7 @@
 export type __AugmentedEvent<ApiType extends ApiTypes> = AugmentedEvent<ApiType>;
 
 declare module '@polkadot/api-base/types/events' {
-  export interface AugmentedEvents<ApiType extends ApiTypes> {
+  interface AugmentedEvents<ApiType extends ApiTypes> {
     {{#each modules}}
     {{{name}}}: {
       {{#each items}}

packages/typegen/src/templates/interfaceRegistry.hbs

@@ -3,7 +3,7 @@
 {{{ importsAll }}}
 
 declare module '@polkadot/types/types/registry' {
-  export interface InterfaceTypes {
+  interface InterfaceTypes {
     {{#each items}}
     {{{this}}}: {{{this}}};
     {{/each}}

packages/typegen/src/templates/query.hbs

@@ -6,7 +6,7 @@ export type __AugmentedQuery<ApiType extends ApiTypes> = AugmentedQuery<ApiType,
 export type __QueryableStorageEntry<ApiType extends ApiTypes> = QueryableStorageEntry<ApiType>;
 
 declare module '@polkadot/api-base/types/storage' {
-  export interface AugmentedQueries<ApiType extends ApiTypes> {
+  interface AugmentedQueries<ApiType extends ApiTypes> {
     {{#each modules}}
     {{{name}}}: {
       {{#each items}}

packages/typegen/src/templates/rpc.hbs

@@ -3,7 +3,7 @@
 {{{ importsAll }}}
 
 declare module '@polkadot/rpc-core/types/jsonrpc' {
-  export interface RpcInterface {
+  interface RpcInterface {
     {{#each modules}}
     {{{name}}}: {
       {{#each items}}

packages/typegen/src/templates/tx.hbs

@@ -7,7 +7,7 @@ export type __SubmittableExtrinsic<ApiType extends ApiTypes> = SubmittableExtrin
 export type __SubmittableExtrinsicFunction<ApiType extends ApiTypes> = SubmittableExtrinsicFunction<ApiType>;
 
 declare module '@polkadot/api-base/types/submittable' {
-  export interface AugmentedSubmittables<ApiType extends ApiTypes> {
+  interface AugmentedSubmittables<ApiType extends ApiTypes> {
     {{#each modules}}
     {{{name}}}: {
       {{#each items}}

packages/types-augment/src/lookup/types-kusama.ts

@@ -7,7 +7,7 @@ import type { PerU16 } from '@polkadot/types/interfaces/runtime';
 
 declare module '@polkadot/types/lookup' {
   /** @name KusamaRuntimeProxyType (80) */
-  export interface KusamaRuntimeProxyType extends Enum {
+  interface KusamaRuntimeProxyType extends Enum {
     readonly isAny: boolean;
     readonly isNonTransfer: boolean;
     readonly isGovernance: boolean;
@@ -20,7 +20,7 @@ declare module '@polkadot/types/lookup' {
   }
 
   /** @name KusamaRuntimeSessionKeys (261) */
-  export interface KusamaRuntimeSessionKeys extends Struct {
+  interface KusamaRuntimeSessionKeys extends Struct {
     readonly grandpa: SpFinalityGrandpaAppPublic;
     readonly babe: SpConsensusBabeAppPublic;
     readonly imOnline: PalletImOnlineSr25519AppSr25519Public;
@@ -30,7 +30,7 @@ declare module '@polkadot/types/lookup' {
   }
 
   /** @name KusamaRuntimeOriginCaller (335) */
-  export interface KusamaRuntimeOriginCaller extends Enum {
+  interface KusamaRuntimeOriginCaller extends Enum {
     readonly isSystem: boolean;
     readonly asSystem: FrameSupportDispatchRawOrigin;
     readonly isVoid: boolean;
@@ -46,7 +46,7 @@ declare module '@polkadot/types/lookup' {
   }
 
   /** @name KusamaRuntimeNposCompactSolution24 (401) */
-  export interface KusamaRuntimeNposCompactSolution24 extends Struct {
+  interface KusamaRuntimeNposCompactSolution24 extends Struct {
     readonly votes1: Vec<ITuple<[Compact<u32>, Compact<u16>]>>;
     readonly votes2: Vec<ITuple<[Compact<u32>, ITuple<[Compact<u16>, Compact<PerU16>]>, Compact<u16>]>>;
     readonly votes3: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
@@ -74,6 +74,6 @@ declare module '@polkadot/types/lookup' {
   }
 
   /** @name KusamaRuntimeRuntime (779) */
-  export type KusamaRuntimeRuntime = Null;
+  type KusamaRuntimeRuntime = Null;
 
 } // declare module

packages/types-augment/src/registry/interfaces.ts

@@ -65,7 +65,7 @@ import type { VestingInfo } from '@polkadot/types/interfaces/vesting';
 import type { AssetInstance, AssetInstanceV0, AssetInstanceV1, AssetInstanceV2, BodyId, BodyPart, DoubleEncodedCall, Fungibility, FungibilityV0, FungibilityV1, FungibilityV2, InboundStatus, InstructionV2, InteriorMultiLocation, Junction, JunctionV0, JunctionV1, JunctionV2, Junctions, JunctionsV1, JunctionsV2, MultiAsset, MultiAssetFilter, MultiAssetFilterV1, MultiAssetFilterV2, MultiAssetV0, MultiAssetV1, MultiAssetV2, MultiAssets, MultiAssetsV1, MultiAssetsV2, MultiLocation, MultiLocationV0, MultiLocationV1, MultiLocationV2, NetworkId, OriginKindV0, OriginKindV1, OriginKindV2, OutboundStatus, Outcome, QueryId, QueryStatus, QueueConfigData, Response, ResponseV0, ResponseV1, ResponseV2, ResponseV2Error, ResponseV2Result, VersionMigrationStage, VersionedMultiAsset, VersionedMultiAssets, VersionedMultiLocation, VersionedResponse, VersionedXcm, WeightLimitV2, WildFungibility, WildFungibilityV0, WildFungibilityV1, WildFungibilityV2, WildMultiAsset, WildMultiAssetV1, WildMultiAssetV2, Xcm, XcmAssetId, XcmError, XcmErrorV0, XcmErrorV1, XcmErrorV2, XcmOrder, XcmOrderV0, XcmOrderV1, XcmOrderV2, XcmOrigin, XcmOriginKind, XcmV0, XcmV1, XcmV2, XcmVersion, XcmpMessageFormat } from '@polkadot/types/interfaces/xcm';
 
 declare module '@polkadot/types/types/registry' {
-  export interface InterfaceTypes {
+  interface InterfaceTypes {
     AbridgedCandidateReceipt: AbridgedCandidateReceipt;
     AbridgedHostConfiguration: AbridgedHostConfiguration;
     AbridgedHrmpChannel: AbridgedHrmpChannel;

packages/types-augment/src/registry/kusama.ts

@@ -4,7 +4,7 @@
 import type { KusamaRuntimeNposCompactSolution24, KusamaRuntimeOriginCaller, KusamaRuntimeProxyType, KusamaRuntimeRuntime, KusamaRuntimeSessionKeys } from '@polkadot/types/lookup';
 
 declare module '@polkadot/types/types/registry' {
-  export interface InterfaceTypes {
+  interface InterfaceTypes {
     KusamaRuntimeNposCompactSolution24: KusamaRuntimeNposCompactSolution24;
     KusamaRuntimeOriginCaller: KusamaRuntimeOriginCaller;
     KusamaRuntimeProxyType: KusamaRuntimeProxyType;