@dedot/api 0.1.1 → 0.3.0

package/chaintypes/substrate/consts.js

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

package/chaintypes/substrate/errors.js

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

package/chaintypes/substrate/events.js

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

package/chaintypes/substrate/index.js

@@ -1,2 +1 @@
-// Generated by dedot cli
 export * from './types.js';

package/chaintypes/substrate/json-rpc.js

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

package/chaintypes/substrate/query.js

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

package/chaintypes/substrate/runtime.js

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

package/chaintypes/substrate/tx.js

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

package/chaintypes/substrate/types.js

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

package/cjs/chaintypes/substrate/consts.js

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

package/cjs/chaintypes/substrate/errors.js

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

package/cjs/chaintypes/substrate/events.js

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

package/cjs/chaintypes/substrate/index.js

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

package/cjs/chaintypes/substrate/query.js

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

package/cjs/chaintypes/substrate/runtime.js

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

package/cjs/chaintypes/substrate/tx.js

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

package/cjs/chaintypes/substrate/types.js

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

package/cjs/client/BaseSubstrateClient.js

@@ -274,5 +274,8 @@ class BaseSubstrateClient extends index_js_2.JsonRpcClient {
     at(hash) {
         throw new Error('Unimplemented!');
     }
+    setSigner(signer) {
+        this._options.signer = signer;
+    }
 }
 exports.BaseSubstrateClient = BaseSubstrateClient;

package/cjs/executor/EventExecutor.js

@@ -3,37 +3,58 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventExecutor = void 0;
 const utils_1 = require("@dedot/utils");
 const Executor_js_1 = require("./Executor.js");
