@dedot/api 0.0.1-alpha.34 → 0.0.1-alpha.35

package/chaintypes/substrate/types.js

@@ -1 +1,2 @@
+// Generated by dedot cli
 export {};

package/cjs/chaintypes/substrate/consts.js

@@ -1,2 +1,3 @@
 "use strict";
+// Generated by dedot cli
 Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/chaintypes/substrate/errors.js

@@ -1,2 +1,3 @@
 "use strict";
+// Generated by dedot cli
 Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/chaintypes/substrate/events.js

@@ -1,2 +1,3 @@
 "use strict";
+// Generated by dedot cli
 Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/chaintypes/substrate/index.js

@@ -1,4 +1,5 @@
 "use strict";
+// Generated by dedot cli
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);

package/cjs/chaintypes/substrate/json-rpc.js

@@ -1,2 +1,3 @@
 "use strict";
+// Generated by dedot cli
 Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/chaintypes/substrate/query.js

@@ -1,2 +1,3 @@
 "use strict";
+// Generated by dedot cli
 Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/chaintypes/substrate/runtime.js

@@ -1,2 +1,3 @@
 "use strict";
+// Generated by dedot cli
 Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/chaintypes/substrate/tx.js

@@ -1,2 +1,3 @@
 "use strict";
+// Generated by dedot cli
 Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/chaintypes/substrate/types.js

@@ -1,2 +1,3 @@
 "use strict";
+// Generated by dedot cli
 Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/client/DedotClient.js

@@ -14,7 +14,8 @@ const BaseSubstrateClient_js_1 = require("./BaseSubstrateClient.js");
  *
  * __Unstable, use with caution.__
  */
