API optional augmentation (#4355)

* API optional augmentation

* Rebuild

* Rebuild

* Cleanups

* Adjust, no multi-imports

* Adjust

* Adjust

* Dedupe

* Augmented exports

* It builds via references (no circulars)

* Don't output *.manual.{js,cjs}

package.json

@@ -34,7 +34,7 @@
     "@babel/core": "^7.16.5",
     "@babel/register": "^7.16.5",
     "@babel/runtime": "^7.16.5",
-    "@polkadot/dev": "^0.64.5",
+    "@polkadot/dev": "^0.64.6",
     "@polkadot/ts": "^0.4.20",
     "@polkadot/typegen": "workspace:packages/typegen",
     "@types/jest": "^27.0.3",

packages/api-augment/package.json

@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/runtime": "^7.16.5",
     "@polkadot/api-base": "6.12.2-20",
-    "@polkadot/rpc-core": "6.12.2-20",
-    "@polkadot/types": "6.12.2-20"
+    "@polkadot/types": "6.12.2-20",
+    "@polkadot/types-codec": "6.12.2-20"
   }
 }

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

@@ -1,31 +0,0 @@
-// Copyright 2017-2021 @polkadot/api-augment authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Observable } from 'rxjs';
-import type { QueryableConsts } from '@polkadot/api-augment/consts';
-import type { QueryableStorage } from '@polkadot/api-augment/query';
-import type { SubmittableExtrinsics } from '@polkadot/api-augment/tx';
-import type { DecoratedRpc, QueryableStorageMulti } from '@polkadot/api-base/types';
-import type { RpcInterface } from '@polkadot/rpc-core/types';
-import type { Metadata } from '@polkadot/types';
-import type { Hash, RuntimeVersion } from '@polkadot/types/interfaces';
-import type { Registry, Signer } from '@polkadot/types/types';
-
-declare module '@polkadot/api-base/types/api' {
-  // A smaller interface of ApiRx, used in derive and in SubmittableExtrinsic
-  export interface ApiInterfaceRx {
-    consts: QueryableConsts<'rxjs'>;
-    extrinsicType: number;
-    genesisHash?: Hash;
-    hasSubscriptions: boolean;
-    registry: Registry;
-    runtimeMetadata: Metadata;
-    runtimeVersion: RuntimeVersion;
-    query: QueryableStorage<'rxjs'>;
-    queryAt: (blockHash: Uint8Array | string, knownVersion?: RuntimeVersion) => Observable<QueryableStorage<'rxjs'>>;
-    queryMulti: QueryableStorageMulti<'rxjs'>;
-    rpc: DecoratedRpc<'rxjs', RpcInterface>;
-    tx: SubmittableExtrinsics<'rxjs'>;
-    signer?: Signer;
-  }
-}

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

@@ -1,5 +1,4 @@
 // Copyright 2017-2021 @polkadot/api-augment authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// augmented
-export const __API_AUGMENT_TX = 'augmented';
+import '@polkadot/types-augment';

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