+const utils_js_1 = require("./utils.js");
 /**
  * @name EventExecutor
  * @description Find pallet event information from metadata
  */
 class EventExecutor extends Executor_js_1.Executor {
-    doExecute(pallet, errorName) {
+    doExecute(pallet, eventName) {
         const targetPallet = this.getPallet(pallet);
         const eventTypeId = targetPallet.event;
         (0, utils_1.assert)(eventTypeId, new utils_1.UnknownApiError(`Not found event with id ${eventTypeId} in pallet ${pallet}`));
-        const eventDef = this.#getEventDef(eventTypeId, errorName);
+        const eventDef = this.#getEventDef(eventTypeId, eventName);
         const is = (event) => {
+            if ((0, utils_js_1.isEventRecord)(event)) {
+                event = event.event;
+            }
             const palletCheck = (0, utils_1.stringCamelCase)(event.pallet) === pallet;
             if (typeof event.palletEvent === 'string') {
-                return palletCheck && (0, utils_1.stringPascalCase)(event.palletEvent) === errorName;
+                return palletCheck && (0, utils_1.stringPascalCase)(event.palletEvent) === eventName;
             }
             else if (typeof event.palletEvent === 'object') {
-                return palletCheck && (0, utils_1.stringPascalCase)(event.palletEvent.name) === errorName;
+                return palletCheck && (0, utils_1.stringPascalCase)(event.palletEvent.name) === eventName;
             }
             return false;
         };
-        const as = (event) => {
-            return is(event) ? event : undefined;
+        const find = (events) => {
+            if (!events || events.length === 0)
+                return undefined;
+            if ((0, utils_js_1.isEventRecord)(events[0])) {
+                return events.map(({ event }) => event).find(is);
+            }
+            else {
+                return events.find(is);
+            }
+        };
+        const filter = (events) => {
+            if ((0, utils_js_1.isEventRecord)(events[0])) {
+                return events.map(({ event }) => event).filter(is);
+            }
+            else {
+                return events.filter(is);
+            }
+        };
+        const meta = {
+            ...eventDef,
+            pallet: targetPallet.name,
+            palletIndex: targetPallet.index,
         };
         return {
             is,
-            as,
-            meta: {
-                ...eventDef,
-                pallet: targetPallet.name,
-                palletIndex: targetPallet.index,
-            },
+            find,
+            filter,
+            meta,
         };
     }
     #getEventDef(eventTypeId, errorName) {

package/cjs/executor/index.js

@@ -14,6 +14,7 @@ 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("./utils.js"), exports);
 __exportStar(require("./Executor.js"), exports);
 __exportStar(require("./ConstantExecutor.js"), exports);
 __exportStar(require("./StorageQueryExecutor.js"), exports);

package/cjs/executor/utils.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEventRecord = exports.isPalletEvent = void 0;
+/**
+ * Checks if the provided object is a valid `PalletEvent`.
+ *
+ * @param event - The object to be checked.
+ * @returns `true` if the object is a valid `PalletEvent`, `false` otherwise.
+ *
+ * @remarks
+ * A `PalletEvent` is expected to have the following properties:
+ * - `pallet`: A string representing the name of the pallet associated with the event.
+ * - `palletEvent`: An object or string representing the details of the pallet event.
+ *
+ * This function validates the presence and type of these properties in the provided object.
+ */
+const isPalletEvent = (event) => {
+    return ('pallet' in event &&
+        typeof event['pallet'] === 'string' &&
+        'palletEvent' in event &&
+        (typeof event['palletEvent'] === 'object' || typeof event['palletEvent'] === 'string'));
+};
+exports.isPalletEvent = isPalletEvent;
+/**
+ * Checks if the provided object is a valid `IEventRecord`.
+ *
+ * @param event - The object to be checked.
+ * @returns `true` if the object is a valid `IEventRecord`, `false` otherwise.
+ *
+ * @remarks
+ * An `IEventRecord` is expected to have the following properties:
+ * - `phase`: An object representing the phase of the event.
+ * - `event`: An object representing the event details.
+ * - `topics`: An array of topics associated with the event.
+ *
+ * This function validates the presence and type of these properties in the provided object.
+ */
+const isEventRecord = (event) => {
+    return ('phase' in event &&
+        typeof event['phase'] === 'object' &&
+        'event' in event &&
+        (0, exports.isPalletEvent)(event['event']) &&
+        'topics' in event &&
+        Array.isArray(event['topics']));
+};
+exports.isEventRecord = isEventRecord;

package/cjs/extrinsic/submittable/BaseSubmittableExtrinsic.js

@@ -26,7 +26,7 @@ class BaseSubmittableExtrinsic extends codecs_1.Extrinsic {
             payloadOptions: options,
         });
         await extra.init();
-        const { signer } = options || {};
+        const signer = this.#getSigner(options);
         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));
@@ -96,5 +96,8 @@ class BaseSubmittableExtrinsic extends codecs_1.Extrinsic {
             throw new utils_1.DedotError('Call data does not match, signer is not allowed to change tx call data.');
         }
     }
+    #getSigner(options) {
+        return options?.signer || this.api.options.signer;
+    }
 }
 exports.BaseSubmittableExtrinsic = BaseSubmittableExtrinsic;

package/cjs/extrinsic/submittable/SubmittableExtrinsic.js

