@dedot/api 0.0.1-next.d9aff57d.57 → 0.1.0

package/chaintypes/substrate/types.js

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

package/cjs/chaintypes/substrate/consts.js

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

package/cjs/chaintypes/substrate/errors.js

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

package/cjs/chaintypes/substrate/events.js

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

package/cjs/chaintypes/substrate/index.js

@@ -1,5 +1,5 @@
 "use strict";
-// Generated by @dedot/codegen
+// 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,3 +1,3 @@
 "use strict";
-// Generated by @dedot/codegen
+// Generated by dedot cli
 Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/chaintypes/substrate/query.js

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

package/cjs/chaintypes/substrate/runtime.js

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

package/cjs/chaintypes/substrate/tx.js

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

package/cjs/chaintypes/substrate/types.js

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

package/cjs/client/BaseSubstrateClient.js

@@ -26,6 +26,7 @@ class BaseSubstrateClient extends index_js_2.JsonRpcClient {
     _genesisHash;
     _runtimeVersion;
     _localCache;
+    _runtimeUpgrading;
     constructor(rpcVersion, options) {
         super(options);
         this.rpcVersion = rpcVersion;
@@ -197,6 +198,22 @@ class BaseSubstrateClient extends index_js_2.JsonRpcClient {
             }, {}),
         };
     }