@@ -1,14 +1,14 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
-import type { ApiTypes, AugmentedConst, QueryableModuleConsts } from '@polkadot/api-base/types';
+import type { ApiTypes } from '@polkadot/api-base/types';
 import type { U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { Codec } from '@polkadot/types-codec/types';
 import type { Perbill, Percent, Permill } from '@polkadot/types/interfaces/runtime';
 import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, PalletContractsSchedule, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
 
-declare module '@polkadot/api-augment/consts' {
-  export interface AugmentedConsts<ApiType  extends ApiTypes> {
+declare module '@polkadot/api-base/types/consts' {
+  export interface AugmentedConsts<ApiType extends ApiTypes> {
     assets: {
       /**
        * The amount of funds that must be reserved when creating a new approval.
@@ -951,9 +951,4 @@ declare module '@polkadot/api-augment/consts' {
       [key: string]: Codec;
     };
   } // AugmentedConsts
-
-  export interface QueryableConsts<ApiType extends ApiTypes> extends AugmentedConsts<ApiType> {
-    [key: string]: QueryableModuleConsts;
-  } // QueryableConsts
-
 } // declare module

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

@@ -1,9 +1,9 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
-import type { ApiTypes, AugmentedError, ModuleErrors } from '@polkadot/api-base/types';
+import type { ApiTypes } from '@polkadot/api-base/types';
 
-declare module '@polkadot/api-augment/errors' {
+declare module '@polkadot/api-base/types/errors' {
   export interface AugmentedErrors<ApiType extends ApiTypes> {
     assets: {
       /**
@@ -1559,9 +1559,4 @@ declare module '@polkadot/api-augment/errors' {
       [key: string]: AugmentedError<ApiType>;
     };
   } // AugmentedErrors
-
-  export interface DecoratedErrors<ApiType extends ApiTypes> extends AugmentedErrors<ApiType> {
-    [key: string]: ModuleErrors<ApiType>;
-  } // DecoratedErrors
-
 } // declare module

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

@@ -1,13 +1,13 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
-import type { ApiTypes, AugmentedEvent, ModuleEvents } from '@polkadot/api-base/types';
+import type { ApiTypes } from '@polkadot/api-base/types';
 import type { Bytes, Null, Option, Result, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountId32, H256 } from '@polkadot/types/interfaces/runtime';
 import type { FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchInfo, NodeRuntimeProxyType, PalletDemocracyVoteAccountVote, PalletDemocracyVoteThreshold, PalletElectionProviderMultiPhaseElectionCompute, PalletImOnlineSr25519AppSr25519Public, PalletMultisigTimepoint, PalletStakingExposure, SpFinalityGrandpaAppPublic, SpRuntimeDispatchError } from '@polkadot/types/lookup';
 
-declare module '@polkadot/api-augment/events' {
+declare module '@polkadot/api-base/types/events' {
   export interface AugmentedEvents<ApiType extends ApiTypes> {
     assets: {
       /**
@@ -1154,9 +1154,4 @@ declare module '@polkadot/api-augment/events' {
       [key: string]: AugmentedEvent<ApiType>;
     };
   } // AugmentedEvents
-
-  export interface DecoratedEvents<ApiType extends ApiTypes> extends AugmentedEvents<ApiType> {
-    [key: string]: ModuleEvents<ApiType>;
-  } // DecoratedEvents
-
 } // declare module

packages/api-augment/src/augment/index.ts

@@ -1,12 +1,10 @@
 // Copyright 2017-2021 @polkadot/api-augment authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import '@polkadot/rpc-augment';
 import '@polkadot/types-augment';
 import './consts';
 import './errors';
 import './events';
 import './query';
 import './tx';
-// these are external to this module
-import './api';
-import './rpc';

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

@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
-import type { ApiTypes, AugmentedQuery, QueryableModuleStorage, QueryableModuleStorageAt, QueryableStorageEntry } from '@polkadot/api-base/types';
+import type { ApiTypes } from '@polkadot/api-base/types';
 import type { Data } from '@polkadot/types';
 import type { BTreeMap, Bytes, Null, Option, U8aFixed, Vec, WrapperOpaque, bool, u128, u32, u64, u8 } from '@polkadot/types-codec';
 import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';
@@ -9,7 +9,7 @@ import type { AccountId32, Call, H256, Perbill, Percent } from '@polkadot/types/
 import type { FrameSupportWeightsPerDispatchClassU64, FrameSystemAccountInfo, FrameSystemEventRecord, FrameSystemLastRuntimeUpgradeInfo, FrameSystemPhase, NodeRuntimeSessionKeys, PalletAssetsApproval, PalletAssetsAssetBalance, PalletAssetsAssetDetails, PalletAssetsAssetMetadata, PalletAuthorshipUncleEntryItem, PalletBagsListListBag, PalletBagsListListNode, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesReleases, PalletBalancesReserveData, PalletBountiesBounty, PalletChildBountiesChildBounty, PalletCollectiveVotes, PalletContractsStorageDeletedContract, PalletContractsStorageRawContractInfo, PalletContractsWasmOwnerInfo, PalletContractsWasmPrefabWasmModule, PalletDemocracyPreimageStatus, PalletDemocracyReferendumInfo, PalletDemocracyReleases, PalletDemocracyVoteThreshold, PalletDemocracyVoteVoting, PalletElectionProviderMultiPhasePhase, PalletElectionProviderMultiPhaseReadySolution, PalletElectionProviderMultiPhaseRoundSnapshot, PalletElectionProviderMultiPhaseSignedSignedSubmission, PalletElectionProviderMultiPhaseSolutionOrSnapshotSize, PalletElectionsPhragmenSeatHolder, PalletElectionsPhragmenVoter, PalletGiltActiveGilt, PalletGiltActiveGiltsTotal, PalletGiltGiltBid, PalletGrandpaStoredPendingChange, PalletGrandpaStoredState, PalletIdentityRegistrarInfo, PalletIdentityRegistration, PalletImOnlineBoundedOpaqueNetworkState, PalletImOnlineSr25519AppSr25519Public, PalletLotteryLotteryConfig, PalletMultisigMultisig, PalletProxyAnnouncement, PalletProxyProxyDefinition, PalletRecoveryActiveRecovery, PalletRecoveryRecoveryConfig, PalletSchedulerReleases, PalletSchedulerScheduledV2, PalletSocietyBid, PalletSocietyBidKind, PalletSocietyVote, PalletSocietyVouchingStatus, PalletStakingActiveEraInfo, PalletStakingEraRewardPoints, PalletStakingExposure, PalletStakingForcing, PalletStakingNominations, PalletStakingReleases, PalletStakingRewardDestination, PalletStakingSlashingSlashingSpans, PalletStakingSlashingSpanRecord, PalletStakingStakingLedger, PalletStakingUnappliedSlash, PalletStakingValidatorPrefs, PalletTipsOpenTip, PalletTransactionPaymentReleases, PalletTransactionStorageTransactionInfo, PalletTreasuryProposal, PalletUniquesClassDetails, PalletUniquesClassMetadata, PalletUniquesInstanceDetails, PalletUniquesInstanceMetadata, PalletVestingReleases, PalletVestingVestingInfo, SpAuthorityDiscoveryAppPublic, SpConsensusBabeAppPublic, SpConsensusBabeBabeEpochConfiguration, SpConsensusBabeDigestsNextConfigDescriptor, SpCoreCryptoKeyTypeId, SpRuntimeDigest, SpStakingOffenceOffenceDetails } from '@polkadot/types/lookup';
 import type { Observable } from '@polkadot/types/types';
 
-declare module '@polkadot/api-augment/query' {
+declare module '@polkadot/api-base/types/storage' {
   export interface AugmentedQueries<ApiType extends ApiTypes> {
     assets: {
       /**
@@ -1450,13 +1450,4 @@ declare module '@polkadot/api-augment/query' {
       [key: string]: QueryableStorageEntry<ApiType>;
     };
   } // AugmentedQueries
-
-  export interface QueryableStorage<ApiType extends ApiTypes> extends AugmentedQueries<ApiType> {
-    [key: string]: QueryableModuleStorage<ApiType>;
-  } // QueryableStorage
-
-  export interface QueryableStorageAt<ApiType extends ApiTypes> extends AugmentedQueries<ApiType> {
-    [key: string]: QueryableModuleStorageAt<ApiType>;
-  } // QueryableStorageAt
-
 } // declare module

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

@@ -1,15 +1,14 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
-import type { ApiTypes, AugmentedSubmittable, SubmittableExtrinsic, SubmittableExtrinsicFunction, SubmittableModuleExtrinsics } from '@polkadot/api-base/types';
+import type { ApiTypes } from '@polkadot/api-base/types';
 import type { Data } from '@polkadot/types';
 import type { Bytes, Compact, Option, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';
-import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics';
 import type { AccountId32, Call, H256, MultiAddress, Perbill, Percent, Perquintill } from '@polkadot/types/interfaces/runtime';
 import type { NodeRuntimeOriginCaller, NodeRuntimeProxyType, NodeRuntimeSessionKeys, PalletAssetsDestroyWitness, PalletDemocracyConviction, PalletDemocracyVoteAccountVote, PalletElectionProviderMultiPhaseRawSolution, PalletElectionProviderMultiPhaseSolutionOrSnapshotSize, PalletElectionsPhragmenRenouncing, PalletIdentityBitFlags, PalletIdentityIdentityInfo, PalletIdentityJudgement, PalletImOnlineHeartbeat, PalletImOnlineSr25519AppSr25519Signature, PalletMultisigTimepoint, PalletSocietyJudgement, PalletStakingRewardDestination, PalletStakingValidatorPrefs, PalletUniquesDestroyWitness, PalletVestingVestingInfo, SpConsensusBabeDigestsNextConfigDescriptor, SpConsensusSlotsEquivocationProof, SpFinalityGrandpaEquivocationProof, SpNposElectionsSupport, SpRuntimeHeader, SpSessionMembershipProof, SpTransactionStorageProofTransactionStorageProof } from '@polkadot/types/lookup';
 
-declare module '@polkadot/api-augment/tx' {
+declare module '@polkadot/api-base/types/submittable' {
   export interface AugmentedSubmittables<ApiType extends ApiTypes> {
     assets: {
       /**
@@ -4655,10 +4654,4 @@ declare module '@polkadot/api-augment/tx' {
       [key: string]: SubmittableExtrinsicFunction<ApiType>;
     };
   } // AugmentedSubmittables
-
-  export interface SubmittableExtrinsics<ApiType extends ApiTypes> extends AugmentedSubmittables<ApiType> {
-    (extrinsic: Call | Extrinsic | Uint8Array | string): SubmittableExtrinsic<ApiType>;
-    [key: string]: SubmittableModuleExtrinsics<ApiType>;
-  } // SubmittableExtrinsics
-
 } // declare module

packages/api-augment/src/bundle.ts

@@ -1,9 +1,6 @@
 // Copyright 2017-2021 @polkadot/api-augment authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// trigger in the same way as we do externally
 import './augment';
 
 export { packageInfo } from './packageInfo';
-
-export * from './types';

packages/api-augment/src/consts.ts

@@ -1,5 +0,0 @@
-// Copyright 2017-2021 @polkadot/api-augment authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-// augmented
-export const __API_AUGMENT_CONSTS = 'augmented';

packages/api-augment/src/detectPackage.ts

@@ -1,10 +1,10 @@
 // Copyright 2017-2021 @polkadot/api-augment authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { packageInfo as rpcInfo } from '@polkadot/rpc-core/packageInfo';
+import { packageInfo as baseInfo } from '@polkadot/api-base/packageInfo';
 import { packageInfo as typesInfo } from '@polkadot/types/packageInfo';
 import { detectPackage } from '@polkadot/util';
 
 import { packageInfo } from './packageInfo';
 
-detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [rpcInfo, typesInfo]);
+detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [baseInfo, typesInfo]);

packages/api-augment/src/events.ts

@@ -1,5 +0,0 @@
-// Copyright 2017-2021 @polkadot/api-augment authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-// augmented
-export const __API_AUGMENT_EVENTS = 'augmented';

packages/api-augment/src/types.ts

@@ -1,12 +0,0 @@
-// Copyright 2017-2021 @polkadot/api-augment authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-// trigger in the same way as we do externally
-import '@polkadot/api-augment';
-
-// Important: we do the exports here via the full package name
-export * from '@polkadot/api-augment/consts';
-export * from '@polkadot/api-augment/errors';
-export * from '@polkadot/api-augment/events';
-export * from '@polkadot/api-augment/query';
-export * from '@polkadot/api-augment/tx';

packages/api-augment/tsconfig.json

@@ -7,6 +7,7 @@
   },
   "references": [
     { "path": "../api-base" },
+    { "path": "../rpc-augment" },
     { "path": "../rpc-core" },
     { "path": "../types" },
     { "path": "../types-augment" }

packages/api-base/src/types/api.ts

@@ -1,4 +1,26 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export const __API_BASE_TYPES_API = 'empty';
+import type { Observable } from 'rxjs';
+import type { DecoratedRpc, QueryableConsts, QueryableStorage, QueryableStorageMulti, SubmittableExtrinsics } from '@polkadot/api-base/types';
+import type { RpcInterface } from '@polkadot/rpc-core/types';
+import type { Metadata } from '@polkadot/types';
+import type { Hash, RuntimeVersion } from '@polkadot/types/interfaces';
+import type { Registry, Signer } from '@polkadot/types/types';
+
+// A smaller interface of ApiRx, used in derive and in SubmittableExtrinsic
+export interface ApiInterfaceRx {
+  consts: QueryableConsts<'rxjs'>;
+  extrinsicType: number;
+  genesisHash?: Hash;
+  hasSubscriptions: boolean;
+  registry: Registry;
+  runtimeMetadata: Metadata;
+  runtimeVersion: RuntimeVersion;
+  query: QueryableStorage<'rxjs'>;
+  queryAt: (blockHash: Uint8Array | string, knownVersion?: RuntimeVersion) => Observable<QueryableStorage<'rxjs'>>;
+  queryMulti: QueryableStorageMulti<'rxjs'>;
+  rpc: DecoratedRpc<'rxjs', RpcInterface>;
+  tx: SubmittableExtrinsics<'rxjs'>;
+  signer?: Signer;
+}

packages/api-base/src/types/base.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';

packages/api-base/src/types/consts.ts

@@ -1,10 +1,20 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { PalletConstantMetadataLatest } from '@polkadot/types/interfaces';
 import type { Codec } from '@polkadot/types/types';
 import type { ApiTypes } from './base';
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-interface
+export interface AugmentedConsts<ApiType extends ApiTypes> {
+  // augmented
+}
+
+export interface QueryableConsts<ApiType extends ApiTypes> extends AugmentedConsts<ApiType> {
+  // when non-augmented, we need to at least have Codec results
+  [key: string]: QueryableModuleConsts;
+}
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export interface AugmentedConst<ApiType extends ApiTypes> {
   meta: PalletConstantMetadataLatest;

packages/api-base/src/types/derive.ts

@@ -0,0 +1,8 @@
+// Copyright 2017-2021 @polkadot/api-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+
+type DeriveCreator = (instanceId: string, api: unknown) => (...args: unknown[]) => Observable<any>;
+
+export type DeriveCustom = Record<string, Record<string, DeriveCreator>>;

packages/api-base/src/types/errors.ts

@@ -1,9 +1,19 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { IsError } from '@polkadot/types/metadata/decorate/types';
 import type { ApiTypes } from './base';
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-interface
+export interface AugmentedErrors<ApiType extends ApiTypes> {
+  // augmented
+}
+
+export interface DecoratedErrors<ApiType extends ApiTypes> extends AugmentedErrors<ApiType> {
+  // when non-augmented, we need to at least have Codec results
+  [key: string]: ModuleErrors<ApiType>;
+}
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export type AugmentedError<ApiType extends ApiTypes> = IsError;
 

packages/api-base/src/types/events.ts

@@ -1,10 +1,20 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { IsEvent } from '@polkadot/types/metadata/decorate/types';
 import type { AnyTuple } from '@polkadot/types/types';
 import type { ApiTypes } from './base';
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-interface
+export interface AugmentedEvents<ApiType extends ApiTypes> {
+  // augmented
+}
+
+export interface DecoratedEvents<ApiType extends ApiTypes> extends AugmentedEvents<ApiType> {
+  // when non-augmented, we need to at least have Codec results
+  [key: string]: ModuleEvents<ApiType>;
+}
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export type AugmentedEvent<ApiType extends ApiTypes, T extends AnyTuple = AnyTuple> = IsEvent<T>;
 

packages/api-base/src/types/index.ts

@@ -1,13 +1,15 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// this is augmented, do an augmentation export
-export * from '@polkadot/api-base/types/api';
+// These are augmented, do an augmentation export
+export * from '@polkadot/api-base/types/consts';
+export * from '@polkadot/api-base/types/errors';
+export * from '@polkadot/api-base/types/events';
+export * from '@polkadot/api-base/types/storage';
+export * from '@polkadot/api-base/types/submittable';
 
+// normal exports
+export * from './api';
 export * from './base';
-export * from './consts';
-export * from './errors';
-export * from './events';
+export * from './derive';
 export * from './rpc';
-export * from './storage';
-export * from './submittable';

packages/api-base/src/types/rpc.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';

packages/api-base/src/types/storage.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
@@ -8,6 +8,20 @@ import type { StorageEntry } from '@polkadot/types/primitive/types';
 import type { AnyFunction, AnyTuple, Callback, Codec, IStorageKey } from '@polkadot/types/types';
 import type { ApiTypes, DropLast, MethodResult, ObsInnerType, PaginationOptions, PromiseOrObs, UnsubscribePromise } from './base';
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-interface
+export interface AugmentedQueries<ApiType extends ApiTypes> {
+  // augmented
+}
+
+export interface QueryableStorage<ApiType extends ApiTypes> extends AugmentedQueries<ApiType> {
+  // when non-augmented, we need to at least have Codec results
+  [key: string]: QueryableModuleStorage<ApiType>;
+}
+
+export interface QueryableStorageAt<ApiType extends ApiTypes> extends AugmentedQueries<ApiType> {
+  [key: string]: QueryableModuleStorageAt<ApiType>;
+}
+
 type AsCodec<R extends Codec | any> = R extends Codec
   ? R
   : Codec;
@@ -90,11 +104,11 @@ export interface StorageEntryBaseAt<ApiType extends ApiTypes, F extends AnyFunct
 }
 
 export interface QueryableModuleStorage<ApiType extends ApiTypes> {
-  [index: string]: QueryableStorageEntry<ApiType, AnyTuple>;
+  [key: string]: QueryableStorageEntry<ApiType, AnyTuple>;
 }
 
 export interface QueryableModuleStorageAt<ApiType extends ApiTypes> {
-  [index: string]: QueryableStorageEntryAt<ApiType, AnyTuple>;
+  [key: string]: QueryableStorageEntryAt<ApiType, AnyTuple>;
 }
 
 export type QueryableStorageMultiArg<ApiType extends ApiTypes> =

packages/api-base/src/types/submittable.ts

@@ -1,11 +1,22 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import type { AccountId, Address, ApplyExtrinsicResult, DispatchError, DispatchInfo, EventRecord, Extrinsic, ExtrinsicStatus, Hash, RuntimeDispatchInfo } from '@polkadot/types/interfaces';
+import type { AccountId, Address, ApplyExtrinsicResult, Call, DispatchError, DispatchInfo, EventRecord, Extrinsic, ExtrinsicStatus, Hash, RuntimeDispatchInfo } from '@polkadot/types/interfaces';
 import type { AnyFunction, AnyNumber, AnyTuple, Callback, CallBase, Codec, IExtrinsicEra, IKeyringPair, ISubmittableResult, Signer } from '@polkadot/types/types';
 import type { ApiTypes, PromiseOrObs } from './base';
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-interface
+export interface AugmentedSubmittables<ApiType extends ApiTypes> {
+  // augmented
+}
+
+export interface SubmittableExtrinsics<ApiType extends ApiTypes> extends AugmentedSubmittables<ApiType> {
+  (extrinsic: Call | Extrinsic | Uint8Array | string): SubmittableExtrinsic<ApiType>;
+  // when non-augmented, we need to at least have Codec results
+  [key: string]: SubmittableModuleExtrinsics<ApiType>;
+}
+
 export type AddressOrPair = IKeyringPair | string | AccountId | Address;
 
 export type AugmentedSubmittable<T extends AnyFunction, A extends AnyTuple = AnyTuple> = T & CallBase<A>;
@@ -30,7 +41,7 @@ export interface SubmittableExtrinsicFunction<ApiType extends ApiTypes, A extend
 
 export interface SubmittableModuleExtrinsics<ApiType extends ApiTypes> {
   // only with is<Type> augmentation
-  [index: string]: SubmittableExtrinsicFunction<ApiType>; // | AugmentedIsSubmittable<ApiType, AnyTuple>;
+  [key: string]: SubmittableExtrinsicFunction<ApiType>;
 }
 
 export type SubmittablePaymentResult<ApiType extends ApiTypes> =

packages/api-contract/src/checkTypes.manual.ts

@@ -3,6 +3,8 @@
 
 // Simple non-runnable checks to test type definitions in the editor itself
 
+import '@polkadot/api-augment';
+
 import { ApiPromise } from '@polkadot/api';
 import { BlueprintPromise, ContractPromise } from '@polkadot/api-contract';
 import { createTestPairs, TestKeyringMap } from '@polkadot/keyring/testingPairs';

packages/api-contract/tsconfig.json

@@ -9,12 +9,14 @@
     "**/test/**/*.json",
     "**/test/**/*.ts",
     "**/test/**/*.wasm",
-    "**/*.manual.ts",
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts",
     "mock.ts"
   ],
   "references": [
     { "path": "../api" },
+    { "path": "../api-augment" },
+    { "path": "../rpc-augment" },
     { "path": "../types" }
   ]
 }

packages/api-contract/tsconfig.spec.json

@@ -12,13 +12,15 @@
     "**/test/**/*.json",
     "**/test/**/*.ts",
     "**/test/**/*.wasm",
-    "**/*.manual.ts",
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts",
     "mock.ts"
   ],
   "references": [
     { "path": "../api" },
+    { "path": "../api-augment" },
     { "path": "../api-contract" },
+    { "path": "../rpc-augment" },
     { "path": "../types" },
     { "path": "../types-augment" }
   ]

packages/api-derive/src/augment.ts

@@ -2,4 +2,3 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import '@polkadot/api-augment';
-import '@polkadot/rpc-augment';

packages/api-derive/src/bundle.ts

@@ -1,8 +1,9 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { DeriveCustom } from '@polkadot/api-base/types';
 import type { AnyFunction } from '@polkadot/types/types';
-import type { DeriveCustom, ExactDerive } from './derive';
+import type { ExactDerive } from './derive';
 import type { DeriveApi } from './types';
 
 import { lazyDeriveSection } from './util/lazy';

packages/api-derive/src/checkTypes.manual.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import './augment';
+import '@polkadot/api-augment';
 
 import { derive } from '.';
 

packages/api-derive/src/derive.ts

@@ -1,7 +1,6 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Observable } from 'rxjs';
 import type { AnyFunction } from '@polkadot/types/types';
 
 import * as accounts from './accounts';
@@ -34,8 +33,4 @@ type DeriveAllSections<AllSections> = {
   [S in keyof AllSections]: DeriveSection<AllSections[S]>
 };
 
-type DeriveCreator = (instanceId: string, api: unknown) => (...args: unknown[]) => Observable<any>;
-
-export type DeriveCustom = Record<string, Record<string, DeriveCreator>>;
-
 export type ExactDerive = DeriveAllSections<typeof derive>;

packages/api-derive/tsconfig.json

@@ -7,12 +7,13 @@
   },
   "exclude": [
     "**/test/*",
-    "**/*.manual.ts",
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts"
   ],
   "references": [
-    { "path": "../api-augment" },
     { "path": "../api-base" },
+    { "path": "../api-augment" },
+    { "path": "../rpc-augment" },
     { "path": "../rpc-core" },
     { "path": "../types" },
     { "path": "../types-codec" }

packages/api-derive/tsconfig.spec.json

@@ -9,7 +9,7 @@
   },
   "include": [
     "**/test/*",
-    "**/*.manual.ts",
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts"
   ],
   "references": [
@@ -17,6 +17,7 @@
     { "path": "../api-augment" },
     { "path": "../api-base" },
     { "path": "../api-derive" },
+    { "path": "../rpc-augment" },
     { "path": "../types" },
     { "path": "../types-augment" },
     { "path": "../types-codec" }

packages/api/src/base/Decorate.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import type { DeriveCustom } from '@polkadot/api-derive';
+import type { DeriveCustom } from '@polkadot/api-base/types';
 import type { RpcInterface } from '@polkadot/rpc-core/types';
 import type { Option, Raw, StorageKey, Text, u64 } from '@polkadot/types';
 import type { Call, Hash, RuntimeVersion } from '@polkadot/types/interfaces';

packages/api/src/checkTypes.manual.ts

@@ -3,7 +3,7 @@
 
 // Simple non-runnable checks to test type definitions in the editor itself
 
-import './augment';
+import '@polkadot/api-augment';
 
 import type { HeaderExtended } from '@polkadot/api-derive/types';
 import type { StorageKey } from '@polkadot/types';

packages/api/src/test/util/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 export * from './logEvents';

packages/api/src/types/consts.ts

@@ -1,5 +1,4 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// import '@polkadot/api-augment';
-import '@polkadot/rpc-augment';
+export * from '@polkadot/api-base/types/consts';

packages/api/src/types/errors.ts

@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/api authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export * from '@polkadot/api-base/types/errors';

packages/api/src/types/events.ts

@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/api authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export * from '@polkadot/api-base/types/events';

packages/api/src/types/index.ts

@@ -1,27 +1,31 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { QueryableConsts } from '@polkadot/api-augment/consts';
-import type { DecoratedErrors } from '@polkadot/api-augment/errors';
-import type { DecoratedEvents } from '@polkadot/api-augment/events';
-import type { QueryableStorage } from '@polkadot/api-augment/query';
-import type { ApiInterfaceRx as ApiInterfaceBase, ApiTypes, QueryableStorageMulti } from '@polkadot/api-base/types';
-import type { DeriveCustom } from '@polkadot/api-derive';
+import type { ApiTypes, DeriveCustom, QueryableStorageMulti } from '@polkadot/api-base/types';
+import type { ApiInterfaceRx as ApiInterfaceBase } from '@polkadot/api-base/types/api';
+import type { QueryableConsts } from '@polkadot/api-base/types/consts';
+import type { DecoratedErrors } from '@polkadot/api-base/types/errors';
+import type { DecoratedEvents } from '@polkadot/api-base/types/events';
+import type { QueryableStorage } from '@polkadot/api-base/types/storage';
 import type { ProviderInterface, ProviderInterfaceEmitted } from '@polkadot/rpc-provider/types';
 import type { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types';
 import type { Hash } from '@polkadot/types/interfaces';
 import type { CallFunction, DefinitionRpc, DefinitionRpcSub, RegisteredTypes, Registry, RegistryError, SignatureOptions, Signer } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
 import type { HexString } from '@polkadot/util/types';
-import type { ApiBase } from './base';
-import type { AllDerives } from './util/decorate';
+import type { ApiBase } from '../base';
+import type { AllDerives } from '../util/decorate';
 
 export * from '@polkadot/api-base/types';
+export * from '@polkadot/api/types/consts';
+export * from '@polkadot/api/types/errors';
+export * from '@polkadot/api/types/events';
+export * from '@polkadot/api/types/storage';
+export * from '@polkadot/api/types/submittable';
 
-export type { AugmentedConsts, AugmentedErrors, AugmentedEvents, AugmentedQueries, AugmentedSubmittables, QueryableConsts, DecoratedErrors, DecoratedEvents, QueryableStorage, QueryableStorageAt, SubmittableExtrinsics } from '@polkadot/api-augment';
 export { Signer, SignerResult } from '@polkadot/types/types';
 
-export { ApiBase } from './base';
+export { ApiBase } from '../base';
 
 // A smaller interface of ApiRx, used in derive and in SubmittableExtrinsic
 export interface ApiInterfaceRx extends ApiInterfaceBase {

packages/api/src/types/storage.ts

@@ -1,5 +1,4 @@
 // Copyright 2017-2021 @polkadot/api-augment authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// augmented
-export const __API_AUGMENT_QUERY = 'augmented';
+export * from '@polkadot/api-base/types/storage';

packages/api/src/types/submittable.ts

@@ -1,5 +1,4 @@
 // Copyright 2017-2021 @polkadot/api-augment authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// augmented
-export const __API_AUGMENT_ERRORS = 'augmented';
+export * from '@polkadot/api-base/types/submittable';

packages/api/tsconfig.json

@@ -6,11 +6,10 @@
     "rootDir": "./src"
   },
   "exclude": [
-    "**/*.manual.ts",
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts"
   ],
   "references": [
-    { "path": "../api-augment" },
     { "path": "../api-base" },
     { "path": "../api-derive" },
     { "path": "../rpc-core" },

packages/api/tsconfig.spec.json

@@ -8,7 +8,7 @@
     "noEmit": true
   },
   "include": [
-    "**/*.manual.ts",
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts",
     "**/test/**/*"
   ],

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

@@ -1,5 +1,4 @@
 // Copyright 2017-2021 @polkadot/rpc-augment authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import '@polkadot/types-augment';
-import './rpc';
+import './jsonrpc';

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

@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
-import type { AugmentedRpc } from '@polkadot/rpc-augment/types';
+import type { AugmentedRpc } from '@polkadot/rpc-core/types';
 import type { Metadata, StorageKey } from '@polkadot/types';
 import type { Bytes, HashMap, Json, Null, Option, Text, U256, U64, Vec, bool, u32, u64 } from '@polkadot/types-codec';
 import type { AnyNumber, Codec } from '@polkadot/types-codec/types';
@@ -25,7 +25,7 @@ import type { ReadProof, RuntimeVersion, TraceBlockResponse } from '@polkadot/ty
 import type { ApplyExtrinsicResult, ChainProperties, ChainType, Health, NetworkState, NodeRole, PeerInfo, SyncState } from '@polkadot/types/interfaces/system';
 import type { IExtrinsic, Observable } from '@polkadot/types/types';
 
-declare module '@polkadot/rpc-augment/rpc' {
+declare module '@polkadot/rpc-core/types/jsonrpc' {
   export interface RpcInterface {
     author: {
       /**
@@ -560,5 +560,4 @@ declare module '@polkadot/rpc-augment/rpc' {
       sha3: AugmentedRpc<(data: Bytes | string | Uint8Array) => Observable<H256>>;
     };
   } // RpcInterface
-
 } // declare module

packages/rpc-augment/src/bundle.ts

@@ -4,5 +4,3 @@
 import './augment';
 
 export { packageInfo } from './packageInfo';
-
-export * from '@polkadot/rpc-augment/rpc';

packages/rpc-augment/src/rpc.ts

@@ -1,5 +0,0 @@
-// Copyright 2017-2021 @polkadot/rpc-augment authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-// augmented
-export const __RPC_AUGMENT_RPC = 'augmented';

packages/rpc-augment/tsconfig.json

@@ -6,7 +6,7 @@
     "rootDir": "./src"
   },
   "references": [
-    { "path": "../types" },
-    { "path": "../types-augment" }
+    { "path": "../rpc-core" },
+    { "path": "../types" }
   ]
 }

packages/rpc-core/src/types.ts

@@ -1,5 +0,0 @@
-// Copyright 2017-2021 @polkadot/rpc-core authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-export type { RpcInterface } from '@polkadot/rpc-augment/rpc';
-export type { AugmentedRpc, RpcInterfaceMethod } from '@polkadot/rpc-augment/types';

packages/rpc-core/src/types/base.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/rpc-augment authors & contributors
+// Copyright 2017-2021 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';

packages/rpc-core/src/types/index.ts

@@ -0,0 +1,8 @@
+// Copyright 2017-2021 @polkadot/rpc-core authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// augmented, do an augmentation export
+export * from '@polkadot/rpc-core/types/jsonrpc';
+
+// normal exports
+export * from './base';

packages/rpc-core/src/types/jsonrpc.ts

@@ -0,0 +1,7 @@
+// Copyright 2017-2021 @polkadot/rpc-core authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface RpcInterface {
+  // augmented
+}

packages/rpc-core/tsconfig.json

@@ -6,10 +6,10 @@
     "rootDir": "./src"
   },
   "exclude": [
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts"
   ],
   "references": [
-    { "path": "../rpc-augment" },
     { "path": "../rpc-provider" }
   ]
 }

packages/rpc-core/tsconfig.spec.json

@@ -8,6 +8,7 @@
     "noEmit": true
   },
   "include": [
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts"
   ],
   "references": [

packages/typegen/src/augment.ts

@@ -0,0 +1,5 @@
+// Copyright 2017-2021 @polkadot/typegen authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import '@polkadot/api-augment';
+import '@polkadot/rpc-augment';

packages/typegen/src/generate/consts.ts

@@ -76,7 +76,7 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
         })),
         {
           file: '@polkadot/api-base/types',
-          types: ['ApiTypes', 'AugmentedConst', 'QueryableModuleConsts']
+          types: ['ApiTypes']
         }
       ]
     });

packages/typegen/src/generate/errors.ts

@@ -39,7 +39,7 @@ function generateForMeta (meta: Metadata, dest: string, isStrict: boolean): void
       types: [
         {
           file: '@polkadot/api-base/types',
-          types: ['ApiTypes', 'AugmentedError', 'ModuleErrors']
+          types: ['ApiTypes']
         }
       ]
     });

packages/typegen/src/generate/events.ts

@@ -68,7 +68,7 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
         })),
         {
           file: '@polkadot/api-base/types',
-          types: ['ApiTypes', 'AugmentedEvent', 'ModuleEvents']
+          types: ['ApiTypes']
         }
       ]
     });

packages/typegen/src/generate/query.ts

@@ -125,7 +125,7 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
         })),
         {
           file: '@polkadot/api-base/types',
-          types: ['ApiTypes', 'AugmentedQuery', 'QueryableStorageEntry', 'QueryableModuleStorage', 'QueryableModuleStorageAt']
+          types: ['ApiTypes']
         }
       ]
     });

packages/typegen/src/generate/rpc.ts

@@ -135,7 +135,7 @@ export function generateRpcTypes (registry: TypeRegistry, importDefinitions: Rec
           types: Object.keys(imports.localTypes[packagePath])
         })),
         {
-          file: '@polkadot/rpc-augment/types',
+          file: '@polkadot/rpc-core/types',
           types: ['AugmentedRpc']
         }
       ]
@@ -143,7 +143,7 @@ export function generateRpcTypes (registry: TypeRegistry, importDefinitions: Rec
   });
 }
 
-export function generateDefaultRpc (dest = 'packages/rpc-augment/src/augment/rpc.ts', extraTypes: ExtraTypes = {}): void {
+export function generateDefaultRpc (dest = 'packages/rpc-augment/src/augment/jsonrpc.ts', extraTypes: ExtraTypes = {}): void {
   const { registry } = initMeta(undefined, extraTypes);
 
   generateRpcTypes(

packages/typegen/src/generate/tx.ts

@@ -50,7 +50,7 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
       .sort(compareName)
       .filter(({ calls }) => calls.isSome)
       .map(({ calls, name }) => {
-        setImports(allDefs, imports, ['Call', 'Extrinsic', 'SubmittableExtrinsic']);
+        setImports(allDefs, imports, ['SubmittableExtrinsic']);
 
         const sectionName = stringCamelCase(name);
         const items = lookup.getSiType(calls.unwrap().type).def.asVariant.variants
@@ -110,7 +110,7 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
         })),
         {
           file: '@polkadot/api-base/types',
-          types: ['ApiTypes', 'AugmentedSubmittable', 'SubmittableExtrinsic', 'SubmittableExtrinsicFunction', 'SubmittableModuleExtrinsics']
+          types: ['ApiTypes']
         }
       ]
     });

packages/typegen/src/templates/consts.hbs

@@ -2,8 +2,8 @@
 
 {{{ importsAll }}}
 
-declare module '@polkadot/api-augment/consts' {
-  export interface AugmentedConsts<ApiType  extends ApiTypes> {
+declare module '@polkadot/api-base/types/consts' {
+  export interface AugmentedConsts<ApiType extends ApiTypes> {
     {{#each modules}}
     {{{name}}}: {
       {{#each items}}
@@ -19,11 +19,4 @@ declare module '@polkadot/api-augment/consts' {
     };
     {{/each}}
   } // AugmentedConsts
-
-  export interface QueryableConsts<ApiType extends ApiTypes> extends AugmentedConsts<ApiType> {
-    {{#unless isStrict}}
-    [key: string]: QueryableModuleConsts;
-    {{/unless}}
-  } // QueryableConsts
-
 } // declare module

packages/typegen/src/templates/errors.hbs

@@ -2,7 +2,7 @@
 
 {{{ importsAll }}}
 
-declare module '@polkadot/api-augment/errors' {
+declare module '@polkadot/api-base/types/errors' {
   export interface AugmentedErrors<ApiType extends ApiTypes> {
     {{#each modules}}
     {{{name}}}: {
@@ -19,11 +19,4 @@ declare module '@polkadot/api-augment/errors' {
     };
     {{/each}}
   } // AugmentedErrors
-
-  export interface DecoratedErrors<ApiType extends ApiTypes> extends AugmentedErrors<ApiType> {
-    {{#unless isStrict}}
-    [key: string]: ModuleErrors<ApiType>;
-    {{/unless}}
-  } // DecoratedErrors
-
 } // declare module

packages/typegen/src/templates/events.hbs

@@ -2,7 +2,7 @@
 
 {{{ importsAll }}}
 
-declare module '@polkadot/api-augment/events' {
+declare module '@polkadot/api-base/types/events' {
   export interface AugmentedEvents<ApiType extends ApiTypes> {
     {{#each modules}}
     {{{name}}}: {
@@ -19,11 +19,4 @@ declare module '@polkadot/api-augment/events' {
     };
     {{/each}}
   } // AugmentedEvents
-
-  export interface DecoratedEvents<ApiType extends ApiTypes> extends AugmentedEvents<ApiType> {
-    {{#unless isStrict}}
-    [key: string]: ModuleEvents<ApiType>;
-    {{/unless}}
-  } // DecoratedEvents
-
 } // declare module

packages/typegen/src/templates/interfaceRegistry.hbs

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

packages/typegen/src/templates/lookup/types.hbs

@@ -1,8 +1,10 @@
 {{> header }}
 
-{{{ importsAll }}}
+{{{ importsRelative }}}
+
+declare module '@polkadot/types/lookup' {
+  {{{ importsPackage }}}
 
-declare module '@polkadot/types-augment/lookup' {
   {{#each items}}
 {{{this}}}
 

packages/typegen/src/templates/query.hbs

@@ -2,7 +2,7 @@
 
 {{{ importsAll }}}
 
-declare module '@polkadot/api-augment/query' {
+declare module '@polkadot/api-base/types/storage' {
   export interface AugmentedQueries<ApiType extends ApiTypes> {
     {{#each modules}}
     {{{name}}}: {
@@ -19,17 +19,4 @@ declare module '@polkadot/api-augment/query' {
     };
     {{/each}}
   } // AugmentedQueries
-
-  export interface QueryableStorage<ApiType extends ApiTypes> extends AugmentedQueries<ApiType> {
-    {{#unless isStrict}}
-    [key: string]: QueryableModuleStorage<ApiType>;
-    {{/unless}}
-  } // QueryableStorage
-
-  export interface QueryableStorageAt<ApiType extends ApiTypes> extends AugmentedQueries<ApiType> {
-    {{#unless isStrict}}
-    [key: string]: QueryableModuleStorageAt<ApiType>;
-      {{/unless}}
-  } // QueryableStorageAt
-
 } // declare module

packages/typegen/src/templates/rpc.hbs

@@ -2,7 +2,7 @@
 
 {{{ importsAll }}}
 
-declare module '@polkadot/rpc-augment/rpc' {
+declare module '@polkadot/rpc-core/types/jsonrpc' {
   export interface RpcInterface {
     {{#each modules}}
     {{{name}}}: {
@@ -13,5 +13,4 @@ declare module '@polkadot/rpc-augment/rpc' {
     };
     {{/each}}
   } // RpcInterface
-
 } // declare module

packages/typegen/src/templates/tx.hbs

@@ -2,7 +2,7 @@
 
 {{{ importsAll }}}
 
-declare module '@polkadot/api-augment/tx' {
+declare module '@polkadot/api-base/types/submittable' {
   export interface AugmentedSubmittables<ApiType extends ApiTypes> {
     {{#each modules}}
     {{{name}}}: {
@@ -19,12 +19,4 @@ declare module '@polkadot/api-augment/tx' {
     };
     {{/each}}
   } // AugmentedSubmittables
-
-  export interface SubmittableExtrinsics<ApiType extends ApiTypes> extends AugmentedSubmittables<ApiType> {
-    (extrinsic: Call | Extrinsic | Uint8Array | string): SubmittableExtrinsic<ApiType>;
-    {{#unless isStrict}}
-    [key: string]: SubmittableModuleExtrinsics<ApiType>;
-    {{/unless}}
-  } // SubmittableExtrinsics
-
 } // declare module

packages/types-augment/src/augment/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2021 @polkadot/types-augment authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import './lookup';
 import './registry';
-import './types';
+import './lookup';

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

@@ -1,11 +1,11 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { BitVec, Compact, Enum, Null, Option, Struct, Vec, u16, u32 } from '@polkadot/types-codec';
-import type { ITuple } from '@polkadot/types-codec/types';
-import type { H256, PerU16 } from '@polkadot/types/interfaces/runtime';
+declare module '@polkadot/types/lookup' {
+  import type { BitVec, Compact, Enum, Null, Option, Struct, Vec, u16, u32 } from '@polkadot/types-codec';
+  import type { ITuple } from '@polkadot/types-codec/types';
+  import type { H256, PerU16 } from '@polkadot/types/interfaces/runtime';
 
-declare module '@polkadot/types-augment/lookup' {
   /** @name KusamaRuntimeProxyType (73) */
   export interface KusamaRuntimeProxyType extends Enum {
     readonly isAny: boolean;

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

@@ -1,12 +1,12 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { BitVec, Bytes, Compact, Enum, Null, Option, Result, Struct, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
-import type { ITuple } from '@polkadot/types-codec/types';
-import type { EthereumAddress } from '@polkadot/types/interfaces/eth';
-import type { AccountId32, H256, PerU16 } from '@polkadot/types/interfaces/runtime';
+declare module '@polkadot/types/lookup' {
+  import type { BitVec, Bytes, Compact, Enum, Null, Option, Result, Struct, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
+  import type { ITuple } from '@polkadot/types-codec/types';
+  import type { EthereumAddress } from '@polkadot/types/interfaces/eth';
+  import type { AccountId32, H256, PerU16 } from '@polkadot/types/interfaces/runtime';
 
-declare module '@polkadot/types-augment/lookup' {
   /** @name PolkadotRuntimeCommonClaimsPalletEvent (64) */
   export interface PolkadotRuntimeCommonClaimsPalletEvent extends Enum {
     readonly isClaimed: boolean;

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

@@ -1,14 +1,14 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Data } from '@polkadot/types';
-import type { BTreeMap, Bytes, Compact, Enum, Null, Option, Result, Set, Struct, Text, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
-import type { ITuple } from '@polkadot/types-codec/types';
-import type { Vote } from '@polkadot/types/interfaces/elections';
-import type { AccountId32, Call, H256, MultiAddress, PerU16, Perbill, Percent, Perquintill } from '@polkadot/types/interfaces/runtime';
-import type { Event } from '@polkadot/types/interfaces/system';
+declare module '@polkadot/types/lookup' {
+  import type { Data } from '@polkadot/types';
+  import type { BTreeMap, Bytes, Compact, Enum, Null, Option, Result, Set, Struct, Text, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
+  import type { ITuple } from '@polkadot/types-codec/types';
+  import type { Vote } from '@polkadot/types/interfaces/elections';
+  import type { AccountId32, Call, H256, MultiAddress, PerU16, Perbill, Percent, Perquintill } from '@polkadot/types/interfaces/runtime';
+  import type { Event } from '@polkadot/types/interfaces/system';
 
-declare module '@polkadot/types-augment/lookup' {
   /** @name FrameSystemAccountInfo (3) */
   export interface FrameSystemAccountInfo extends Struct {
     readonly nonce: u32;

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

@@ -60,7 +60,7 @@ import type { Multisig, Timepoint } from '@polkadot/types/interfaces/utility';
 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-augment/registry' {
+declare module '@polkadot/types/types/registry' {
   export interface InterfaceTypes {
     AbridgedCandidateReceipt: AbridgedCandidateReceipt;
     AbridgedHostConfiguration: AbridgedHostConfiguration;

packages/types-augment/src/augment/types/index.ts

@@ -1,7 +0,0 @@
-// Copyright 2017-2021 @polkadot/types-augment authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-// NOTE: This is not a typical types export, rather this is to augment types
-
-import './lookup';
-import './registry';

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

@@ -1,6 +0,0 @@
-// Copyright 2017-2021 @polkadot/types-augment authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-declare module '@polkadot/types/lookup' {
-  export * from '@polkadot/types-augment/lookup';
-}

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

@@ -1,6 +0,0 @@
-// Copyright 2017-2021 @polkadot/types-augment authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-declare module '@polkadot/types/types/registry' {
-  export { InterfaceTypes } from '@polkadot/types-augment/registry';
-}

packages/types-codec/tsconfig.json

@@ -8,7 +8,7 @@
   },
   "exclude": [
     "**/*.data.ts",
-    "**/*.manual.ts",
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts"
   ],
   "references": []

packages/types-codec/tsconfig.spec.json

@@ -10,7 +10,7 @@
   },
   "include": [
     "**/*.data.ts",
-    "**/*.manual.ts",
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts"
   ],
   "references": [

packages/types-create/package.json

@@ -24,6 +24,7 @@
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
+    "@polkadot/types-codec": "6.12.2-20",
     "@polkadot/util": "^8.2.2"
   }
 }

packages/types/tsconfig.json

@@ -7,7 +7,7 @@
     "resolveJsonModule": true
   },
   "exclude": [
-    "**/*.manual.ts",
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts"
   ],
   "references": [

packages/types/tsconfig.spec.json

@@ -9,7 +9,7 @@
     "noEmit": true
   },
   "include": [
-    "**/*.manual.ts",
+    "**/checkTypes.manual.ts",
     "**/*.spec.ts"
   ],
   "references": [

tsconfig.all.refs.json

@@ -0,0 +1,31 @@
+{
+  "compilerOptions": {
+    "composite": true
+  },
+  "files": [],
+  "references": [
+    { "path": "./packages/api" },
+    { "path": "./packages/api/tsconfig.spec.json" },
+    { "path": "./packages/api-augment" },
+    { "path": "./packages/api-base" },
+    { "path": "./packages/api-contract" },
+    { "path": "./packages/api-contract/tsconfig.spec.json" },
+    { "path": "./packages/api-derive" },
+    { "path": "./packages/api-derive/tsconfig.spec.json" },
+    { "path": "./packages/rpc-augment" },
+    { "path": "./packages/rpc-core" },
+    { "path": "./packages/rpc-core/tsconfig.spec.json" },
+    { "path": "./packages/rpc-provider" },
+    { "path": "./packages/rpc-provider/tsconfig.spec.json" },
+    { "path": "./packages/typegen" },
+    { "path": "./packages/types" },
+    { "path": "./packages/types/tsconfig.spec.json" },
+    { "path": "./packages/types-augment" },
+    { "path": "./packages/types-codec" },
+    { "path": "./packages/types-codec/tsconfig.spec.json" },
+    { "path": "./packages/types-create" },
+    { "path": "./packages/types-create/tsconfig.spec.json" },
+    { "path": "./packages/types-known" },
+    { "path": "./packages/types-support" }
+  ]
+}

tsconfig.json

@@ -1,31 +1,3 @@
 {
-  "compilerOptions": {
-    "composite": true
-  },
-  "files": [],
-  "references": [
-    { "path": "./packages/api" },
-    { "path": "./packages/api/tsconfig.spec.json" },
-    { "path": "./packages/api-augment" },
-    { "path": "./packages/api-base" },
-    { "path": "./packages/api-contract" },
-    { "path": "./packages/api-contract/tsconfig.spec.json" },
-    { "path": "./packages/api-derive" },
-    { "path": "./packages/api-derive/tsconfig.spec.json" },
-    { "path": "./packages/rpc-augment" },
-    { "path": "./packages/rpc-core" },
-    { "path": "./packages/rpc-core/tsconfig.spec.json" },
-    { "path": "./packages/rpc-provider" },
-    { "path": "./packages/rpc-provider/tsconfig.spec.json" },
-    { "path": "./packages/typegen" },
-    { "path": "./packages/types" },
-    { "path": "./packages/types/tsconfig.spec.json" },
-    { "path": "./packages/types-augment" },
-    { "path": "./packages/types-codec" },
-    { "path": "./packages/types-codec/tsconfig.spec.json" },
-    { "path": "./packages/types-create" },
-    { "path": "./packages/types-create/tsconfig.spec.json" },
-    { "path": "./packages/types-known" },
-    { "path": "./packages/types-support" }
-  ]
+  "extends": "./tsconfig.all.refs.json"
 }

yarn.lock

@@ -1873,8 +1873,8 @@ __metadata:
   dependencies:
     "@babel/runtime": ^7.16.5
     "@polkadot/api-base": 6.12.2-20
-    "@polkadot/rpc-core": 6.12.2-20
     "@polkadot/types": 6.12.2-20
+    "@polkadot/types-codec": 6.12.2-20
   languageName: unknown
   linkType: soft
 
@@ -1938,9 +1938,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/dev@npm:^0.64.5":
-  version: 0.64.5
-  resolution: "@polkadot/dev@npm:0.64.5"
+"@polkadot/dev@npm:^0.64.6":
+  version: 0.64.6
+  resolution: "@polkadot/dev@npm:0.64.6"
   dependencies:
     "@babel/cli": ^7.16.0
     "@babel/core": ^7.16.5
@@ -2025,7 +2025,7 @@ __metadata:
     polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs
     polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs
     polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs
-  checksum: 04a30123e45254058afb772b8484fabb537ebeda07fc7aa595dec1e384b52fcf8cb9be0e2050b4961e63c0adfd2bc9b8d4f78dc8eabfed91a62b5f7ae84681f3
+  checksum: 9a4f05074fc99ddeb7843f8a14c1b14a8041e23d35590664032e4c3972f6ca6bc1352893698d8be7efacaf06fef09d3fce6b7f8f12612c89c0fdf6ced8f45908
   languageName: node
   linkType: hard
 
@@ -2158,6 +2158,7 @@ __metadata:
   resolution: "@polkadot/types-create@workspace:packages/types-create"
   dependencies:
     "@babel/runtime": ^7.16.5
+    "@polkadot/types-codec": 6.12.2-20
     "@polkadot/util": ^8.2.2
   languageName: unknown
   linkType: soft
@@ -8963,7 +8964,7 @@ resolve@^2.0.0-next.3:
     "@babel/core": ^7.16.5
     "@babel/register": ^7.16.5
     "@babel/runtime": ^7.16.5
-    "@polkadot/dev": ^0.64.5
+    "@polkadot/dev": ^0.64.6
     "@polkadot/ts": ^0.4.20
     "@polkadot/typegen": "workspace:packages/typegen"
     "@types/jest": ^27.0.3