-class DedotClient extends BaseSubstrateClient_js_1.BaseSubstrateClient {
+class DedotClient// prettier-end-here
+ extends BaseSubstrateClient_js_1.BaseSubstrateClient {
     _chainHead;
     _chainSpec;
     _txBroadcaster;

package/cjs/client/LegacyClient.js

@@ -16,7 +16,7 @@ const KEEP_ALIVE_INTERVAL = 10_000; // in ms
  * import type { PolkadotApi } from '@dedot/chaintypes/polkadot';
  *
  * const run = async () => {
- *   const api = await Dedot.new<PolkadotApi>('wss://rpc.polkadot.io');
+ *   const api = await LegacyClient.new<PolkadotApi>('wss://rpc.polkadot.io');
  *
  *   // Call rpc `state_getMetadata` to fetch raw scale-encoded metadata and decode it.
  *   const metadata = await api.rpc.state.getMetadata();
@@ -44,7 +44,8 @@ const KEEP_ALIVE_INTERVAL = 10_000; // in ms
  * run().catch(console.error);
  * ```
  */
-class LegacyClient extends BaseSubstrateClient_js_1.BaseSubstrateClient {
+class LegacyClient// prettier-end-here
+ extends BaseSubstrateClient_js_1.BaseSubstrateClient {
     #runtimeSubscriptionUnsub;
     #healthTimer;
     #apiAtCache = {};
@@ -65,7 +66,7 @@ class LegacyClient extends BaseSubstrateClient_js_1.BaseSubstrateClient {
         return new LegacyClient(options).connect();
     }
     /**
-     * Alias for __Dedot.create__
+     * Alias for __LegacyClient.create__
      *
      * @param options
      */
@@ -205,7 +206,7 @@ class LegacyClient extends BaseSubstrateClient_js_1.BaseSubstrateClient {
      * // Make a transfer balance transaction
      * api.tx.balances.transferKeepAlive(<address>, <amount>)
      *    .signAndSend(<keyPair|address>, { signer }, ({ status }) => {
-     *      console.log('Transaction status', status.tag);
+     *      console.log('Transaction status', status.type);
      *    });
      * ```
      */

package/cjs/executor/ErrorExecutor.js

@@ -20,7 +20,7 @@ class ErrorExecutor extends Executor_js_1.Executor {
                 palletIndex: targetPallet.index,
             },
             is: (errorInfo) => {
-                if ((0, utils_1.isObject)(errorInfo) && errorInfo.tag === 'Module') {
+                if ((0, utils_1.isObject)(errorInfo) && errorInfo.type === 'Module') {
                     errorInfo = errorInfo.value;
                 }
                 if ((0, utils_1.isObject)(errorInfo) && (0, utils_1.isNumber)(errorInfo.index) && (0, utils_1.isHex)(errorInfo.error)) {
@@ -33,8 +33,8 @@ class ErrorExecutor extends Executor_js_1.Executor {
     #getErrorDef(errorTypeId, errorName) {
         const def = this.metadata.types[errorTypeId];
         (0, utils_1.assert)(def, new utils_1.UnknownApiError(`Error def not found for id ${errorTypeId}`));
-        const { tag, value } = def.type;
-        (0, utils_1.assert)(tag === 'Enum', new utils_1.UnknownApiError(`Error type should be an enum, found: ${tag}`));
+        const { type, value } = def.typeDef;
+        (0, utils_1.assert)(type === 'Enum', new utils_1.UnknownApiError(`Error type should be an enum, found: ${type}`));
         const errorDef = value.members.find(({ name }) => (0, utils_1.stringPascalCase)(name) === errorName);
         (0, utils_1.assert)(errorDef, new utils_1.UnknownApiError(`Error def not found for ${errorName}`));
         return {

package/cjs/executor/EventExecutor.js

@@ -39,8 +39,8 @@ class EventExecutor extends Executor_js_1.Executor {
     #getEventDef(eventTypeId, errorName) {
         const def = this.metadata.types[eventTypeId];
         (0, utils_1.assert)(def, new utils_1.UnknownApiError(`Event def not found for id ${eventTypeId}`));
-        const { tag, value } = def.type;
-        (0, utils_1.assert)(tag === 'Enum', new utils_1.UnknownApiError(`Event type should be an enum, found: ${tag}`));
+        const { type, value } = def.typeDef;
+        (0, utils_1.assert)(type === 'Enum', new utils_1.UnknownApiError(`Event type should be an enum, found: ${type}`));
         const eventDef = value.members.find(({ name }) => (0, utils_1.stringPascalCase)(name) === errorName);
         (0, utils_1.assert)(eventDef, new utils_1.UnknownApiError(`Event def not found for ${errorName}`));
         return {

package/cjs/executor/StorageQueryExecutor.js

@@ -52,7 +52,7 @@ class StorageQueryExecutor extends Executor_js_1.Executor {
             palletIndex: entry.pallet.index,
             ...entry.storageEntry,
         };
-        const isMap = entry.storageEntry.type.tag === 'Map';
+        const isMap = entry.storageEntry.storageType.type === 'Map';
         if (isMap) {
             const queryMultiFn = async (...args) => {
                 const [inArgs, callback] = extractArgs(args);

package/cjs/executor/TxExecutor.js

@@ -13,9 +13,9 @@ class TxExecutor extends Executor_js_1.Executor {
         const targetPallet = this.getPallet(pallet);
         (0, utils_1.assert)(targetPallet.calls, new utils_1.UnknownApiError(`Tx calls are not available for pallet ${targetPallet.name}`));
         const txType = this.metadata.types[targetPallet.calls];
-        (0, utils_1.assert)(txType.type.tag === 'Enum', new utils_1.UnknownApiError('Tx type defs should be enum'));
-        const isFlatEnum = txType.type.value.members.every((m) => m.fields.length === 0);
-        const txCallDef = txType.type.value.members.find((m) => (0, utils_1.stringCamelCase)(m.name) === functionName);
+        (0, utils_1.assert)(txType.typeDef.type === 'Enum', new utils_1.UnknownApiError('Tx type defs should be enum'));
+        const isFlatEnum = txType.typeDef.value.members.every((m) => m.fields.length === 0);
+        const txCallDef = txType.typeDef.value.members.find((m) => (0, utils_1.stringCamelCase)(m.name) === functionName);
         (0, utils_1.assert)(txCallDef, new utils_1.UnknownApiError(`Tx call spec not found for ${pallet}.${functionName}`));
         const txCallFn = (...args) => {
             let call;

package/cjs/extrinsic/extensions/known/ChargeAssetTxPayment.js

@@ -30,8 +30,8 @@ class ChargeAssetTxPayment extends SignedExtension_js_1.SignedExtension {
     }
     $AssetId() {
         const extensionTypeDef = this.registry.findType(this.signedExtensionDef.typeId);
-        (0, utils_1.assert)(extensionTypeDef.type.tag === 'Struct');
-        const assetIdTypeDef = extensionTypeDef.type.value.fields.find((f) => f.name === 'asset_id');
+        (0, utils_1.assert)(extensionTypeDef.typeDef.type === 'Struct');
+        const assetIdTypeDef = extensionTypeDef.typeDef.value.fields.find((f) => f.name === 'asset_id');
         const $codec = this.registry.findCodec(assetIdTypeDef.typeId);
         const codecMetadata = $codec.metadata[0];
         if (codecMetadata.name === '$.option') {

package/cjs/extrinsic/extensions/known/StorageWeightReclaim.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StorageWeightReclaim = void 0;
+const SignedExtension_js_1 = require("../SignedExtension.js");
+/**
+ * @description Storage weight reclaim mechanism.
+ */
+class StorageWeightReclaim extends SignedExtension_js_1.SignedExtension {
+}
+exports.StorageWeightReclaim = StorageWeightReclaim;

package/cjs/extrinsic/extensions/known/index.js

@@ -12,6 +12,7 @@ const CheckSpecVersion_js_1 = require("./CheckSpecVersion.js");
 const CheckTxVersion_js_1 = require("./CheckTxVersion.js");
 const CheckWeight_js_1 = require("./CheckWeight.js");
 const PrevalidateAttests_js_1 = require("./PrevalidateAttests.js");
+const StorageWeightReclaim_js_1 = require("./StorageWeightReclaim.js");
 exports.knownSignedExtensions = {
     CheckNonZeroSender: CheckNonZeroSender_js_1.CheckNonZeroSender,
     CheckSpecVersion: CheckSpecVersion_js_1.CheckSpecVersion,
@@ -24,4 +25,5 @@ exports.knownSignedExtensions = {
     PrevalidateAttests: PrevalidateAttests_js_1.PrevalidateAttests,
     ChargeAssetTxPayment: ChargeAssetTxPayment_js_1.ChargeAssetTxPayment,
     CheckMetadataHash: CheckMetadataHash_js_1.CheckMetadataHash,
+    StorageWeightReclaim: StorageWeightReclaim_js_1.StorageWeightReclaim,
 };

package/cjs/extrinsic/submittable/SubmittableExtrinsic.js

@@ -23,7 +23,7 @@ class SubmittableExtrinsic extends BaseSubmittableExtrinsic_js_1.BaseSubmittable
         const txHash = this.hash;
         if (isSubscription) {
             return this.api.rpc.author_submitAndWatchExtrinsic(txHex, async (status) => {
-                if (status.tag === 'InBlock' || status.tag === 'Finalized') {
+                if (status.type === 'InBlock' || status.type === 'Finalized') {
                     const blockHash = status.value;
                     const [signedBlock, blockEvents] = await Promise.all([
                         this.api.rpc.chain_getBlock(blockHash),
@@ -31,7 +31,7 @@ class SubmittableExtrinsic extends BaseSubmittableExtrinsic_js_1.BaseSubmittable
                     ]);
                     const txIndex = signedBlock.block.extrinsics.indexOf(txHex);
                     (0, utils_1.assert)(txIndex >= 0, 'Extrinsic not found!');
-                    const events = blockEvents.filter(({ phase }) => phase.tag === 'ApplyExtrinsic' && phase.value === txIndex);
+                    const events = blockEvents.filter(({ phase }) => phase.type === 'ApplyExtrinsic' && phase.value === txIndex);
                     return callback(new SubmittableResult_js_1.SubmittableResult({ status, txHash, events, txIndex }));
                 }
                 else {

package/cjs/extrinsic/submittable/SubmittableExtrinsicV2.js

@@ -28,10 +28,10 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
         };
         const validation = await validateTx(finalizedHash);
         if (validation.isOk) {
-            callback(new SubmittableResult_js_1.SubmittableResult({ status: { tag: 'Validated' }, txHash }));
+            callback(new SubmittableResult_js_1.SubmittableResult({ status: { type: 'Validated' }, txHash }));
         }
         else if (validation.isErr) {
-            throw new errors_js_1.InvalidTxError(`Invalid Tx: ${validation.err.tag} - ${validation.err.value.tag}`, validation);
+            throw new errors_js_1.InvalidTxError(`Invalid Tx: ${validation.err.type} - ${validation.err.value.type}`, validation);
         }
         const checkTxIsOnChain = async (blockHash) => {
             if (blockHash === finalizedHash)
@@ -42,7 +42,7 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
                 return checkTxIsOnChain(api.chainHead.findBlock(blockHash).parent);
             }
             const events = await this.getSystemEventsAt(blockHash);
-            const txEvents = events.filter(({ phase }) => phase.tag == 'ApplyExtrinsic' && phase.value === txIndex);
+            const txEvents = events.filter(({ phase }) => phase.type == 'ApplyExtrinsic' && phase.value === txIndex);
             return {
                 blockHash,
                 index: txIndex,
@@ -88,7 +88,7 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
                     if (txFound && bestChainChanged) {
                         txFound = undefined;
                         callback(new SubmittableResult_js_1.SubmittableResult({
-                            status: { tag: 'NoLongerInBestChain' },
+                            status: { type: 'NoLongerInBestChain' },
                             txHash,
                         }));
                     }
@@ -101,7 +101,7 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
                 txFound = inBlock;
                 const { index: txIndex, events, blockHash } = inBlock;
                 callback(new SubmittableResult_js_1.SubmittableResult({
-                    status: { tag: 'BestChainBlockIncluded', value: { blockHash, txIndex } },
+                    status: { type: 'BestChainBlockIncluded', value: { blockHash, txIndex } },
                     txHash,
                     events,
                     txIndex,
@@ -134,7 +134,7 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
             if (inBlock) {
                 const { index: txIndex, events, blockHash } = inBlock;
                 callback(new SubmittableResult_js_1.SubmittableResult({
-                    status: { tag: 'Finalized', value: { blockHash, txIndex } },
+                    status: { type: 'Finalized', value: { blockHash, txIndex } },
                     txHash,
                     events,
                     txIndex,
@@ -148,8 +148,8 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
                     return;
                 callback(new SubmittableResult_js_1.SubmittableResult({
                     status: {
-                        tag: 'Invalid',
-                        value: { error: `Invalid Tx: ${validation.err.tag} - ${validation.err.value.tag}` },
+                        type: 'Invalid',
+                        value: { error: `Invalid Tx: ${validation.err.type} - ${validation.err.value.type}` },
                     },
                     txHash,
                 }));
@@ -158,7 +158,7 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
         };
         stopBroadcastFn = await api.txBroadcaster.broadcastTx(txHex);
         callback(new SubmittableResult_js_1.SubmittableResult({
-            status: { tag: 'Broadcasting' },
+            status: { type: 'Broadcasting' },
             txHash,
         }));
         const stopBestBlockTrackingFn = api.chainHead.on('bestBlock', checkBestBlockIncluded);
@@ -184,11 +184,11 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
             try {
                 // TODO handle timeout for this with the Drop status, just in-case we somehow can't find the tx in any block
                 const unsub = await this.#send(({ status, txHash }) => {
-                    if (status.tag === 'BestChainBlockIncluded' || status.tag === 'Finalized') {
+                    if (status.type === 'BestChainBlockIncluded' || status.type === 'Finalized') {
                         defer.resolve(txHash);
                         unsub().catch(utils_1.noop);
                     }
-                    else if (status.tag === 'Invalid' || status.tag === 'Drop') {
+                    else if (status.type === 'Invalid' || status.type === 'Drop') {
                         defer.reject(new Error(status.value.error));
                         unsub().catch(utils_1.noop);
                     }

package/cjs/storage/QueryableStorage.js

@@ -39,14 +39,14 @@ class QueryableStorage {
         const storageItemHash = (0, utils_2.xxhashAsU8a)(this.storageEntry.name, 128);
         return (0, utils_2.concatU8a)(palletNameHash, storageItemHash);
     }
-    #getStorageMapInfo(type) {
-        (0, utils_1.assert)(type.tag === 'Map');
-        const { hashers, keyTypeId } = type.value;
+    #getStorageMapInfo(storageType) {
+        (0, utils_1.assert)(storageType.type === 'Map');
+        const { hashers, keyTypeId } = storageType.value;
         let keyTypeIds = [keyTypeId];
         if (hashers.length > 1) {
-            const { type } = this.registry.findType(keyTypeId);
-            (0, utils_1.assert)(type.tag === 'Tuple', 'Key type should be a tuple!');
-            keyTypeIds = type.value.fields;
+            const { typeDef } = this.registry.findType(keyTypeId);
+            (0, utils_1.assert)(typeDef.type === 'Tuple', 'Key type should be a tuple!');
+            keyTypeIds = typeDef.value.fields;
         }
         return { hashers, keyTypeIds };
     }
@@ -56,12 +56,12 @@ class QueryableStorage {
      * @param keyInput
      */
     encodeKey(keyInput) {
-        const { type } = this.storageEntry;
-        if (type.tag === 'Plain') {
+        const { storageType } = this.storageEntry;
+        if (storageType.type === 'Plain') {
             return this.prefixKey;
         }
-        else if (type.tag === 'Map') {
-            const { hashers, keyTypeIds } = this.#getStorageMapInfo(type);
+        else if (storageType.type === 'Map') {
+            const { hashers, keyTypeIds } = this.#getStorageMapInfo(storageType);
             const extractedInputs = this.#extractRequiredKeyInputs(keyInput, hashers.length);
             const keyParts = keyTypeIds.map((keyId, index) => {
                 const input = extractedInputs[index];
@@ -71,7 +71,7 @@ class QueryableStorage {
             });
             return (0, utils_2.u8aToHex)((0, utils_2.concatU8a)(this.prefixKeyAsU8a, ...keyParts));
         }
-        throw Error(`Invalid storage entry type: ${type}`);
+        throw Error(`Invalid storage entry type: ${JSON.stringify(storageType)}`);
     }
     /**
      * Decode storage key to plain key input
@@ -80,16 +80,16 @@ class QueryableStorage {
      * @param key
      */
     decodeKey(key) {
-        const { type } = this.storageEntry;
-        if (type.tag === 'Plain') {
+        const { storageType } = this.storageEntry;
+        if (storageType.type === 'Plain') {
             return;
         }
-        else if (type.tag === 'Map') {
+        else if (storageType.type === 'Map') {
             const prefix = this.prefixKey;
             if (!key.startsWith(prefix)) {
                 throw new Error(`Storage key does not match this storage entry (${this.palletName}.${this.storageItem})`);
             }
-            const { hashers, keyTypeIds } = this.#getStorageMapInfo(type);
+            const { hashers, keyTypeIds } = this.#getStorageMapInfo(storageType);
             let keyData = (0, utils_2.hexToU8a)((0, utils_1.hexAddPrefix)(key.slice(prefix.length)));
             const results = keyTypeIds.map((keyId, index) => {
                 const [hashLen, canDecode] = HASHER_INFO[hashers[index]];
@@ -104,7 +104,7 @@ class QueryableStorage {
             });
             return hashers.length > 1 ? results : results[0];
         }
-        throw Error(`Invalid storage entry type: ${type}`);
+        throw Error(`Invalid storage entry type: ${JSON.stringify(storageType)}`);
     }
     /**
      * Decode raw/bytes storage data to plain value
@@ -112,7 +112,7 @@ class QueryableStorage {
      * @param raw
      */
     decodeValue(raw) {
-        const { modifier, type: { value: { valueTypeId }, }, default: defaultValue, } = this.storageEntry;
+        const { modifier, storageType: { value: { valueTypeId }, }, default: defaultValue, } = this.storageEntry;
         if (raw === null || raw === undefined) {
             if (modifier === 'Optional') {
                 return undefined;

package/client/BaseSubstrateClient.d.ts

@@ -1,8 +1,7 @@
 import { BlockHash, Hash, Metadata, PortableRegistry, RuntimeVersion } from '@dedot/codecs';
 import type { JsonRpcProvider } from '@dedot/providers';
 import { type IStorage } from '@dedot/storage';
-import { GenericSubstrateApi, RpcVersion, VersionedGenericSubstrateApi } from '@dedot/types';
-import type { SubstrateApi } from '../chaintypes/index.js';
+import { GenericSubstrateApi, RpcVersion } from '@dedot/types';
 import { JsonRpcClient } from '../json-rpc/index.js';
 import type { ApiEvent, ApiOptions, ISubstrateClient, ISubstrateClientAt, JsonRpcClientOptions, MetadataKey, SubstrateRuntimeVersion } from '../types.js';
 export declare function ensurePresence<T>(value: T): NonNullable<T>;
@@ -10,7 +9,7 @@ export declare function ensurePresence<T>(value: T): NonNullable<T>;
  * @name BaseSubstrateClient
  * @description Base & shared abstraction for Substrate API Clients
  */
-export declare abstract class BaseSubstrateClient<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends JsonRpcClient<ChainApi[RpcVersion], ApiEvent> implements ISubstrateClient<ChainApi[RpcVersion]> {
+export declare abstract class BaseSubstrateClient<ChainApi extends GenericSubstrateApi = GenericSubstrateApi> extends JsonRpcClient<ChainApi, ApiEvent> implements ISubstrateClient<ChainApi> {
     rpcVersion: RpcVersion;
     protected _options: ApiOptions;
     protected _registry?: PortableRegistry;
@@ -54,12 +53,12 @@ export declare abstract class BaseSubstrateClient<ChainApi extends VersionedGene
     get registry(): PortableRegistry;
     get genesisHash(): Hash;
     get runtimeVersion(): SubstrateRuntimeVersion;
-    get consts(): ChainApi[RpcVersion]['consts'];
-    get errors(): ChainApi[RpcVersion]['errors'];
-    get events(): ChainApi[RpcVersion]['events'];
-    get query(): ChainApi[RpcVersion]['query'];
-    get call(): ChainApi[RpcVersion]['call'];
-    protected callAt(hash?: BlockHash): ChainApi[RpcVersion]['call'];
-    get tx(): ChainApi[RpcVersion]['tx'];
-    at<ChainApiAt extends GenericSubstrateApi = ChainApi[RpcVersion]>(hash: BlockHash): Promise<ISubstrateClientAt<ChainApiAt>>;
+    get consts(): ChainApi['consts'];
+    get errors(): ChainApi['errors'];
+    get events(): ChainApi['events'];
+    get query(): ChainApi['query'];
+    get call(): ChainApi['call'];
+    protected callAt(hash?: BlockHash): ChainApi['call'];
+    get tx(): ChainApi['tx'];
+    at<ChainApiAt extends GenericSubstrateApi = ChainApi>(hash: BlockHash): Promise<ISubstrateClientAt<ChainApiAt>>;
 }

package/client/DedotClient.d.ts

@@ -11,7 +11,8 @@ import { BaseSubstrateClient } from './BaseSubstrateClient.js';
  *
  * __Unstable, use with caution.__
  */
-export declare class DedotClient<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends BaseSubstrateClient<ChainApi> {
+export declare class DedotClient<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi>// prettier-end-here
+ extends BaseSubstrateClient<ChainApi[RpcV2]> {
     #private;
     protected _chainHead?: ChainHead;
     protected _chainSpec?: ChainSpec;

package/client/DedotClient.js

@@ -11,7 +11,8 @@ import { BaseSubstrateClient, ensurePresence } from './BaseSubstrateClient.js';
  *
  * __Unstable, use with caution.__
  */
-export class DedotClient extends BaseSubstrateClient {
+export class DedotClient// prettier-end-here
+ extends BaseSubstrateClient {
     _chainHead;
     _chainSpec;
     _txBroadcaster;

package/client/LegacyClient.d.ts

@@ -14,7 +14,7 @@ import { BaseSubstrateClient } from './BaseSubstrateClient.js';
  * import type { PolkadotApi } from '@dedot/chaintypes/polkadot';
  *
  * const run = async () => {
- *   const api = await Dedot.new<PolkadotApi>('wss://rpc.polkadot.io');
+ *   const api = await LegacyClient.new<PolkadotApi>('wss://rpc.polkadot.io');
  *
  *   // Call rpc `state_getMetadata` to fetch raw scale-encoded metadata and decode it.
  *   const metadata = await api.rpc.state.getMetadata();
@@ -42,7 +42,8 @@ import { BaseSubstrateClient } from './BaseSubstrateClient.js';
  * run().catch(console.error);
  * ```
  */
-export declare class LegacyClient<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends BaseSubstrateClient<ChainApi> {
+export declare class LegacyClient<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi>// prettier-end-here
+ extends BaseSubstrateClient<ChainApi[RpcLegacy]> {
     #private;
     /**
      * Use factory methods (`create`, `new`) to create `Dedot` instances.
@@ -57,7 +58,7 @@ export declare class LegacyClient<ChainApi extends VersionedGenericSubstrateApi
      */
     static create<ChainApi extends VersionedGenericSubstrateApi = SubstrateApi>(options: ApiOptions | JsonRpcProvider): Promise<LegacyClient<ChainApi>>;
     /**
-     * Alias for __Dedot.create__
+     * Alias for __LegacyClient.create__
      *
      * @param options
      */
@@ -116,7 +117,7 @@ export declare class LegacyClient<ChainApi extends VersionedGenericSubstrateApi
      * // Make a transfer balance transaction
      * api.tx.balances.transferKeepAlive(<address>, <amount>)
      *    .signAndSend(<keyPair|address>, { signer }, ({ status }) => {
-     *      console.log('Transaction status', status.tag);
+     *      console.log('Transaction status', status.type);
      *    });
      * ```
      */

package/client/LegacyClient.js

@@ -13,7 +13,7 @@ const KEEP_ALIVE_INTERVAL = 10_000; // in ms
  * import type { PolkadotApi } from '@dedot/chaintypes/polkadot';
  *
  * const run = async () => {
- *   const api = await Dedot.new<PolkadotApi>('wss://rpc.polkadot.io');
+ *   const api = await LegacyClient.new<PolkadotApi>('wss://rpc.polkadot.io');
  *
  *   // Call rpc `state_getMetadata` to fetch raw scale-encoded metadata and decode it.
  *   const metadata = await api.rpc.state.getMetadata();
@@ -41,7 +41,8 @@ const KEEP_ALIVE_INTERVAL = 10_000; // in ms
  * run().catch(console.error);
  * ```
  */
-export class LegacyClient extends BaseSubstrateClient {
+export class LegacyClient// prettier-end-here
+ extends BaseSubstrateClient {
     #runtimeSubscriptionUnsub;
     #healthTimer;
     #apiAtCache = {};
@@ -62,7 +63,7 @@ export class LegacyClient extends BaseSubstrateClient {
         return new LegacyClient(options).connect();
     }
     /**
-     * Alias for __Dedot.create__
+     * Alias for __LegacyClient.create__
      *
      * @param options
      */
@@ -202,7 +203,7 @@ export class LegacyClient extends BaseSubstrateClient {
      * // Make a transfer balance transaction
      * api.tx.balances.transferKeepAlive(<address>, <amount>)
      *    .signAndSend(<keyPair|address>, { signer }, ({ status }) => {
-     *      console.log('Transaction status', status.tag);
+     *      console.log('Transaction status', status.type);
      *    });
      * ```
      */

package/executor/ErrorExecutor.js

@@ -17,7 +17,7 @@ export class ErrorExecutor extends Executor {
                 palletIndex: targetPallet.index,
             },
             is: (errorInfo) => {
-                if (isObject(errorInfo) && errorInfo.tag === 'Module') {
+                if (isObject(errorInfo) && errorInfo.type === 'Module') {
                     errorInfo = errorInfo.value;
                 }
                 if (isObject(errorInfo) && isNumber(errorInfo.index) && isHex(errorInfo.error)) {
@@ -30,8 +30,8 @@ export class ErrorExecutor extends Executor {
     #getErrorDef(errorTypeId, errorName) {
         const def = this.metadata.types[errorTypeId];
         assert(def, new UnknownApiError(`Error def not found for id ${errorTypeId}`));
-        const { tag, value } = def.type;
-        assert(tag === 'Enum', new UnknownApiError(`Error type should be an enum, found: ${tag}`));
+        const { type, value } = def.typeDef;
+        assert(type === 'Enum', new UnknownApiError(`Error type should be an enum, found: ${type}`));
         const errorDef = value.members.find(({ name }) => stringPascalCase(name) === errorName);
         assert(errorDef, new UnknownApiError(`Error def not found for ${errorName}`));
         return {

package/executor/EventExecutor.js

@@ -36,8 +36,8 @@ export class EventExecutor extends Executor {
     #getEventDef(eventTypeId, errorName) {
         const def = this.metadata.types[eventTypeId];
         assert(def, new UnknownApiError(`Event def not found for id ${eventTypeId}`));
-        const { tag, value } = def.type;
-        assert(tag === 'Enum', new UnknownApiError(`Event type should be an enum, found: ${tag}`));
+        const { type, value } = def.typeDef;
+        assert(type === 'Enum', new UnknownApiError(`Event type should be an enum, found: ${type}`));
         const eventDef = value.members.find(({ name }) => stringPascalCase(name) === errorName);
         assert(eventDef, new UnknownApiError(`Event def not found for ${errorName}`));
         return {

package/executor/Executor.d.ts

@@ -19,13 +19,13 @@ export declare abstract class Executor<ChainApi extends GenericSubstrateApi = Ge
                 name: string;
                 typeId: number | undefined;
             }[];
-            type: {
-                tag: "Struct";
+            typeDef: {
+                type: "Struct";
                 value: {
                     fields: import("@dedot/codecs").Field[];
                 };
             } | {
-                tag: "Enum";
+                type: "Enum";
                 value: {
                     members: {
                         name: string;
@@ -35,33 +35,33 @@ export declare abstract class Executor<ChainApi extends GenericSubstrateApi = Ge
                     }[];
                 };
             } | {
-                tag: "Sequence";
+                type: "Sequence";
                 value: {
                     typeParam: number;
                 };
             } | {
-                tag: "SizedVec";
+                type: "SizedVec";
                 value: {
                     len: number;
                     typeParam: number;
                 };
             } | {
-                tag: "Tuple";
+                type: "Tuple";
                 value: {
                     fields: number[];
                 };
             } | {
-                tag: "Primitive";
+                type: "Primitive";
                 value: {
                     kind: "bool" | "char" | "str" | "u8" | "u16" | "u32" | "u64" | "u128" | "u256" | "i8" | "i16" | "i32" | "i64" | "i128" | "i256";
                 };
             } | {
-                tag: "Compact";
+                type: "Compact";
                 value: {
                     typeParam: number;
                 };
             } | {
-                tag: "BitSequence";
+                type: "BitSequence";
                 value: {
                     bitOrderType: number;
                     bitStoreType: number;
@@ -76,13 +76,13 @@ export declare abstract class Executor<ChainApi extends GenericSubstrateApi = Ge
                 entries: {
                     name: string;
                     modifier: string;
-                    type: {
-                        tag: "Plain";
+                    storageType: {
+                        type: "Plain";
                         value: {
                             valueTypeId: number;
                         };
                     } | {
-                        tag: "Map";
+                        type: "Map";
                         value: {
                             hashers: ("identity" | "blake2_128" | "blake2_256" | "blake2_128Concat" | "twox128" | "twox256" | "twox64Concat")[];
                             keyTypeId: number;