+    startRuntimeUpgrade() {
+        this._runtimeUpgrading = (0, utils_1.deferred)();
+    }
+    doneRuntimeUpgrade() {
+        if (!this._runtimeUpgrading)
+            return;
+        this._runtimeUpgrading.resolve();
+        setTimeout(() => {
+            this._runtimeUpgrading = undefined;
+        });
+    }
+    async ensureRuntimeUpgraded() {
+        if (!this._runtimeUpgrading)
+            return;
+        await this._runtimeUpgrading.promise;
+    }
     /// --- Public APIs ---
     /**
      * @description Connect to blockchain node
@@ -228,6 +245,10 @@ class BaseSubstrateClient extends index_js_2.JsonRpcClient {
     get runtimeVersion() {
         return ensurePresence(this._runtimeVersion);
     }
+    async getRuntimeVersion() {
+        await this.ensureRuntimeUpgraded();
+        return this.runtimeVersion;
+    }
     get consts() {
         return (0, proxychain_js_1.newProxyChain)({ executor: new index_js_1.ConstantExecutor(this) });
     }

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;
@@ -102,16 +103,16 @@ class DedotClient extends BaseSubstrateClient_js_1.BaseSubstrateClient {
     subscribeRuntimeUpgrades() {
         this.chainHead.on('bestBlock', this.onRuntimeUpgrade);
     }
-    unsubscribeRuntimeUpgrades() {
-        this.chainHead.off('bestBlock', this.onRuntimeUpgrade);
-    }
     onRuntimeUpgrade = async (block) => {
         const runtimeUpgraded = block.runtime && block.runtime.specVersion !== this._runtimeVersion?.specVersion;
         if (!runtimeUpgraded)
             return;
+        this.startRuntimeUpgrade();
         this._runtimeVersion = block.runtime;
         const newMetadata = await this.fetchMetadata(undefined, this._runtimeVersion);
         await this.setupMetadata(newMetadata);
+        this.emit('runtimeUpgraded', this._runtimeVersion);
+        this.doneRuntimeUpgrade();
     };
     async beforeDisconnect() {
         await this.chainHead.unfollow();

package/cjs/client/{Dedot.js → LegacyClient.js}

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Dedot = void 0;
+exports.LegacyClient = void 0;
 const codecs_1 = require("@dedot/codecs");
 const index_js_1 = require("../executor/index.js");
 const proxychain_js_1 = require("../proxychain.js");
 const BaseSubstrateClient_js_1 = require("./BaseSubstrateClient.js");
 const KEEP_ALIVE_INTERVAL = 10_000; // in ms
 /**
- * @name Dedot
+ * @name LegacyClient
  * @description Promised-based API Client for Polkadot & Substrate
  *
  * Initialize API instance and interact with substrate-based network
@@ -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 Dedot extends BaseSubstrateClient_js_1.BaseSubstrateClient {
+class LegacyClient// prettier-end-here
+ extends BaseSubstrateClient_js_1.BaseSubstrateClient {
     #runtimeSubscriptionUnsub;
     #healthTimer;
     #apiAtCache = {};
@@ -62,15 +63,15 @@ class Dedot extends BaseSubstrateClient_js_1.BaseSubstrateClient {
      * @param options
      */
     static async create(options) {
-        return new Dedot(options).connect();
+        return new LegacyClient(options).connect();
     }
     /**
-     * Alias for __Dedot.create__
+     * Alias for __LegacyClient.create__
      *
      * @param options
      */
     static async new(options) {
-        return Dedot.create(options);
+        return LegacyClient.create(options);
     }
     onDisconnected = async () => {
         await this.#unsubscribeUpdates();
@@ -104,9 +105,12 @@ class Dedot extends BaseSubstrateClient_js_1.BaseSubstrateClient {
         this.rpc
             .state_subscribeRuntimeVersion(async (runtimeVersion) => {
             if (runtimeVersion.specVersion !== this.runtimeVersion?.specVersion) {
+                this.startRuntimeUpgrade();
                 this._runtimeVersion = this.toSubstrateRuntimeVersion(runtimeVersion);
                 const newMetadata = await this.fetchMetadata(undefined, this._runtimeVersion);
                 await this.setupMetadata(newMetadata);
+                this.emit('runtimeUpgraded', this._runtimeVersion);
+                this.doneRuntimeUpgrade();
             }
         })
             .then((unsub) => {
@@ -205,7 +209,7 @@ class Dedot 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);
      *    });
      * ```
      */
@@ -247,4 +251,4 @@ class Dedot extends BaseSubstrateClient_js_1.BaseSubstrateClient {
         return api;
     }
 }
-exports.Dedot = Dedot;
+exports.LegacyClient = LegacyClient;

package/cjs/client/index.js

@@ -14,5 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Dedot.js"), exports);
+__exportStar(require("./LegacyClient.js"), exports);
 __exportStar(require("./DedotClient.js"), exports);

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/executor/v2/StorageQueryExecutorV2.js

@@ -35,27 +35,27 @@ class StorageQueryExecutorV2 extends StorageQueryExecutor_js_1.StorageQueryExecu
         }, {});
     }
     async subscribeStorage(keys, callback) {
-        let initialHash = await this.chainHead.bestHash();
+        let best = await this.chainHead.bestBlock();
         let eventToListen = 'bestBlock';
         // TODO subscribe to finalized data source
         // initialHash = this.chainHead.finalizedHash;
         // eventToListen = 'finalizedBlock';
-        const latestChanges = {};
-        const pull = async (hash) => {
+        const latestChanges = new Map();
+        const pull = async ({ hash }) => {
             const results = await this.queryStorage(keys, hash);
             let changed = false;
             keys.forEach((key) => {
                 const newValue = results[key];
-                if (latestChanges[key] === newValue)
+                if (latestChanges.size > 0 && latestChanges.get(key) === newValue)
                     return;
                 changed = true;
-                latestChanges[key] = newValue;
+                latestChanges.set(key, newValue);
             });
             if (!changed)
                 return;
-            callback(keys.map((key) => latestChanges[key]));
+            callback(keys.map((key) => latestChanges.get(key)));
         };
-        await pull(initialHash);
+        await pull(best);
         const unsub = this.chainHead.on(eventToListen, pull);
         return async () => {
             unsub();

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/CheckMetadataHash.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CheckMetadataHash = void 0;
+const utils_1 = require("@dedot/utils");
+const SignedExtension_js_1 = require("../SignedExtension.js");
+/**
+ * @description Genesis hash check to provide replay protection between different networks.
+ */
+class CheckMetadataHash extends SignedExtension_js_1.SignedExtension {
+    async init() {
+        let metadataHash = this.payloadOptions.metadataHash;
+        if (metadataHash) {
+            (0, utils_1.assert)((0, utils_1.isHex)(metadataHash), 'Metadata hash is not a valid hex string');
+            this.data = { mode: 'Enabled' };
+            this.additionalSigned = metadataHash;
+        }
+        else {
+            this.data = { mode: 'Disabled' };
+            this.additionalSigned = undefined;
+        }
+    }
+    toPayload() {
+        // Ref: https://github.com/paritytech/polkadot-sdk/blob/8dbe4ee80734bba6644c7e5f879a363ce7c0a19f/substrate/frame/metadata-hash-extension/src/lib.rs#L55-L58
+        let enabled = this.data.mode === 'Enabled';
+        return {
+            mode: enabled ? 1 : 0, // 0 -> disabled, 1 -> enabled
+            metadataHash: this.additionalSigned,
+        };
+    }
+}
+exports.CheckMetadataHash = CheckMetadataHash;

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

@@ -4,6 +4,7 @@ exports.knownSignedExtensions = void 0;
 const ChargeAssetTxPayment_js_1 = require("./ChargeAssetTxPayment.js");
 const ChargeTransactionPayment_js_1 = require("./ChargeTransactionPayment.js");
 const CheckGenesis_js_1 = require("./CheckGenesis.js");
+const CheckMetadataHash_js_1 = require("./CheckMetadataHash.js");
 const CheckMortality_js_1 = require("./CheckMortality.js");
 const CheckNonZeroSender_js_1 = require("./CheckNonZeroSender.js");
 const CheckNonce_js_1 = require("./CheckNonce.js");
@@ -11,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,
@@ -22,4 +24,6 @@ exports.knownSignedExtensions = {
     ChargeTransactionPayment: ChargeTransactionPayment_js_1.ChargeTransactionPayment,
     PrevalidateAttests: PrevalidateAttests_js_1.PrevalidateAttests,
     ChargeAssetTxPayment: ChargeAssetTxPayment_js_1.ChargeAssetTxPayment,
+    CheckMetadataHash: CheckMetadataHash_js_1.CheckMetadataHash,
+    StorageWeightReclaim: StorageWeightReclaim_js_1.StorageWeightReclaim,
 };

package/cjs/extrinsic/submittable/BaseSubmittableExtrinsic.js

@@ -8,6 +8,7 @@ const fakeSigner_js_1 = require("./fakeSigner.js");
 const utils_js_1 = require("./utils.js");
 class BaseSubmittableExtrinsic extends codecs_1.Extrinsic {
     api;
+    #alterTx;
     constructor(api, call) {
         super(api.registry, call);
         this.api = api;
@@ -26,13 +27,14 @@ class BaseSubmittableExtrinsic extends codecs_1.Extrinsic {
         });
         await extra.init();
         const { signer } = options || {};
-        let signature;
+        let signature, alteredTx;
         if ((0, utils_js_1.isKeyringPair)(fromAccount)) {
             signature = (0, utils_1.u8aToHex)((0, utils_js_1.signRaw)(fromAccount, extra.toRawPayload(this.callHex).data));
         }
         else if (signer?.signPayload) {
             const result = await signer.signPayload(extra.toPayload(this.callHex));
             signature = result.signature;
+            alteredTx = result.signedTransaction;
         }
         else {
             throw new Error('Signer not found. Cannot sign the extrinsic!');
@@ -44,6 +46,13 @@ class BaseSubmittableExtrinsic extends codecs_1.Extrinsic {
             signature: $Signature.tryDecode(signature),
             extra: extra.data,
         });
+        // If the tx payload are altered from signer
+        // We'll need to validate the altered tx
+        // and broadcast it instead of the original tx
+        if (alteredTx) {
+            this.#validateSignedTx(alteredTx);
+            this.#alterTx = (0, utils_1.toHex)(alteredTx);
+        }
         return this;
     }
     async signAndSend(fromAccount, partialOptions, maybeCallback) {
@@ -66,5 +75,26 @@ class BaseSubmittableExtrinsic extends codecs_1.Extrinsic {
         const atApi = (await this.api.at(hash));
         return await atApi.query.system.events();
     }
+    toHex() {
+        return this.#alterTx || super.toHex();
+    }
+    /**
+     * Validate a raw signed transaction coming from signer
+     * We need to make sure the tx is signed and call-data is intact/not-changing
+     *
+     * @param tx
+     * @private
+     */
+    #validateSignedTx(tx) {
+        const alteredTx = this.$Codec.tryDecode(tx);
+        // The alter tx should be signed
+        if (!alteredTx.signed) {
+            throw new utils_1.DedotError('Altered transaction from signer is not signed');
+        }
+        // Signer's not allow the change the call data
+        if (alteredTx.callHex !== this.callHex) {
+            throw new utils_1.DedotError('Call data does not match, signer is not allowed to change tx call data.');
+        }
+    }
 }
 exports.BaseSubmittableExtrinsic = BaseSubmittableExtrinsic;

package/cjs/extrinsic/submittable/SubmittableExtrinsic.js

@@ -4,6 +4,7 @@ exports.SubmittableExtrinsic = void 0;
 const utils_1 = require("@dedot/utils");
 const BaseSubmittableExtrinsic_js_1 = require("./BaseSubmittableExtrinsic.js");
 const SubmittableResult_js_1 = require("./SubmittableResult.js");
+const utils_js_1 = require("./utils.js");
 /**
  * @name SubmittableExtrinsic
  * @description A wrapper around an Extrinsic that exposes methods to sign, send, and other utility around Extrinsic.
@@ -22,19 +23,21 @@ class SubmittableExtrinsic extends BaseSubmittableExtrinsic_js_1.BaseSubmittable
         const txHex = this.toHex();
         const txHash = this.hash;
         if (isSubscription) {
-            return this.api.rpc.author_submitAndWatchExtrinsic(txHex, async (status) => {
-                if (status.tag === 'InBlock' || status.tag === 'Finalized') {
-                    const blockHash = status.value;
+            return this.api.rpc.author_submitAndWatchExtrinsic(txHex, async (txStatus) => {
+                if (txStatus.type === 'InBlock' || txStatus.type === 'Finalized') {
+                    const blockHash = txStatus.value;
                     const [signedBlock, blockEvents] = await Promise.all([
                         this.api.rpc.chain_getBlock(blockHash),
                         this.getSystemEventsAt(blockHash),
                     ]);
                     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);
+                    const status = (0, utils_js_1.toTxStatus)(txStatus, txIndex);
                     return callback(new SubmittableResult_js_1.SubmittableResult({ status, txHash, events, txIndex }));
                 }
                 else {
+                    const status = (0, utils_js_1.toTxStatus)(txStatus);
                     return callback(new SubmittableResult_js_1.SubmittableResult({ status, txHash }));
                 }
             });

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);
                     }