@dedot/contracts 0.5.0 → 0.6.0

package/Contract.d.ts

@@ -2,11 +2,11 @@ import { ISubstrateClient } from '@dedot/api';
 import { AccountId32, AccountId32Like } from '@dedot/codecs';
 import { IEventRecord } from '@dedot/types';
 import { TypinkRegistry } from './TypinkRegistry.js';
-import { ContractEvent, ContractMetadata, GenericContractApi } from './types/index.js';
+import { ContractEvent, ContractMetadata, GenericContractApi, ExecutionOptions } from './types/index.js';
 export declare class Contract<ContractApi extends GenericContractApi = GenericContractApi> {
     #private;
     readonly client: ISubstrateClient<ContractApi['types']['ChainApi']>;
-    constructor(client: ISubstrateClient<ContractApi['types']['ChainApi']>, metadata: ContractMetadata | string, address: AccountId32Like);
+    constructor(client: ISubstrateClient<ContractApi['types']['ChainApi']>, metadata: ContractMetadata | string, address: AccountId32Like, options?: ExecutionOptions);
     decodeEvent(eventRecord: IEventRecord): ContractEvent;
     decodeEvents(eventRecords: IEventRecord[]): ContractEvent[];
     get metadata(): ContractMetadata;
@@ -15,4 +15,5 @@ export declare class Contract<ContractApi extends GenericContractApi = GenericCo
     get query(): ContractApi['query'];
     get tx(): ContractApi['tx'];
     get events(): ContractApi['events'];
+    get options(): ExecutionOptions | undefined;
 }

package/Contract.js