@@ -33,7 +33,8 @@ 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.type === 'ApplyExtrinsic' && phase.value === txIndex);
-                    const status = (0, utils_js_1.toTxStatus)(txStatus, txIndex);
+                    const blockNumber = signedBlock.block.header.number;
+                    const status = (0, utils_js_1.toTxStatus)(txStatus, { txIndex, blockNumber });
                     return callback(new SubmittableResult_js_1.SubmittableResult({ status, txHash, events, txIndex }));
                 }
                 else {

package/cjs/extrinsic/submittable/SubmittableExtrinsicV2.js

@@ -36,15 +36,17 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
         const checkTxIsOnChain = async (blockHash) => {
             if (blockHash === finalizedHash)
                 return;
+            const block = api.chainHead.findBlock(blockHash);
             const txs = await api.chainHead.body(blockHash);
             const txIndex = txs.indexOf(txHex);
             if (txIndex < 0) {
-                return checkTxIsOnChain(api.chainHead.findBlock(blockHash).parent);
+                return checkTxIsOnChain(block.parent);
             }
             const events = await this.getSystemEventsAt(blockHash);
             const txEvents = events.filter(({ phase }) => phase.type == 'ApplyExtrinsic' && phase.value === txIndex);
             return {
                 blockHash,
+                blockNumber: block.number,
                 index: txIndex,
                 events: txEvents,
             };
@@ -99,9 +101,9 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
                         return;
                 }
                 txFound = inBlock;
-                const { index: txIndex, events, blockHash } = inBlock;
+                const { index: txIndex, events, blockHash, blockNumber } = inBlock;
                 callback(new SubmittableResult_js_1.SubmittableResult({
-                    status: { type: 'BestChainBlockIncluded', value: { blockHash, txIndex } },
+                    status: { type: 'BestChainBlockIncluded', value: { blockHash, blockNumber, txIndex } },
                     txHash,
                     events,
                     txIndex,
@@ -132,9 +134,9 @@ class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic_js_1.BaseSubmittab
         const checkFinalizedBlockIncluded = async (block) => {
             const inBlock = await checkTxIsOnChain(block.hash);
             if (inBlock) {
-                const { index: txIndex, events, blockHash } = inBlock;
+                const { index: txIndex, events, blockHash, blockNumber } = inBlock;
                 callback(new SubmittableResult_js_1.SubmittableResult({
-                    status: { type: 'Finalized', value: { blockHash, txIndex } },
+                    status: { type: 'Finalized', value: { blockHash, blockNumber, txIndex } },
                     txHash,
                     events,
                     txIndex,

package/cjs/extrinsic/submittable/utils.js

@@ -23,9 +23,9 @@ exports.signRaw = signRaw;
  *
  * Ref: https://github.com/paritytech/polkadot-sdk/blob/98a364fe6e7abf10819f5fddd3de0588f7c38700/substrate/client/rpc-spec-v2/src/transaction/transaction.rs#L132-L159
  * @param txStatus
- * @param txIndex
+ * @param txInfo
  */
-function toTxStatus(txStatus, txIndex) {
+function toTxStatus(txStatus, txInfo) {
     switch (txStatus.type) {
         case 'Ready':
         case 'Future':
@@ -35,21 +35,21 @@ function toTxStatus(txStatus, txIndex) {
         case 'Retracted':
             return { type: 'NoLongerInBestChain' };
         case 'InBlock':
-            (0, utils_1.assert)(txIndex, 'TxIndex is required');
+            (0, utils_1.assert)(txInfo, 'TxInfo is required');
             return {
                 type: 'BestChainBlockIncluded',
                 value: {
                     blockHash: txStatus.value,
-                    txIndex,
+                    ...txInfo,
                 },
             };
         case 'Finalized':
-            (0, utils_1.assert)(txIndex, 'TxIndex is required');
+            (0, utils_1.assert)(txInfo, 'TxInfo is required');
             return {
                 type: 'Finalized',
                 value: {
                     blockHash: txStatus.value,
-                    txIndex,
+                    ...txInfo,
                 },
             };
         case 'FinalityTimeout':

package/client/BaseSubstrateClient.d.ts

@@ -1,3 +1,4 @@
+import { Signer } from '@polkadot/types/types';
 import { BlockHash, Hash, Metadata, PortableRegistry, RuntimeVersion } from '@dedot/codecs';
 import type { JsonRpcProvider } from '@dedot/providers';
 import { type IStorage } from '@dedot/storage';
@@ -68,4 +69,5 @@ export declare abstract class BaseSubstrateClient<Rv extends RpcVersion, ChainAp
     protected callAt(hash?: BlockHash): ChainApi[Rv]['call'];
     get tx(): ChainApi[Rv]['tx'];
     at<ChainApiAt extends GenericSubstrateApi = ChainApi[Rv]>(hash: BlockHash): Promise<ISubstrateClientAt<ChainApiAt>>;
+    setSigner(signer?: Signer): void;
 }

package/client/BaseSubstrateClient.js

@@ -270,4 +270,7 @@ export class BaseSubstrateClient extends JsonRpcClient {
     at(hash) {
         throw new Error('Unimplemented!');
     }
+    setSigner(signer) {
+        this._options.signer = signer;
+    }
 }

package/executor/EventExecutor.d.ts

@@ -6,5 +6,5 @@ import { Executor } from './Executor.js';
  */
 export declare class EventExecutor<ChainApi extends GenericSubstrateApi = GenericSubstrateApi> extends Executor<ChainApi> {
     #private;
-    doExecute(pallet: string, errorName: string): GenericPalletEvent;
+    doExecute(pallet: string, eventName: string): GenericPalletEvent;
 }

package/executor/EventExecutor.js

@@ -1,36 +1,57 @@
 import { assert, stringCamelCase, stringPascalCase, UnknownApiError } from '@dedot/utils';
 import { Executor } from './Executor.js';
+import { isEventRecord } from './utils.js';
 /**
  * @name EventExecutor
  * @description Find pallet event information from metadata
  */
 export class EventExecutor extends Executor {
-    doExecute(pallet, errorName) {
+    doExecute(pallet, eventName) {
         const targetPallet = this.getPallet(pallet);
         const eventTypeId = targetPallet.event;
         assert(eventTypeId, new UnknownApiError(`Not found event with id ${eventTypeId} in pallet ${pallet}`));
-        const eventDef = this.#getEventDef(eventTypeId, errorName);
+        const eventDef = this.#getEventDef(eventTypeId, eventName);
         const is = (event) => {
+            if (isEventRecord(event)) {
+                event = event.event;
+            }
             const palletCheck = stringCamelCase(event.pallet) === pallet;
             if (typeof event.palletEvent === 'string') {
-                return palletCheck && stringPascalCase(event.palletEvent) === errorName;
+                return palletCheck && stringPascalCase(event.palletEvent) === eventName;
             }
             else if (typeof event.palletEvent === 'object') {
-                return palletCheck && stringPascalCase(event.palletEvent.name) === errorName;
+                return palletCheck && stringPascalCase(event.palletEvent.name) === eventName;
             }
             return false;
         };
-        const as = (event) => {
-            return is(event) ? event : undefined;
+        const find = (events) => {
+            if (!events || events.length === 0)
+                return undefined;
+            if (isEventRecord(events[0])) {
+                return events.map(({ event }) => event).find(is);
+            }
+            else {
+                return events.find(is);
+            }
+        };
+        const filter = (events) => {
+            if (isEventRecord(events[0])) {
+                return events.map(({ event }) => event).filter(is);
+            }
+            else {
+                return events.filter(is);
+            }
+        };
+        const meta = {
+            ...eventDef,
+            pallet: targetPallet.name,
+            palletIndex: targetPallet.index,
         };
         return {
             is,
-            as,
-            meta: {
-                ...eventDef,
-                pallet: targetPallet.name,
-                palletIndex: targetPallet.index,
-            },
+            find,
+            filter,
+            meta,
         };
     }
     #getEventDef(eventTypeId, errorName) {

package/executor/index.d.ts

@@ -1,3 +1,4 @@
+export * from './utils.js';
 export * from './Executor.js';
 export * from './ConstantExecutor.js';
 export * from './StorageQueryExecutor.js';

package/executor/index.js

@@ -1,3 +1,4 @@
+export * from './utils.js';
 export * from './Executor.js';
 export * from './ConstantExecutor.js';
 export * from './StorageQueryExecutor.js';

package/executor/utils.d.ts

@@ -0,0 +1,30 @@
+import type { IEventRecord, PalletEvent } from '@dedot/types';
+/**
+ * Checks if the provided object is a valid `PalletEvent`.
+ *
+ * @param event - The object to be checked.
+ * @returns `true` if the object is a valid `PalletEvent`, `false` otherwise.
+ *
+ * @remarks
+ * A `PalletEvent` is expected to have the following properties:
+ * - `pallet`: A string representing the name of the pallet associated with the event.
+ * - `palletEvent`: An object or string representing the details of the pallet event.
+ *
+ * This function validates the presence and type of these properties in the provided object.
+ */
+export declare const isPalletEvent: (event: any) => event is PalletEvent<string, string, any>;
+/**
+ * Checks if the provided object is a valid `IEventRecord`.
+ *
+ * @param event - The object to be checked.
+ * @returns `true` if the object is a valid `IEventRecord`, `false` otherwise.
+ *
+ * @remarks
+ * An `IEventRecord` is expected to have the following properties:
+ * - `phase`: An object representing the phase of the event.
+ * - `event`: An object representing the event details.
+ * - `topics`: An array of topics associated with the event.
+ *
+ * This function validates the presence and type of these properties in the provided object.
+ */
+export declare const isEventRecord: (event: any) => event is IEventRecord<import("@dedot/types").IRuntimeEvent, `0x${string}`>;

package/executor/utils.js

@@ -0,0 +1,41 @@
+/**
+ * Checks if the provided object is a valid `PalletEvent`.
+ *
+ * @param event - The object to be checked.
+ * @returns `true` if the object is a valid `PalletEvent`, `false` otherwise.
+ *
+ * @remarks
+ * A `PalletEvent` is expected to have the following properties:
+ * - `pallet`: A string representing the name of the pallet associated with the event.
+ * - `palletEvent`: An object or string representing the details of the pallet event.
+ *
+ * This function validates the presence and type of these properties in the provided object.
+ */
+export const isPalletEvent = (event) => {
+    return ('pallet' in event &&
+        typeof event['pallet'] === 'string' &&
+        'palletEvent' in event &&
+        (typeof event['palletEvent'] === 'object' || typeof event['palletEvent'] === 'string'));
+};
+/**
+ * Checks if the provided object is a valid `IEventRecord`.
+ *
+ * @param event - The object to be checked.
+ * @returns `true` if the object is a valid `IEventRecord`, `false` otherwise.
+ *
+ * @remarks
+ * An `IEventRecord` is expected to have the following properties:
+ * - `phase`: An object representing the phase of the event.
+ * - `event`: An object representing the event details.
+ * - `topics`: An array of topics associated with the event.
+ *
+ * This function validates the presence and type of these properties in the provided object.
+ */
+export const isEventRecord = (event) => {
+    return ('phase' in event &&
+        typeof event['phase'] === 'object' &&
+        'event' in event &&
+        isPalletEvent(event['event']) &&
+        'topics' in event &&
+        Array.isArray(event['topics']));
+};

package/extrinsic/submittable/BaseSubmittableExtrinsic.js

@@ -23,7 +23,7 @@ export class BaseSubmittableExtrinsic extends Extrinsic {
             payloadOptions: options,
         });
         await extra.init();
-        const { signer } = options || {};
+        const signer = this.#getSigner(options);
         let signature, alteredTx;
         if (isKeyringPair(fromAccount)) {
             signature = u8aToHex(signRaw(fromAccount, extra.toRawPayload(this.callHex).data));
@@ -93,4 +93,7 @@ export class BaseSubmittableExtrinsic extends Extrinsic {
             throw new DedotError('Call data does not match, signer is not allowed to change tx call data.');
         }
     }
+    #getSigner(options) {
+        return options?.signer || this.api.options.signer;
+    }
 }

package/extrinsic/submittable/SubmittableExtrinsic.js

@@ -30,7 +30,8 @@ export class SubmittableExtrinsic extends BaseSubmittableExtrinsic {
                     const txIndex = signedBlock.block.extrinsics.indexOf(txHex);
                     assert(txIndex >= 0, 'Extrinsic not found!');
                     const events = blockEvents.filter(({ phase }) => phase.type === 'ApplyExtrinsic' && phase.value === txIndex);
-                    const status = toTxStatus(txStatus, txIndex);
+                    const blockNumber = signedBlock.block.header.number;
+                    const status = toTxStatus(txStatus, { txIndex, blockNumber });
                     return callback(new SubmittableResult({ status, txHash, events, txIndex }));
                 }
                 else {

package/extrinsic/submittable/SubmittableExtrinsicV2.js

@@ -33,15 +33,17 @@ export class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic {
         const checkTxIsOnChain = async (blockHash) => {
             if (blockHash === finalizedHash)
                 return;
+            const block = api.chainHead.findBlock(blockHash);
             const txs = await api.chainHead.body(blockHash);
             const txIndex = txs.indexOf(txHex);
             if (txIndex < 0) {
-                return checkTxIsOnChain(api.chainHead.findBlock(blockHash).parent);
+                return checkTxIsOnChain(block.parent);
             }
             const events = await this.getSystemEventsAt(blockHash);
             const txEvents = events.filter(({ phase }) => phase.type == 'ApplyExtrinsic' && phase.value === txIndex);
             return {
                 blockHash,
+                blockNumber: block.number,
                 index: txIndex,
                 events: txEvents,
             };
@@ -96,9 +98,9 @@ export class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic {
                         return;
                 }
                 txFound = inBlock;
-                const { index: txIndex, events, blockHash } = inBlock;
+                const { index: txIndex, events, blockHash, blockNumber } = inBlock;
                 callback(new SubmittableResult({
-                    status: { type: 'BestChainBlockIncluded', value: { blockHash, txIndex } },
+                    status: { type: 'BestChainBlockIncluded', value: { blockHash, blockNumber, txIndex } },
                     txHash,
                     events,
                     txIndex,
@@ -129,9 +131,9 @@ export class SubmittableExtrinsicV2 extends BaseSubmittableExtrinsic {
         const checkFinalizedBlockIncluded = async (block) => {
             const inBlock = await checkTxIsOnChain(block.hash);
             if (inBlock) {
-                const { index: txIndex, events, blockHash } = inBlock;
+                const { index: txIndex, events, blockHash, blockNumber } = inBlock;
                 callback(new SubmittableResult({
-                    status: { type: 'Finalized', value: { blockHash, txIndex } },
+                    status: { type: 'Finalized', value: { blockHash, blockNumber, txIndex } },
                     txHash,
                     events,
                     txIndex,

package/extrinsic/submittable/utils.d.ts

@@ -9,11 +9,16 @@ export declare function isKeyringPair(account: AddressOrPair): account is IKeyri
  * @param raw
  */
 export declare function signRaw(signerPair: IKeyringPair, raw: HexString): Uint8Array;
+type TxInfo = {
+    txIndex: number;
+    blockNumber: number;
+};
 /**
  * Convert transaction status to transaction event
  *
  * Ref: https://github.com/paritytech/polkadot-sdk/blob/98a364fe6e7abf10819f5fddd3de0588f7c38700/substrate/client/rpc-spec-v2/src/transaction/transaction.rs#L132-L159
  * @param txStatus
- * @param txIndex
+ * @param txInfo
  */
-export declare function toTxStatus(txStatus: TransactionStatus, txIndex?: number): TxStatus;
+export declare function toTxStatus(txStatus: TransactionStatus, txInfo?: TxInfo): TxStatus;
+export {};

package/extrinsic/submittable/utils.js

@@ -18,9 +18,9 @@ export function signRaw(signerPair, raw) {
  *
  * Ref: https://github.com/paritytech/polkadot-sdk/blob/98a364fe6e7abf10819f5fddd3de0588f7c38700/substrate/client/rpc-spec-v2/src/transaction/transaction.rs#L132-L159
  * @param txStatus
- * @param txIndex
+ * @param txInfo
  */
-export function toTxStatus(txStatus, txIndex) {
+export function toTxStatus(txStatus, txInfo) {
     switch (txStatus.type) {
         case 'Ready':
         case 'Future':
@@ -30,21 +30,21 @@ export function toTxStatus(txStatus, txIndex) {
         case 'Retracted':
             return { type: 'NoLongerInBestChain' };
         case 'InBlock':
-            assert(txIndex, 'TxIndex is required');
+            assert(txInfo, 'TxInfo is required');
             return {
                 type: 'BestChainBlockIncluded',
                 value: {
                     blockHash: txStatus.value,
-                    txIndex,
+                    ...txInfo,
                 },
             };
         case 'Finalized':
-            assert(txIndex, 'TxIndex is required');
+            assert(txInfo, 'TxInfo is required');
             return {
                 type: 'Finalized',
                 value: {
                     blockHash: txStatus.value,
-                    txIndex,
+                    ...txInfo,
                 },
             };
         case 'FinalityTimeout':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/api",
-  "version": "0.1.1",
+  "version": "0.3.0",
   "description": "A delightful JavaScript/TypeScript client for Polkadot & Substrate",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/api",
@@ -13,13 +13,13 @@
   "type": "module",
   "sideEffects": false,
   "dependencies": {
-    "@dedot/codecs": "0.1.1",
-    "@dedot/providers": "0.1.1",
-    "@dedot/runtime-specs": "0.1.1",
-    "@dedot/shape": "0.1.1",
-    "@dedot/storage": "0.1.1",
-    "@dedot/types": "0.1.1",
-    "@dedot/utils": "0.1.1"
+    "@dedot/codecs": "0.3.0",
+    "@dedot/providers": "0.3.0",
+    "@dedot/runtime-specs": "0.3.0",
+    "@dedot/shape": "0.3.0",
+    "@dedot/storage": "0.3.0",
+    "@dedot/types": "0.3.0",
+    "@dedot/utils": "0.3.0"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json",
@@ -46,9 +46,9 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@polkadot/types": "^12.2.1"
+    "@polkadot/types": "^12.2.3"
   },
-  "gitHead": "ea6d1e7ba00a5931b86a7946afba820101a06fc2",
+  "gitHead": "40d0f3c7eee292b7615649e6a5d54887bee75fe2",
   "module": "./index.js",
   "types": "./index.d.ts"
 }

package/types.d.ts

@@ -1,3 +1,4 @@
+import { Signer } from '@polkadot/types/types';
 import { BlockHash, Hash, Metadata, PortableRegistry } from '@dedot/codecs';
 import type { ConnectionStatus, JsonRpcProvider, ProviderEvent } from '@dedot/providers';
 import type { AnyShape } from '@dedot/shape';
@@ -55,6 +56,10 @@ export interface ApiOptions extends JsonRpcClientOptions {
      * @default blake2_256
      */
     hasher?: HashFn;
+    /**
+     * A signer instance to use for signing transactions
+     */
+    signer?: Signer;
 }
 export type ApiEvent = ProviderEvent | 'ready' | 'runtimeUpgraded';
 export interface SubstrateRuntimeVersion {
@@ -109,6 +114,12 @@ export interface ISubstrateClient<ChainApi extends GenericSubstrateApi = Generic
      * This is helpful when you want to check runtime version to prepare for runtime upgrade
      */
     getRuntimeVersion(): Promise<SubstrateRuntimeVersion>;
+    /**
+     * Update the signer instance for signing transactions
+     *
+     * @param signer
+     */
+    setSigner(signer?: Signer): void;
 }
 /**
  * A generic interface for broadcasting transactions