@@ -7,12 +7,14 @@ export class Contract {
     #registry;
     #address;
     #metadata;
-    constructor(client, metadata, address) {
+    #options;
+    constructor(client, metadata, address, options) {
         this.client = client;
         ensureSupportContractsPallet(client);
         this.#address = new AccountId32(address);
         this.#metadata = typeof metadata === 'string' ? parseRawMetadata(metadata) : metadata;
         this.#registry = new TypinkRegistry(this.#metadata);
+        this.#options = options;
     }
     decodeEvent(eventRecord) {
         return this.#registry.decodeEvent(eventRecord, this.address);
@@ -30,12 +32,15 @@ export class Contract {
         return this.#registry;
     }
     get query() {
-        return newProxyChain(new QueryExecutor(this.client, this.#registry, this.#address));
+        return newProxyChain(new QueryExecutor(this.client, this.#registry, this.#address, this.#options));
     }
     get tx() {
-        return newProxyChain(new TxExecutor(this.client, this.#registry, this.#address));
+        return newProxyChain(new TxExecutor(this.client, this.#registry, this.#address, this.#options));
     }
     get events() {
-        return newProxyChain(new EventExecutor(this.client, this.#registry, this.#address));
+        return newProxyChain(new EventExecutor(this.client, this.#registry, this.#address, this.#options));
+    }
+    get options() {
+        return this.#options;
     }
 }

package/ContractDeployer.d.ts

@@ -1,13 +1,14 @@
 import { ISubstrateClient } from '@dedot/api';
 import { Hash } from '@dedot/codecs';
 import { TypinkRegistry } from './TypinkRegistry.js';
-import { ContractMetadata, GenericContractApi } from './types/index.js';
+import { ContractMetadata, GenericContractApi, ExecutionOptions } from './types/index.js';
 export declare class ContractDeployer<ContractApi extends GenericContractApi = GenericContractApi> {
     #private;
     readonly client: ISubstrateClient<ContractApi['types']['ChainApi']>;
-    constructor(client: ISubstrateClient<ContractApi['types']['ChainApi']>, metadata: ContractMetadata | string, codeHashOrWasm: Hash | Uint8Array | string);
+    constructor(client: ISubstrateClient<ContractApi['types']['ChainApi']>, metadata: ContractMetadata | string, codeHashOrWasm: Hash | Uint8Array | string, options?: ExecutionOptions);
     get metadata(): ContractMetadata;
     get registry(): TypinkRegistry;
     get tx(): ContractApi['constructorTx'];
     get query(): ContractApi['constructorQuery'];
+    get options(): ExecutionOptions | undefined;
 }

package/ContractDeployer.js

@@ -7,12 +7,14 @@ export class ContractDeployer {
     #metadata;
     #registry;
     #code;
-    constructor(client, metadata, codeHashOrWasm) {
+    #options;
+    constructor(client, metadata, codeHashOrWasm, options) {
         this.client = client;
         ensureSupportContractsPallet(client);
         this.#metadata = typeof metadata === 'string' ? parseRawMetadata(metadata) : metadata;
         this.#registry = new TypinkRegistry(this.#metadata);
         this.#code = codeHashOrWasm;
+        this.#options = options;
     }
     get metadata() {
         return this.#metadata;
@@ -21,9 +23,12 @@ export class ContractDeployer {
         return this.#registry;
     }
     get tx() {
-        return newProxyChain(new ConstructorTxExecutor(this.client, this.#registry, this.#code));
+        return newProxyChain(new ConstructorTxExecutor(this.client, this.#registry, this.#code, this.#options));
     }
     get query() {
-        return newProxyChain(new ConstructorQueryExecutor(this.client, this.#registry, this.#code));
+        return newProxyChain(new ConstructorQueryExecutor(this.client, this.#registry, this.#code, this.#options));
+    }
+    get options() {
+        return this.#options;
     }
 }

package/cjs/Contract.js

@@ -10,12 +10,14 @@ class Contract {
     #registry;
     #address;
     #metadata;
-    constructor(client, metadata, address) {
+    #options;
+    constructor(client, metadata, address, options) {
         this.client = client;
         (0, utils_js_1.ensureSupportContractsPallet)(client);
         this.#address = new codecs_1.AccountId32(address);
         this.#metadata = typeof metadata === 'string' ? (0, utils_js_1.parseRawMetadata)(metadata) : metadata;
         this.#registry = new TypinkRegistry_js_1.TypinkRegistry(this.#metadata);
+        this.#options = options;
     }
     decodeEvent(eventRecord) {
         return this.#registry.decodeEvent(eventRecord, this.address);
@@ -33,13 +35,16 @@ class Contract {
         return this.#registry;
     }
     get query() {
-        return (0, utils_js_1.newProxyChain)(new index_js_1.QueryExecutor(this.client, this.#registry, this.#address));
+        return (0, utils_js_1.newProxyChain)(new index_js_1.QueryExecutor(this.client, this.#registry, this.#address, this.#options));
     }
     get tx() {
-        return (0, utils_js_1.newProxyChain)(new index_js_1.TxExecutor(this.client, this.#registry, this.#address));
+        return (0, utils_js_1.newProxyChain)(new index_js_1.TxExecutor(this.client, this.#registry, this.#address, this.#options));
     }
     get events() {
-        return (0, utils_js_1.newProxyChain)(new index_js_1.EventExecutor(this.client, this.#registry, this.#address));
+        return (0, utils_js_1.newProxyChain)(new index_js_1.EventExecutor(this.client, this.#registry, this.#address, this.#options));
+    }
+    get options() {
+        return this.#options;
     }
 }
 exports.Contract = Contract;

package/cjs/ContractDeployer.js

@@ -10,12 +10,14 @@ class ContractDeployer {
     #metadata;
     #registry;
     #code;
-    constructor(client, metadata, codeHashOrWasm) {
+    #options;
+    constructor(client, metadata, codeHashOrWasm, options) {
         this.client = client;
         (0, utils_js_1.ensureSupportContractsPallet)(client);
         this.#metadata = typeof metadata === 'string' ? (0, utils_js_1.parseRawMetadata)(metadata) : metadata;
         this.#registry = new TypinkRegistry_js_1.TypinkRegistry(this.#metadata);
         this.#code = codeHashOrWasm;
+        this.#options = options;
     }
     get metadata() {
         return this.#metadata;
@@ -24,10 +26,13 @@ class ContractDeployer {
         return this.#registry;
     }
     get tx() {
-        return (0, utils_js_1.newProxyChain)(new index_js_1.ConstructorTxExecutor(this.client, this.#registry, this.#code));
+        return (0, utils_js_1.newProxyChain)(new index_js_1.ConstructorTxExecutor(this.client, this.#registry, this.#code, this.#options));
     }
     get query() {
-        return (0, utils_js_1.newProxyChain)(new ConstructorQueryExecutor_js_1.ConstructorQueryExecutor(this.client, this.#registry, this.#code));
+        return (0, utils_js_1.newProxyChain)(new ConstructorQueryExecutor_js_1.ConstructorQueryExecutor(this.client, this.#registry, this.#code, this.#options));
+    }
+    get options() {
+        return this.#options;
     }
 }
 exports.ContractDeployer = ContractDeployer;

package/cjs/executor/ConstructorQueryExecutor.js

@@ -4,21 +4,17 @@ exports.ConstructorQueryExecutor = void 0;
 const utils_1 = require("@dedot/utils");
 const errors_js_1 = require("../errors.js");
 const utils_js_1 = require("../utils.js");
-const Executor_js_1 = require("./Executor.js");
-class ConstructorQueryExecutor extends Executor_js_1.Executor {
-    code;
-    constructor(client, registry, code) {
-        super(client, registry);
-        this.code = code;
-    }
+const index_js_1 = require("./abstract/index.js");
+class ConstructorQueryExecutor extends index_js_1.DeployerExecutor {
     doExecute(constructor) {
-        const meta = this.#findConstructorMeta(constructor);
+        const meta = this.findConstructorMeta(constructor);
         (0, utils_1.assert)(meta, `Constructor message not found: ${constructor}`);
         const callFn = async (...params) => {
             const { args } = meta;
-            (0, utils_1.assert)(params.length === args.length + 1, `Expected ${args.length + 1} arguments, got ${params.length}`);
-            const callOptions = params[args.length];
-            const { caller, value = 0n, gasLimit, storageDepositLimit, salt = '0x' } = callOptions;
+            (0, utils_1.assertFalse)(params.length < args.length, `Expected at least ${args.length} arguments, got ${params.length}`);
+            (0, utils_1.assertFalse)(params.length > args.length + 1, `Expected at most ${args.length + 1} arguments, got ${params.length}`);
+            const callOptions = (params[args.length] || {});
+            const { caller = this.options.defaultCaller, value = 0n, gasLimit, storageDepositLimit, salt = '0x', } = callOptions;
             (0, utils_1.assert)(caller, 'Expected a valid caller address in ConstructorCallOptions');
             (0, utils_1.assertFalse)((0, utils_1.isNull)(salt) || (0, utils_1.isUndefined)(salt), 'Expected a salt in ConstructorCallOptions');
             const formattedInputs = args.map((arg, index) => this.tryEncode(arg, params[index]));
@@ -46,8 +42,5 @@ class ConstructorQueryExecutor extends Executor_js_1.Executor {
         callFn.meta = meta;
         return callFn;
     }
-    #findConstructorMeta(constructor) {
-        return this.metadata.spec.constructors.find((one) => (0, utils_js_1.normalizeLabel)(one.label) === constructor);
-    }
 }
 exports.ConstructorQueryExecutor = ConstructorQueryExecutor;

package/cjs/executor/ConstructorTxExecutor.js

@@ -2,16 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConstructorTxExecutor = void 0;
 const utils_1 = require("@dedot/utils");
-const utils_js_1 = require("../utils.js");
-const Executor_js_1 = require("./Executor.js");
-class ConstructorTxExecutor extends Executor_js_1.Executor {
-    code;
-    constructor(client, registry, code) {
-        super(client, registry);
-        this.code = code;
-    }
+const index_js_1 = require("./abstract/index.js");
+class ConstructorTxExecutor extends index_js_1.DeployerExecutor {
     doExecute(constructor) {
-        const meta = this.#findConstructorMeta(constructor);
+        const meta = this.findConstructorMeta(constructor);
         (0, utils_1.assert)(meta, `Constructor message not found: ${constructor}`);
         const callFn = (...params) => {
             const { args } = meta;
@@ -33,8 +27,5 @@ class ConstructorTxExecutor extends Executor_js_1.Executor {
         callFn.meta = meta;
         return callFn;
     }
-    #findConstructorMeta(constructor) {
-        return this.metadata.spec.constructors.find((one) => (0, utils_js_1.normalizeLabel)(one.label) === constructor);
-    }
 }
 exports.ConstructorTxExecutor = ConstructorTxExecutor;

package/cjs/executor/EventExecutor.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventExecutor = void 0;
 const api_1 = require("@dedot/api");
 const utils_1 = require("@dedot/utils");
-const Executor_js_1 = require("./Executor.js");
-class EventExecutor extends Executor_js_1.Executor {
+const index_js_1 = require("./abstract/index.js");
+class EventExecutor extends index_js_1.ContractExecutor {
     doExecute(eventName) {
         const meta = this.#findEventMeta(eventName);
         (0, utils_1.assert)(meta, 'Contract event metadata not found!');
@@ -37,11 +37,20 @@ class EventExecutor extends Executor_js_1.Executor {
                 return events.filter(is);
             }
         };
+        const watch = (callback) => {
+            return this.client.query.system.events((records) => {
+                const events = filter(records);
+                if (events.length === 0)
+                    return;
+                callback(filter(records));
+            });
+        };
         return {
             is,
             find,
             filter,
             meta,
+            watch,
         };
     }
     #findEventMeta(eventName) {

package/cjs/executor/QueryExecutor.js

@@ -4,16 +4,17 @@ exports.QueryExecutor = void 0;
 const utils_1 = require("@dedot/utils");
 const errors_js_1 = require("../errors.js");
 const utils_js_1 = require("../utils.js");
-const Executor_js_1 = require("./Executor.js");
-class QueryExecutor extends Executor_js_1.Executor {
+const index_js_1 = require("./abstract/index.js");
+class QueryExecutor extends index_js_1.ContractExecutor {
     doExecute(message) {
-        const meta = this.#findMessage(message);
+        const meta = this.findMessage(message);
         (0, utils_1.assert)(meta, `Query message not found: ${message}`);
         const callFn = async (...params) => {
             const { args } = meta;
-            (0, utils_1.assert)(params.length === args.length + 1, `Expected ${args.length + 1} arguments, got ${params.length}`);
-            const callOptions = params[args.length];
-            const { caller, value = 0n, gasLimit, storageDepositLimit } = callOptions;
+            (0, utils_1.assertFalse)(params.length < args.length, `Expected at least ${args.length} arguments, got ${params.length}`);
+            (0, utils_1.assertFalse)(params.length > args.length + 1, `Expected at most ${args.length + 1} arguments, got ${params.length}`);
+            const callOptions = (params[args.length] || {});
+            const { caller = this.options.defaultCaller, value = 0n, gasLimit, storageDepositLimit } = callOptions;
             (0, utils_1.assert)(caller, 'Expected a valid caller address in ContractCallOptions');
             const formattedInputs = args.map((arg, index) => this.tryEncode(arg, params[index]));
             const bytes = (0, utils_1.u8aToHex)((0, utils_1.concatU8a)((0, utils_1.hexToU8a)(meta.selector), ...formattedInputs));
@@ -35,8 +36,5 @@ class QueryExecutor extends Executor_js_1.Executor {
         callFn.meta = meta;
         return callFn;
     }
-    #findMessage(message) {
-        return this.metadata.spec.messages.find((one) => (0, utils_js_1.normalizeLabel)(one.label) === message);
-    }
 }
 exports.QueryExecutor = QueryExecutor;

package/cjs/executor/TxExecutor.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TxExecutor = void 0;
 const utils_1 = require("@dedot/utils");
-const utils_js_1 = require("../utils.js");
-const Executor_js_1 = require("./Executor.js");
-class TxExecutor extends Executor_js_1.Executor {
+const index_js_1 = require("./abstract/index.js");
+class TxExecutor extends index_js_1.ContractExecutor {
     doExecute(message) {
-        const meta = this.#findTxMessage(message);
+        const meta = this.findTxMessage(message);
         (0, utils_1.assert)(meta, `Tx message not found: ${message}`);
         const callFn = (...params) => {
             const { args } = meta;
@@ -21,8 +20,5 @@ class TxExecutor extends Executor_js_1.Executor {
         callFn.meta = meta;
         return callFn;
     }
-    #findTxMessage(message) {
-        return this.metadata.spec.messages.find((one) => one.mutates && (0, utils_js_1.normalizeLabel)(one.label) === message);
-    }
 }
 exports.TxExecutor = TxExecutor;

package/cjs/executor/abstract/ContractExecutor.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ContractExecutor = void 0;
+const codecs_1 = require("@dedot/codecs");
+const utils_js_1 = require("../../utils.js");
+const Executor_js_1 = require("./Executor.js");
+class ContractExecutor extends Executor_js_1.Executor {
+    address;
+    constructor(client, registry, address, options) {
+        super(client, registry, options);
+        this.address = new codecs_1.AccountId32(address);
+    }
+    findMessage(message) {
+        return this.metadata.spec.messages.find((one) => (0, utils_js_1.normalizeLabel)(one.label) === message);
+    }
+    findTxMessage(message) {
+        return this.metadata.spec.messages.find((one) => one.mutates && (0, utils_js_1.normalizeLabel)(one.label) === message);
+    }
+}
+exports.ContractExecutor = ContractExecutor;

package/cjs/executor/abstract/DeployerExecutor.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeployerExecutor = void 0;
+const utils_js_1 = require("../../utils.js");
+const Executor_js_1 = require("./Executor.js");
+class DeployerExecutor extends Executor_js_1.Executor {
+    code;
+    constructor(client, registry, code, options) {
+        super(client, registry, options);
+        this.code = code;
+    }
+    findConstructorMeta(constructor) {
+        return this.metadata.spec.constructors.find((one) => (0, utils_js_1.normalizeLabel)(one.label) === constructor);
+    }
+}
+exports.DeployerExecutor = DeployerExecutor;

package/cjs/executor/{Executor.js → abstract/Executor.js}

@@ -1,24 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Executor = void 0;
-const codecs_1 = require("@dedot/codecs");
 class Executor {
     client;
     registry;
-    #address;
-    constructor(client, registry, address) {
+    options;
+    constructor(client, registry, options = {}) {
         this.client = client;
         this.registry = registry;
-        if (address) {
-            this.#address = new codecs_1.AccountId32(address);
-        }
+        this.options = options;
     }
     get metadata() {
         return this.registry.metadata;
     }
-    get address() {
-        return this.#address;
-    }
     tryEncode(param, value) {
         const { type } = param.type;
         const $codec = this.registry.findCodec(type);

package/cjs/executor/abstract/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./Executor.js"), exports);
+__exportStar(require("./DeployerExecutor.js"), exports);
+__exportStar(require("./ContractExecutor.js"), exports);

package/cjs/executor/index.js

@@ -14,7 +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("./Executor.js"), exports);
+__exportStar(require("./abstract/index.js"), exports);
 __exportStar(require("./TxExecutor.js"), exports);
 __exportStar(require("./QueryExecutor.js"), exports);
 __exportStar(require("./ConstructorTxExecutor.js"), exports);

package/executor/ConstructorQueryExecutor.d.ts

@@ -1,13 +1,6 @@
-import { ISubstrateClient } from '@dedot/api';
-import { Hash } from '@dedot/codecs';
 import { GenericSubstrateApi } from '@dedot/types';
-import { HexString } from '@dedot/utils';
-import { TypinkRegistry } from '../TypinkRegistry.js';
 import { GenericConstructorQueryCall } from '../types/index.js';
-import { Executor } from './Executor.js';
-export declare class ConstructorQueryExecutor<ChainApi extends GenericSubstrateApi> extends Executor<ChainApi> {
-    #private;
-    protected readonly code: Hash | Uint8Array | HexString | string;
-    constructor(client: ISubstrateClient<ChainApi>, registry: TypinkRegistry, code: Hash | Uint8Array | string);
+import { DeployerExecutor } from './abstract/index.js';
+export declare class ConstructorQueryExecutor<ChainApi extends GenericSubstrateApi> extends DeployerExecutor<ChainApi> {
     doExecute(constructor: string): GenericConstructorQueryCall<ChainApi>;
 }

package/executor/ConstructorQueryExecutor.js

@@ -1,21 +1,17 @@
-import { assert, assertFalse, concatU8a, hexToU8a, isNull, isUndefined, isWasm, u8aToHex, } from '@dedot/utils';
+import { assert, assertFalse, concatU8a, hexToU8a, isNull, isUndefined, isWasm, u8aToHex } from '@dedot/utils';
 import { ContractInstantiateDispatchError, ContractInstantiateLangError } from '../errors.js';
-import { normalizeLabel, toReturnFlags } from '../utils.js';
-import { Executor } from './Executor.js';
-export class ConstructorQueryExecutor extends Executor {
-    code;
-    constructor(client, registry, code) {
-        super(client, registry);
-        this.code = code;
-    }
+import { toReturnFlags } from '../utils.js';
+import { DeployerExecutor } from './abstract/index.js';
+export class ConstructorQueryExecutor extends DeployerExecutor {
     doExecute(constructor) {
-        const meta = this.#findConstructorMeta(constructor);
+        const meta = this.findConstructorMeta(constructor);
         assert(meta, `Constructor message not found: ${constructor}`);
         const callFn = async (...params) => {
             const { args } = meta;
-            assert(params.length === args.length + 1, `Expected ${args.length + 1} arguments, got ${params.length}`);
-            const callOptions = params[args.length];
-            const { caller, value = 0n, gasLimit, storageDepositLimit, salt = '0x' } = callOptions;
+            assertFalse(params.length < args.length, `Expected at least ${args.length} arguments, got ${params.length}`);
+            assertFalse(params.length > args.length + 1, `Expected at most ${args.length + 1} arguments, got ${params.length}`);
+            const callOptions = (params[args.length] || {});
+            const { caller = this.options.defaultCaller, value = 0n, gasLimit, storageDepositLimit, salt = '0x', } = callOptions;
             assert(caller, 'Expected a valid caller address in ConstructorCallOptions');
             assertFalse(isNull(salt) || isUndefined(salt), 'Expected a salt in ConstructorCallOptions');
             const formattedInputs = args.map((arg, index) => this.tryEncode(arg, params[index]));
@@ -43,7 +39,4 @@ export class ConstructorQueryExecutor extends Executor {
         callFn.meta = meta;
         return callFn;
     }
-    #findConstructorMeta(constructor) {
-        return this.metadata.spec.constructors.find((one) => normalizeLabel(one.label) === constructor);
-    }
 }

package/executor/ConstructorTxExecutor.d.ts

@@ -1,13 +1,6 @@
-import { ISubstrateClient } from '@dedot/api';
-import { Hash } from '@dedot/codecs';
 import { GenericSubstrateApi } from '@dedot/types';
-import { HexString } from '@dedot/utils';
-import { TypinkRegistry } from '../TypinkRegistry.js';
 import { GenericConstructorTxCall } from '../types/index.js';
-import { Executor } from './Executor.js';
-export declare class ConstructorTxExecutor<ChainApi extends GenericSubstrateApi> extends Executor<ChainApi> {
-    #private;
-    protected readonly code: Hash | Uint8Array | HexString | string;
-    constructor(client: ISubstrateClient<ChainApi>, registry: TypinkRegistry, code: Hash | Uint8Array | string);
+import { DeployerExecutor } from './abstract/index.js';
+export declare class ConstructorTxExecutor<ChainApi extends GenericSubstrateApi> extends DeployerExecutor<ChainApi> {
     doExecute(constructor: string): GenericConstructorTxCall<ChainApi>;
 }

package/executor/ConstructorTxExecutor.js

@@ -1,14 +1,8 @@
-import { assert, assertFalse, concatU8a, hexToU8a, isNull, isUndefined, isWasm, u8aToHex, } from '@dedot/utils';
-import { normalizeLabel } from '../utils.js';
-import { Executor } from './Executor.js';
-export class ConstructorTxExecutor extends Executor {
-    code;
-    constructor(client, registry, code) {
-        super(client, registry);
-        this.code = code;
-    }
+import { assert, assertFalse, concatU8a, hexToU8a, isNull, isUndefined, isWasm, u8aToHex } from '@dedot/utils';
+import { DeployerExecutor } from './abstract/index.js';
+export class ConstructorTxExecutor extends DeployerExecutor {
     doExecute(constructor) {
-        const meta = this.#findConstructorMeta(constructor);
+        const meta = this.findConstructorMeta(constructor);
         assert(meta, `Constructor message not found: ${constructor}`);
         const callFn = (...params) => {
             const { args } = meta;
@@ -30,7 +24,4 @@ export class ConstructorTxExecutor extends Executor {
         callFn.meta = meta;
         return callFn;
     }
-    #findConstructorMeta(constructor) {
-        return this.metadata.spec.constructors.find((one) => normalizeLabel(one.label) === constructor);
-    }
 }

package/executor/EventExecutor.d.ts

@@ -1,7 +1,7 @@
 import { GenericSubstrateApi } from '@dedot/types';
 import { GenericContractEvent } from '../types/index.js';
-import { Executor } from './Executor.js';
-export declare class EventExecutor<ChainApi extends GenericSubstrateApi> extends Executor<ChainApi> {
+import { ContractExecutor } from './abstract/index.js';
+export declare class EventExecutor<ChainApi extends GenericSubstrateApi> extends ContractExecutor<ChainApi> {
     #private;
     doExecute(eventName: string): GenericContractEvent;
 }

package/executor/EventExecutor.js

@@ -1,7 +1,7 @@
 import { isEventRecord } from '@dedot/api';
 import { assert, stringPascalCase } from '@dedot/utils';
-import { Executor } from './Executor.js';
-export class EventExecutor extends Executor {
+import { ContractExecutor } from './abstract/index.js';
+export class EventExecutor extends ContractExecutor {
     doExecute(eventName) {
         const meta = this.#findEventMeta(eventName);
         assert(meta, 'Contract event metadata not found!');
@@ -34,11 +34,20 @@ export class EventExecutor extends Executor {
                 return events.filter(is);
             }
         };
+        const watch = (callback) => {
+            return this.client.query.system.events((records) => {
+                const events = filter(records);
+                if (events.length === 0)
+                    return;
+                callback(filter(records));
+            });
+        };
         return {
             is,
             find,
             filter,
             meta,
+            watch,
         };
     }
     #findEventMeta(eventName) {

package/executor/QueryExecutor.d.ts

@@ -1,7 +1,6 @@
 import { GenericSubstrateApi } from '@dedot/types';
 import { GenericContractQueryCall } from '../types/index.js';
-import { Executor } from './Executor.js';
-export declare class QueryExecutor<ChainApi extends GenericSubstrateApi> extends Executor<ChainApi> {
-    #private;
+import { ContractExecutor } from './abstract/index.js';
+export declare class QueryExecutor<ChainApi extends GenericSubstrateApi> extends ContractExecutor<ChainApi> {
     doExecute(message: string): GenericContractQueryCall<ChainApi>;
 }

package/executor/QueryExecutor.js

@@ -1,16 +1,17 @@
-import { assert, concatU8a, hexToU8a, u8aToHex } from '@dedot/utils';
+import { assert, assertFalse, concatU8a, hexToU8a, u8aToHex } from '@dedot/utils';
 import { ContractDispatchError, ContractLangError } from '../errors.js';
-import { normalizeLabel, toReturnFlags } from '../utils.js';
-import { Executor } from './Executor.js';
-export class QueryExecutor extends Executor {
+import { toReturnFlags } from '../utils.js';
+import { ContractExecutor } from './abstract/index.js';
+export class QueryExecutor extends ContractExecutor {
     doExecute(message) {
-        const meta = this.#findMessage(message);
+        const meta = this.findMessage(message);
         assert(meta, `Query message not found: ${message}`);
         const callFn = async (...params) => {
             const { args } = meta;
-            assert(params.length === args.length + 1, `Expected ${args.length + 1} arguments, got ${params.length}`);
-            const callOptions = params[args.length];
-            const { caller, value = 0n, gasLimit, storageDepositLimit } = callOptions;
+            assertFalse(params.length < args.length, `Expected at least ${args.length} arguments, got ${params.length}`);
+            assertFalse(params.length > args.length + 1, `Expected at most ${args.length + 1} arguments, got ${params.length}`);
+            const callOptions = (params[args.length] || {});
+            const { caller = this.options.defaultCaller, value = 0n, gasLimit, storageDepositLimit } = callOptions;
             assert(caller, 'Expected a valid caller address in ContractCallOptions');
             const formattedInputs = args.map((arg, index) => this.tryEncode(arg, params[index]));
             const bytes = u8aToHex(concatU8a(hexToU8a(meta.selector), ...formattedInputs));
@@ -32,7 +33,4 @@ export class QueryExecutor extends Executor {
         callFn.meta = meta;
         return callFn;
     }
-    #findMessage(message) {
-        return this.metadata.spec.messages.find((one) => normalizeLabel(one.label) === message);
-    }
 }

package/executor/TxExecutor.d.ts

@@ -1,7 +1,6 @@
 import { GenericSubstrateApi } from '@dedot/types';
 import { GenericContractTxCall } from '../types/index.js';
-import { Executor } from './Executor.js';
-export declare class TxExecutor<ChainApi extends GenericSubstrateApi> extends Executor<ChainApi> {
-    #private;
+import { ContractExecutor } from './abstract/index.js';
+export declare class TxExecutor<ChainApi extends GenericSubstrateApi> extends ContractExecutor<ChainApi> {
     doExecute(message: string): GenericContractTxCall<ChainApi>;
 }

package/executor/TxExecutor.js

@@ -1,9 +1,8 @@
 import { assert, concatU8a, hexToU8a, u8aToHex } from '@dedot/utils';
-import { normalizeLabel } from '../utils.js';
-import { Executor } from './Executor.js';
-export class TxExecutor extends Executor {
+import { ContractExecutor } from './abstract/index.js';
+export class TxExecutor extends ContractExecutor {
     doExecute(message) {
-        const meta = this.#findTxMessage(message);
+        const meta = this.findTxMessage(message);
         assert(meta, `Tx message not found: ${message}`);
         const callFn = (...params) => {
             const { args } = meta;
@@ -18,7 +17,4 @@ export class TxExecutor extends Executor {
         callFn.meta = meta;
         return callFn;
     }
-    #findTxMessage(message) {
-        return this.metadata.spec.messages.find((one) => one.mutates && normalizeLabel(one.label) === message);
-    }
 }

package/executor/abstract/ContractExecutor.d.ts

@@ -0,0 +1,12 @@
+import { ISubstrateClient } from '@dedot/api';
+import { AccountId32, AccountId32Like } from '@dedot/codecs';
+import { GenericSubstrateApi } from '@dedot/types';
+import { TypinkRegistry } from '../../TypinkRegistry.js';
+import { ContractCallMessage, ExecutionOptions } from '../../types/index.js';
+import { Executor } from './Executor.js';
+export declare abstract class ContractExecutor<ChainApi extends GenericSubstrateApi> extends Executor<ChainApi> {
+    readonly address: AccountId32;
+    constructor(client: ISubstrateClient<ChainApi>, registry: TypinkRegistry, address: AccountId32Like, options?: ExecutionOptions);
+    protected findMessage(message: string): ContractCallMessage | undefined;
+    protected findTxMessage(message: string): ContractCallMessage | undefined;
+}

package/executor/abstract/ContractExecutor.js

@@ -0,0 +1,16 @@
+import { AccountId32 } from '@dedot/codecs';
+import { normalizeLabel } from '../../utils.js';
+import { Executor } from './Executor.js';
+export class ContractExecutor extends Executor {
+    address;
+    constructor(client, registry, address, options) {
+        super(client, registry, options);
+        this.address = new AccountId32(address);
+    }
+    findMessage(message) {
+        return this.metadata.spec.messages.find((one) => normalizeLabel(one.label) === message);
+    }
+    findTxMessage(message) {
+        return this.metadata.spec.messages.find((one) => one.mutates && normalizeLabel(one.label) === message);
+    }
+}

package/executor/abstract/DeployerExecutor.d.ts

@@ -0,0 +1,12 @@
+import { ISubstrateClient } from '@dedot/api';
+import { Hash } from '@dedot/codecs';
+import { GenericSubstrateApi } from '@dedot/types';
+import { HexString } from '@dedot/utils';
+import { TypinkRegistry } from '../../TypinkRegistry.js';
+import { ContractConstructorMessage, ExecutionOptions } from '../../types/index.js';
+import { Executor } from './Executor.js';
+export declare abstract class DeployerExecutor<ChainApi extends GenericSubstrateApi> extends Executor<ChainApi> {
+    readonly code: Hash | Uint8Array | HexString | string;
+    constructor(client: ISubstrateClient<ChainApi>, registry: TypinkRegistry, code: Hash | Uint8Array | HexString | string, options?: ExecutionOptions);
+    protected findConstructorMeta(constructor: string): ContractConstructorMessage | undefined;
+}

package/executor/abstract/DeployerExecutor.js

@@ -0,0 +1,12 @@
+import { normalizeLabel } from '../../utils.js';
+import { Executor } from './Executor.js';
+export class DeployerExecutor extends Executor {
+    code;
+    constructor(client, registry, code, options) {
+        super(client, registry, options);
+        this.code = code;
+    }
+    findConstructorMeta(constructor) {
+        return this.metadata.spec.constructors.find((one) => normalizeLabel(one.label) === constructor);
+    }
+}

package/executor/{Executor.d.ts → abstract/Executor.d.ts}

@@ -1,17 +1,14 @@
 import { ISubstrateClient } from '@dedot/api';
 import { SubstrateApi } from '@dedot/api/chaintypes';
-import { AccountId32, AccountId32Like } from '@dedot/codecs';
 import { GenericSubstrateApi, RpcVersion } from '@dedot/types';
-import { TypinkRegistry } from '../TypinkRegistry.js';
-import { ContractMessageArg, ContractMessage } from '../types/index.js';
-import { ContractMetadata } from '../types/index.js';
+import { TypinkRegistry } from '../../TypinkRegistry.js';
+import { ContractMessageArg, ContractMessage, ExecutionOptions, ContractMetadata } from '../../types/index.js';
 export declare abstract class Executor<ChainApi extends GenericSubstrateApi = SubstrateApi[RpcVersion]> {
-    #private;
     readonly client: ISubstrateClient<ChainApi>;
     readonly registry: TypinkRegistry;
-    constructor(client: ISubstrateClient<ChainApi>, registry: TypinkRegistry, address?: AccountId32Like);
+    readonly options: ExecutionOptions;
+    constructor(client: ISubstrateClient<ChainApi>, registry: TypinkRegistry, options?: ExecutionOptions);
     get metadata(): ContractMetadata;
-    get address(): AccountId32 | undefined;
     abstract doExecute(...paths: string[]): unknown;
     tryEncode(param: ContractMessageArg, value: any): Uint8Array;
     tryDecode(meta: ContractMessage, raw: any): unknown;

package/executor/{Executor.js → abstract/Executor.js}

@@ -1,21 +1,15 @@
-import { AccountId32 } from '@dedot/codecs';
 export class Executor {
     client;
     registry;
-    #address;
-    constructor(client, registry, address) {
+    options;
+    constructor(client, registry, options = {}) {
         this.client = client;
         this.registry = registry;
-        if (address) {
-            this.#address = new AccountId32(address);
-        }
+        this.options = options;
     }
     get metadata() {
         return this.registry.metadata;
     }
-    get address() {
-        return this.#address;
-    }
     tryEncode(param, value) {
         const { type } = param.type;
         const $codec = this.registry.findCodec(type);

package/executor/abstract/index.d.ts

@@ -0,0 +1,3 @@
+export * from './Executor.js';
+export * from './DeployerExecutor.js';
+export * from './ContractExecutor.js';

package/executor/abstract/index.js

@@ -0,0 +1,3 @@
+export * from './Executor.js';
+export * from './DeployerExecutor.js';
+export * from './ContractExecutor.js';

package/executor/index.d.ts

@@ -1,4 +1,4 @@
-export * from './Executor.js';
+export * from './abstract/index.js';
 export * from './TxExecutor.js';
 export * from './QueryExecutor.js';
 export * from './ConstructorTxExecutor.js';

package/executor/index.js

@@ -1,4 +1,4 @@
-export * from './Executor.js';
+export * from './abstract/index.js';
 export * from './TxExecutor.js';
 export * from './QueryExecutor.js';
 export * from './ConstructorTxExecutor.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/contracts",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Delightful ink! Contract APIs",
   "author": "Tung Vu <tung@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/contracts",
@@ -18,17 +18,17 @@
     "test": "vitest --watch=false"
   },
   "dependencies": {
-    "@dedot/api": "0.5.0",
-    "@dedot/codecs": "0.5.0",
-    "@dedot/types": "0.5.0",
-    "@dedot/utils": "0.5.0"
+    "@dedot/api": "0.6.0",
+    "@dedot/codecs": "0.6.0",
+    "@dedot/types": "0.6.0",
+    "@dedot/utils": "0.6.0"
   },
   "publishConfig": {
     "access": "public",
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "968148ade63e07644094fc033be719b320e18a18",
+  "gitHead": "80e64c7da483c4f5b757f6af7259aa4fdd5397fc",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import { SubstrateApi } from '@dedot/api/chaintypes';
 import { AccountId32, AccountId32Like, BytesLike, Weight } from '@dedot/codecs';
-import { AnyFunc, AsyncMethod, GenericSubstrateApi, IEventRecord, RpcVersion, VersionedGenericSubstrateApi } from '@dedot/types';
+import { AnyFunc, AsyncMethod, GenericSubstrateApi, IEventRecord, RpcVersion, Unsub, VersionedGenericSubstrateApi } from '@dedot/types';
 import { ContractCallMessage, ContractConstructorMessage } from './shared.js';
 import { ContractEventV4, ContractMetadataV4 } from './v4.js';
 import { ContractEventV5, ContractMetadataV5 } from './v5.js';
@@ -36,14 +36,14 @@ export type CallOptions = {
 };
 export type ConstructorCallOptions = CallOptions & {
     salt?: BytesLike;
-    caller: AccountId32Like;
+    caller?: AccountId32Like;
 };
 export type ConstructorTxOptions = CallOptions & {
     salt?: BytesLike;
     gasLimit: Weight;
 };
 export type ContractCallOptions = CallOptions & {
-    caller: AccountId32Like;
+    caller?: AccountId32Like;
 };
 export type ContractTxOptions = CallOptions & {
     gasLimit: Weight;
@@ -82,6 +82,7 @@ export interface GenericContractEvent<EventName extends string = string, Data ex
     is: (event: IEventRecord | ContractEvent) => event is ContractEvent<EventName, Data>;
     find: (events: IEventRecord[] | ContractEvent[]) => ContractEvent<EventName, Data> | undefined;
     filter: (events: IEventRecord[] | ContractEvent[]) => ContractEvent<EventName, Data>[];
+    watch: (callback: (events: ContractEvent<EventName, Data>[]) => void) => Promise<Unsub>;
     meta: ContractEventMeta;
 }
 export interface GenericContractEvents<_ extends GenericSubstrateApi> {
@@ -99,3 +100,6 @@ export interface GenericContractApi<Rv extends RpcVersion = RpcVersion, ChainApi
         ChainApi: ChainApi[Rv];
     };
 }
+export interface ExecutionOptions {
+    defaultCaller?: AccountId32Like;
+}