@dedot/contracts 0.4.1 → 0.5.0

package/Contract.d.ts

@@ -5,7 +5,8 @@ import { TypinkRegistry } from './TypinkRegistry.js';
 import { ContractEvent, ContractMetadata, GenericContractApi } from './types/index.js';
 export declare class Contract<ContractApi extends GenericContractApi = GenericContractApi> {
     #private;
-    constructor(api: ISubstrateClient, metadata: ContractMetadata | string, address: AccountId32Like);
+    readonly client: ISubstrateClient<ContractApi['types']['ChainApi']>;
+    constructor(client: ISubstrateClient<ContractApi['types']['ChainApi']>, metadata: ContractMetadata | string, address: AccountId32Like);
     decodeEvent(eventRecord: IEventRecord): ContractEvent;
     decodeEvents(eventRecords: IEventRecord[]): ContractEvent[];
     get metadata(): ContractMetadata;

package/Contract.js

@@ -3,22 +3,22 @@ import { TypinkRegistry } from './TypinkRegistry.js';
 import { EventExecutor, QueryExecutor, TxExecutor } from './executor/index.js';
 import { ensureSupportContractsPallet, newProxyChain, parseRawMetadata } from './utils.js';
 export class Contract {
-    #api;
+    client;
     #registry;
     #address;
     #metadata;
-    constructor(api, metadata, address) {
-        ensureSupportContractsPallet(api);
-        this.#api = api;
+    constructor(client, metadata, address) {
+        this.client = client;
+        ensureSupportContractsPallet(client);
         this.#address = new AccountId32(address);
         this.#metadata = typeof metadata === 'string' ? parseRawMetadata(metadata) : metadata;
         this.#registry = new TypinkRegistry(this.#metadata);
     }
     decodeEvent(eventRecord) {
-        return this.#registry.decodeEvent(eventRecord);
+        return this.#registry.decodeEvent(eventRecord, this.address);
     }
     decodeEvents(eventRecords) {
-        return this.#registry.decodeEvents(eventRecords);
+        return this.#registry.decodeEvents(eventRecords, this.address);
     }
     get metadata() {
         return this.#metadata;
@@ -30,12 +30,12 @@ export class Contract {
         return this.#registry;
     }
     get query() {
-        return newProxyChain(new QueryExecutor(this.#api, this.#registry, this.#address));
+        return newProxyChain(new QueryExecutor(this.client, this.#registry, this.#address));
     }
     get tx() {
-        return newProxyChain(new TxExecutor(this.#api, this.#registry, this.#address));
+        return newProxyChain(new TxExecutor(this.client, this.#registry, this.#address));
     }
     get events() {
-        return newProxyChain(new EventExecutor(this.#api, this.#registry, this.#address));
+        return newProxyChain(new EventExecutor(this.client, this.#registry, this.#address));
     }
 }

package/ContractDeployer.d.ts

@@ -4,7 +4,8 @@ import { TypinkRegistry } from './TypinkRegistry.js';
 import { ContractMetadata, GenericContractApi } from './types/index.js';
 export declare class ContractDeployer<ContractApi extends GenericContractApi = GenericContractApi> {
     #private;
-    constructor(api: ISubstrateClient, metadata: ContractMetadata | string, codeHashOrWasm: Hash | Uint8Array | string);
+    readonly client: ISubstrateClient<ContractApi['types']['ChainApi']>;
+    constructor(client: ISubstrateClient<ContractApi['types']['ChainApi']>, metadata: ContractMetadata | string, codeHashOrWasm: Hash | Uint8Array | string);
     get metadata(): ContractMetadata;
     get registry(): TypinkRegistry;
     get tx(): ContractApi['constructorTx'];

package/ContractDeployer.js

@@ -3,13 +3,13 @@ import { ConstructorQueryExecutor } from './executor/ConstructorQueryExecutor.js
 import { ConstructorTxExecutor } from './executor/index.js';
 import { ensureSupportContractsPallet, newProxyChain, parseRawMetadata } from './utils.js';
 export class ContractDeployer {
-    #api;
+    client;
     #metadata;
     #registry;
     #code;
-    constructor(api, metadata, codeHashOrWasm) {
-        ensureSupportContractsPallet(api);
-        this.#api = api;
+    constructor(client, metadata, codeHashOrWasm) {
+        this.client = client;
+        ensureSupportContractsPallet(client);
         this.#metadata = typeof metadata === 'string' ? parseRawMetadata(metadata) : metadata;
         this.#registry = new TypinkRegistry(this.#metadata);
         this.#code = codeHashOrWasm;
@@ -21,9 +21,9 @@ export class ContractDeployer {
         return this.#registry;
     }
     get tx() {
-        return newProxyChain(new ConstructorTxExecutor(this.#api, this.#registry, this.#code));
+        return newProxyChain(new ConstructorTxExecutor(this.client, this.#registry, this.#code));
     }
     get query() {
-        return newProxyChain(new ConstructorQueryExecutor(this.#api, this.#registry, this.#code));
+        return newProxyChain(new ConstructorQueryExecutor(this.client, this.#registry, this.#code));
     }
 }

package/TypinkRegistry.d.ts

@@ -1,10 +1,10 @@
-import { TypeRegistry } from '@dedot/codecs';
+import { AccountId32Like, TypeRegistry } from '@dedot/codecs';
 import { IEventRecord } from '@dedot/types';
 import { ContractEvent, ContractMetadata } from './types/index.js';
 export declare class TypinkRegistry extends TypeRegistry {
     #private;
     constructor(metadata: ContractMetadata);
     get metadata(): ContractMetadata;
-    decodeEvents(records: IEventRecord[]): ContractEvent[];
-    decodeEvent(eventRecord: IEventRecord): ContractEvent;
+    decodeEvents(records: IEventRecord[], contract?: AccountId32Like): ContractEvent[];
+    decodeEvent(eventRecord: IEventRecord, contract?: AccountId32Like): ContractEvent;
 }

package/TypinkRegistry.js

@@ -1,4 +1,4 @@
-import { TypeRegistry } from '@dedot/codecs';
+import { AccountId32, TypeRegistry } from '@dedot/codecs';
 import * as $ from '@dedot/shape';
 import { DedotError, assert, hexToU8a, stringCamelCase, stringPascalCase } from '@dedot/utils';
 import { extractContractTypes } from './utils.js';
@@ -11,12 +11,13 @@ export class TypinkRegistry extends TypeRegistry {
     get metadata() {
         return this.#metadata;
     }
-    decodeEvents(records) {
+    decodeEvents(records, contract) {
         return records
-            .filter(({ event }) => this.#isContractEmittedEvent(event)) // prettier-end-here
-            .map((record) => this.decodeEvent(record));
+            .filter(({ event }) => this.#isContractEmittedEvent(event, contract)) // prettier-end-here
+            .map((record) => this.decodeEvent(record, contract));
     }
-    decodeEvent(eventRecord) {
+    decodeEvent(eventRecord, contract) {
+        assert(this.#isContractEmittedEvent(eventRecord.event, contract), 'Invalid ContractEmitted Event');
         const { version } = this.#metadata;
         switch (version) {
             case 5:
@@ -27,13 +28,27 @@ export class TypinkRegistry extends TypeRegistry {
                 throw new DedotError('Unsupported metadata version!');
         }
     }
-    #isContractEmittedEvent(event) {
-        // @ts-ignore
-        return event.pallet === 'Contracts' && event.palletEvent.name === 'ContractEmitted';
+    #isContractEmittedEvent(event, contract) {
+        const eventMatched = event.pallet === 'Contracts' &&
+            typeof event.palletEvent === 'object' &&
+            event.palletEvent.name === 'ContractEmitted';
+        if (!eventMatched)
+            return false;
+        if (contract) {
+            // @ts-ignore
+            const emittedContract = event.palletEvent.data?.contract;
+            if (emittedContract instanceof AccountId32) {
+                return emittedContract.eq(contract);
+            }
+            else {
+                return false;
+            }
+        }
+        return true;
     }
     #decodeEventV4(eventRecord) {
         assert(this.#metadata.version === '4', 'Invalid metadata version!');
-        assert(this.#isContractEmittedEvent(eventRecord.event), 'Event Record is not valid!');
+        assert(this.#isContractEmittedEvent(eventRecord.event), 'Invalid ContractEmitted Event');
         const data = hexToU8a(eventRecord.event.palletEvent.data.data);
         const index = data.at(0);
         assert(index !== undefined, 'Unable to decode event index!');
@@ -43,7 +58,7 @@ export class TypinkRegistry extends TypeRegistry {
     }
     #decodeEventV5(eventRecord) {
         assert(this.#metadata.version === 5, 'Invalid metadata version!');
-        assert(this.#isContractEmittedEvent(eventRecord.event), 'Event Record is not valid!');
+        assert(this.#isContractEmittedEvent(eventRecord.event), 'Invalid ContractEmitted Event');
         const data = hexToU8a(eventRecord.event.palletEvent.data.data);
         const signatureTopic = eventRecord.topics.at(0);
         let eventMeta;

package/cjs/Contract.js

@@ -6,22 +6,22 @@ const TypinkRegistry_js_1 = require("./TypinkRegistry.js");
 const index_js_1 = require("./executor/index.js");
 const utils_js_1 = require("./utils.js");
 class Contract {
-    #api;
+    client;
     #registry;
     #address;
     #metadata;
-    constructor(api, metadata, address) {
-        (0, utils_js_1.ensureSupportContractsPallet)(api);
-        this.#api = api;
+    constructor(client, metadata, address) {
+        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);
     }
     decodeEvent(eventRecord) {
-        return this.#registry.decodeEvent(eventRecord);
+        return this.#registry.decodeEvent(eventRecord, this.address);
     }
     decodeEvents(eventRecords) {
-        return this.#registry.decodeEvents(eventRecords);
+        return this.#registry.decodeEvents(eventRecords, this.address);
     }
     get metadata() {
         return this.#metadata;
@@ -33,13 +33,13 @@ class Contract {
         return this.#registry;
     }
     get query() {
-        return (0, utils_js_1.newProxyChain)(new index_js_1.QueryExecutor(this.#api, this.#registry, this.#address));
+        return (0, utils_js_1.newProxyChain)(new index_js_1.QueryExecutor(this.client, this.#registry, this.#address));
     }
     get tx() {
-        return (0, utils_js_1.newProxyChain)(new index_js_1.TxExecutor(this.#api, this.#registry, this.#address));
+        return (0, utils_js_1.newProxyChain)(new index_js_1.TxExecutor(this.client, this.#registry, this.#address));
     }
     get events() {
-        return (0, utils_js_1.newProxyChain)(new index_js_1.EventExecutor(this.#api, this.#registry, this.#address));
+        return (0, utils_js_1.newProxyChain)(new index_js_1.EventExecutor(this.client, this.#registry, this.#address));
     }
 }
 exports.Contract = Contract;

package/cjs/ContractDeployer.js

@@ -6,13 +6,13 @@ const ConstructorQueryExecutor_js_1 = require("./executor/ConstructorQueryExecut
 const index_js_1 = require("./executor/index.js");
 const utils_js_1 = require("./utils.js");
 class ContractDeployer {
-    #api;
+    client;
     #metadata;
     #registry;
     #code;
-    constructor(api, metadata, codeHashOrWasm) {
-        (0, utils_js_1.ensureSupportContractsPallet)(api);
-        this.#api = api;
+    constructor(client, metadata, codeHashOrWasm) {
+        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;
@@ -24,10 +24,10 @@ class ContractDeployer {
         return this.#registry;
     }
     get tx() {
-        return (0, utils_js_1.newProxyChain)(new index_js_1.ConstructorTxExecutor(this.#api, this.#registry, this.#code));
+        return (0, utils_js_1.newProxyChain)(new index_js_1.ConstructorTxExecutor(this.client, this.#registry, this.#code));
     }
     get query() {
-        return (0, utils_js_1.newProxyChain)(new ConstructorQueryExecutor_js_1.ConstructorQueryExecutor(this.#api, this.#registry, this.#code));
+        return (0, utils_js_1.newProxyChain)(new ConstructorQueryExecutor_js_1.ConstructorQueryExecutor(this.client, this.#registry, this.#code));
     }
 }
 exports.ContractDeployer = ContractDeployer;

package/cjs/TypinkRegistry.js

@@ -37,12 +37,13 @@ class TypinkRegistry extends codecs_1.TypeRegistry {
     get metadata() {
         return this.#metadata;
     }
-    decodeEvents(records) {
+    decodeEvents(records, contract) {
         return records
-            .filter(({ event }) => this.#isContractEmittedEvent(event)) // prettier-end-here
-            .map((record) => this.decodeEvent(record));
+            .filter(({ event }) => this.#isContractEmittedEvent(event, contract)) // prettier-end-here
+            .map((record) => this.decodeEvent(record, contract));
     }
-    decodeEvent(eventRecord) {
+    decodeEvent(eventRecord, contract) {
+        (0, utils_1.assert)(this.#isContractEmittedEvent(eventRecord.event, contract), 'Invalid ContractEmitted Event');
         const { version } = this.#metadata;
         switch (version) {
             case 5:
@@ -53,13 +54,27 @@ class TypinkRegistry extends codecs_1.TypeRegistry {
                 throw new utils_1.DedotError('Unsupported metadata version!');
         }
     }
-    #isContractEmittedEvent(event) {
-        // @ts-ignore
-        return event.pallet === 'Contracts' && event.palletEvent.name === 'ContractEmitted';
+    #isContractEmittedEvent(event, contract) {
+        const eventMatched = event.pallet === 'Contracts' &&
+            typeof event.palletEvent === 'object' &&
+            event.palletEvent.name === 'ContractEmitted';
+        if (!eventMatched)
+            return false;
+        if (contract) {
+            // @ts-ignore
+            const emittedContract = event.palletEvent.data?.contract;
+            if (emittedContract instanceof codecs_1.AccountId32) {
+                return emittedContract.eq(contract);
+            }
+            else {
+                return false;
+            }
+        }
+        return true;
     }
     #decodeEventV4(eventRecord) {
         (0, utils_1.assert)(this.#metadata.version === '4', 'Invalid metadata version!');
-        (0, utils_1.assert)(this.#isContractEmittedEvent(eventRecord.event), 'Event Record is not valid!');
+        (0, utils_1.assert)(this.#isContractEmittedEvent(eventRecord.event), 'Invalid ContractEmitted Event');
         const data = (0, utils_1.hexToU8a)(eventRecord.event.palletEvent.data.data);
         const index = data.at(0);
         (0, utils_1.assert)(index !== undefined, 'Unable to decode event index!');
@@ -69,7 +84,7 @@ class TypinkRegistry extends codecs_1.TypeRegistry {
     }
     #decodeEventV5(eventRecord) {
         (0, utils_1.assert)(this.#metadata.version === 5, 'Invalid metadata version!');
-        (0, utils_1.assert)(this.#isContractEmittedEvent(eventRecord.event), 'Event Record is not valid!');
+        (0, utils_1.assert)(this.#isContractEmittedEvent(eventRecord.event), 'Invalid ContractEmitted Event');
         const data = (0, utils_1.hexToU8a)(eventRecord.event.palletEvent.data.data);
         const signatureTopic = eventRecord.topics.at(0);
         let eventMeta;

package/cjs/errors.js

@@ -12,6 +12,7 @@ const utils_js_1 = require("./utils.js");
  * @extends DedotError
  */
 class ContractInstantiateError extends utils_1.DedotError {
+    name = 'ContractInstantiateError';
     /**
      * The raw result of the contract instantiation.
      */
@@ -36,6 +37,7 @@ exports.ContractInstantiateError = ContractInstantiateError;
  * @extends ContractInstantiateError
  */
 class ContractInstantiateDispatchError extends ContractInstantiateError {
+    name = 'ContractInstantiateDispatchError';
     /**
      * The error that occurred during the dispatch phase.
      */
@@ -49,6 +51,7 @@ class ContractInstantiateDispatchError extends ContractInstantiateError {
     constructor(err, raw) {
         super(raw);
         this.dispatchError = err;
+        this.message = `Dispatch error: ${JSON.stringify(err)}`;
     }
 }
 exports.ContractInstantiateDispatchError = ContractInstantiateDispatchError;
@@ -63,6 +66,7 @@ exports.ContractInstantiateDispatchError = ContractInstantiateDispatchError;
  * @extends ContractInstantiateError
  */
 class ContractInstantiateLangError extends ContractInstantiateError {
+    name = 'ContractInstantiateLangError';
     /**
      * The language-specific error that occurred during the instantiation.
      */
@@ -82,6 +86,7 @@ class ContractInstantiateLangError extends ContractInstantiateError {
         super(raw);
         this.langError = err;
         this.flags = (0, utils_js_1.toReturnFlags)(raw.result.value.result.flags.bits);
+        this.message = `Lange error: ${JSON.stringify(err)}`;
     }
 }
 exports.ContractInstantiateLangError = ContractInstantiateLangError;
@@ -94,6 +99,7 @@ exports.ContractInstantiateLangError = ContractInstantiateLangError;
  * @extends DedotError
  */
 class ContractExecutionError extends utils_1.DedotError {
+    name = 'ContractExecutionError';
     /**
      * The raw result of the contract call.
      */
@@ -118,6 +124,7 @@ exports.ContractExecutionError = ContractExecutionError;
  * @extends ContractExecutionError
  */
 class ContractDispatchError extends ContractExecutionError {
+    name = 'ContractDispatchError';
     /**
      * The error that occurred during the dispatch phase.
      */
@@ -131,6 +138,7 @@ class ContractDispatchError extends ContractExecutionError {
     constructor(err, raw) {
         super(raw);
         this.dispatchError = err;
+        this.message = `Dispatch error: ${JSON.stringify(err)}`;
     }
 }
 exports.ContractDispatchError = ContractDispatchError;
@@ -145,6 +153,7 @@ exports.ContractDispatchError = ContractDispatchError;
  * @extends ContractExecutionError
  */
 class ContractLangError extends ContractExecutionError {
+    name = 'ContractLangError';
     /**
      * The language-specific error that occurred during the execution.
      */
@@ -164,6 +173,7 @@ class ContractLangError extends ContractExecutionError {
         super(raw);
         this.langError = err;
         this.flags = (0, utils_js_1.toReturnFlags)(raw.result.value.flags.bits);
+        this.message = `Lange error: ${JSON.stringify(err)}`;
     }
 }
 exports.ContractLangError = ContractLangError;

package/cjs/executor/ConstructorQueryExecutor.js

@@ -7,8 +7,8 @@ const utils_js_1 = require("../utils.js");
 const Executor_js_1 = require("./Executor.js");
 class ConstructorQueryExecutor extends Executor_js_1.Executor {
     code;
-    constructor(api, registry, code) {
-        super(api, registry);
+    constructor(client, registry, code) {
+        super(client, registry);
         this.code = code;
     }
     doExecute(constructor) {
@@ -27,7 +27,7 @@ class ConstructorQueryExecutor extends Executor_js_1.Executor {
                 type: (0, utils_1.isWasm)(this.code) ? 'Upload' : 'Existing',
                 value: this.code,
             };
-            const raw = await this.api.call.contractsApi.instantiate(caller, value, gasLimit, storageDepositLimit, code, bytes, salt);
+            const raw = await this.client.call.contractsApi.instantiate(caller, value, gasLimit, storageDepositLimit, code, bytes, salt);
             if (raw.result.isErr) {
                 throw new errors_js_1.ContractInstantiateDispatchError(raw.result.err, raw);
             }

package/cjs/executor/ConstructorTxExecutor.js

@@ -6,8 +6,8 @@ const utils_js_1 = require("../utils.js");
 const Executor_js_1 = require("./Executor.js");
 class ConstructorTxExecutor extends Executor_js_1.Executor {
     code;
-    constructor(api, registry, code) {
-        super(api, registry);
+    constructor(client, registry, code) {
+        super(client, registry);
         this.code = code;
     }
     doExecute(constructor) {
@@ -23,10 +23,11 @@ class ConstructorTxExecutor extends Executor_js_1.Executor {
             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));
             if ((0, utils_1.isWasm)(this.code)) {
-                return this.api.tx.contracts.instantiateWithCode(value, gasLimit, storageDepositLimit, this.code, bytes, salt);
+                return this.client.tx.contracts.instantiateWithCode(value, gasLimit, storageDepositLimit, this.code, bytes, salt);
             }
             else {
-                return this.api.tx.contracts.instantiate(value, gasLimit, storageDepositLimit, this.code, bytes, salt);
+                return this.client.tx.contracts.instantiate(value, // prettier-end-here
+                gasLimit, storageDepositLimit, this.code, bytes, salt);
             }
         };
         callFn.meta = meta;

package/cjs/executor/EventExecutor.js

@@ -11,7 +11,7 @@ class EventExecutor extends Executor_js_1.Executor {
         const is = (event) => {
             if ((0, api_1.isEventRecord)(event)) {
                 try {
-                    event = this.registry.decodeEvent(event);
+                    event = this.registry.decodeEvent(event, this.address);
                 }
                 catch {
                     return false;
@@ -23,7 +23,7 @@ class EventExecutor extends Executor_js_1.Executor {
             if (!events || events.length === 0)
                 return undefined;
             if ((0, api_1.isEventRecord)(events[0])) {
-                return this.registry.decodeEvents(events).find(is);
+                return this.registry.decodeEvents(events, this.address).find(is);
             }
             else {
                 return events.find(is);
@@ -31,7 +31,7 @@ class EventExecutor extends Executor_js_1.Executor {
         };
         const filter = (events) => {
             if ((0, api_1.isEventRecord)(events[0])) {
-                return this.registry.decodeEvents(events).filter(is);
+                return this.registry.decodeEvents(events, this.address).filter(is);
             }
             else {
                 return events.filter(is);

package/cjs/executor/Executor.js

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

package/cjs/executor/QueryExecutor.js

@@ -17,7 +17,7 @@ class QueryExecutor extends Executor_js_1.Executor {
             (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));
-            const raw = await this.api.call.contractsApi.call(caller, this.address, value, gasLimit, storageDepositLimit, bytes);
+            const raw = await this.client.call.contractsApi.call(caller, this.address, value, gasLimit, storageDepositLimit, bytes);
             if (raw.result.isErr) {
                 throw new errors_js_1.ContractDispatchError(raw.result.err, raw);
             }

package/cjs/executor/TxExecutor.js

@@ -16,7 +16,7 @@ class TxExecutor extends Executor_js_1.Executor {
             (0, utils_1.assert)(gasLimit, 'Expected a gas limit in ContractTxOptions');
             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));
-            return this.api.tx.contracts.call(this.address, value, gasLimit, storageDepositLimit, bytes);
+            return this.client.tx.contracts.call(this.address, value, gasLimit, storageDepositLimit, bytes);
         };
         callFn.meta = meta;
         return callFn;

package/cjs/utils.js

@@ -91,9 +91,9 @@ function newProxyChain(carrier) {
     });
 }
 exports.newProxyChain = newProxyChain;
-function ensureSupportContractsPallet(api) {
+function ensureSupportContractsPallet(client) {
     try {
-        !!api.call.contractsApi.call.meta && !!api.tx.contracts.call.meta;
+        !!client.call.contractsApi.call.meta && !!client.tx.contracts.call.meta;
     }
     catch {
         throw new Error('Contracts pallet is not available');

package/errors.d.ts

@@ -10,6 +10,7 @@ import { ContractCallResult, ContractInstantiateResult, GenericContractApi, Retu
  * @extends DedotError
  */
 export declare class ContractInstantiateError<ContractApi extends GenericContractApi = GenericContractApi> extends DedotError {
+    name: string;
     /**
      * The raw result of the contract instantiation.
      */
@@ -30,6 +31,7 @@ export declare class ContractInstantiateError<ContractApi extends GenericContrac
  * @extends ContractInstantiateError
  */
 export declare class ContractInstantiateDispatchError<ContractApi extends GenericContractApi = GenericContractApi> extends ContractInstantiateError<ContractApi> {
+    name: string;
     /**
      * The error that occurred during the dispatch phase.
      */
@@ -53,6 +55,7 @@ export declare class ContractInstantiateDispatchError<ContractApi extends Generi
  * @extends ContractInstantiateError
  */
 export declare class ContractInstantiateLangError<ContractApi extends GenericContractApi = GenericContractApi> extends ContractInstantiateError<ContractApi> {
+    name: string;
     /**
      * The language-specific error that occurred during the instantiation.
      */
@@ -78,6 +81,7 @@ export declare class ContractInstantiateLangError<ContractApi extends GenericCon
  * @extends DedotError
  */
 export declare class ContractExecutionError<ContractApi extends GenericContractApi = GenericContractApi> extends DedotError {
+    name: string;
     /**
      * The raw result of the contract call.
      */
@@ -98,6 +102,7 @@ export declare class ContractExecutionError<ContractApi extends GenericContractA
  * @extends ContractExecutionError
  */
 export declare class ContractDispatchError<ContractApi extends GenericContractApi = GenericContractApi> extends ContractExecutionError<ContractApi> {
+    name: string;
     /**
      * The error that occurred during the dispatch phase.
      */
@@ -121,6 +126,7 @@ export declare class ContractDispatchError<ContractApi extends GenericContractAp
  * @extends ContractExecutionError
  */
 export declare class ContractLangError<ContractApi extends GenericContractApi = GenericContractApi> extends ContractExecutionError<ContractApi> {
+    name: string;
     /**
      * The language-specific error that occurred during the execution.
      */

package/errors.js

@@ -9,6 +9,7 @@ import { toReturnFlags } from './utils.js';
  * @extends DedotError
  */
 export class ContractInstantiateError extends DedotError {
+    name = 'ContractInstantiateError';
     /**
      * The raw result of the contract instantiation.
      */
@@ -32,6 +33,7 @@ export class ContractInstantiateError extends DedotError {
  * @extends ContractInstantiateError
  */
 export class ContractInstantiateDispatchError extends ContractInstantiateError {
+    name = 'ContractInstantiateDispatchError';
     /**
      * The error that occurred during the dispatch phase.
      */
@@ -45,6 +47,7 @@ export class ContractInstantiateDispatchError extends ContractInstantiateError {
     constructor(err, raw) {
         super(raw);
         this.dispatchError = err;
+        this.message = `Dispatch error: ${JSON.stringify(err)}`;
     }
 }
 /**
@@ -58,6 +61,7 @@ export class ContractInstantiateDispatchError extends ContractInstantiateError {
  * @extends ContractInstantiateError
  */
 export class ContractInstantiateLangError extends ContractInstantiateError {
+    name = 'ContractInstantiateLangError';
     /**
      * The language-specific error that occurred during the instantiation.
      */
@@ -77,6 +81,7 @@ export class ContractInstantiateLangError extends ContractInstantiateError {
         super(raw);
         this.langError = err;
         this.flags = toReturnFlags(raw.result.value.result.flags.bits);
+        this.message = `Lange error: ${JSON.stringify(err)}`;
     }
 }
 /**
@@ -88,6 +93,7 @@ export class ContractInstantiateLangError extends ContractInstantiateError {
  * @extends DedotError
  */
 export class ContractExecutionError extends DedotError {
+    name = 'ContractExecutionError';
     /**
      * The raw result of the contract call.
      */
@@ -111,6 +117,7 @@ export class ContractExecutionError extends DedotError {
  * @extends ContractExecutionError
  */
 export class ContractDispatchError extends ContractExecutionError {
+    name = 'ContractDispatchError';
     /**
      * The error that occurred during the dispatch phase.
      */
@@ -124,6 +131,7 @@ export class ContractDispatchError extends ContractExecutionError {
     constructor(err, raw) {
         super(raw);
         this.dispatchError = err;
+        this.message = `Dispatch error: ${JSON.stringify(err)}`;
     }
 }
 /**
@@ -137,6 +145,7 @@ export class ContractDispatchError extends ContractExecutionError {
  * @extends ContractExecutionError
  */
 export class ContractLangError extends ContractExecutionError {
+    name = 'ContractLangError';
     /**
      * The language-specific error that occurred during the execution.
      */
@@ -156,6 +165,7 @@ export class ContractLangError extends ContractExecutionError {
         super(raw);
         this.langError = err;
         this.flags = toReturnFlags(raw.result.value.flags.bits);
+        this.message = `Lange error: ${JSON.stringify(err)}`;
     }
 }
 /**

package/executor/ConstructorQueryExecutor.d.ts

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

package/executor/ConstructorQueryExecutor.js

@@ -4,8 +4,8 @@ import { normalizeLabel, toReturnFlags } from '../utils.js';
 import { Executor } from './Executor.js';
 export class ConstructorQueryExecutor extends Executor {
     code;
-    constructor(api, registry, code) {
-        super(api, registry);
+    constructor(client, registry, code) {
+        super(client, registry);
         this.code = code;
     }
     doExecute(constructor) {
@@ -24,7 +24,7 @@ export class ConstructorQueryExecutor extends Executor {
                 type: isWasm(this.code) ? 'Upload' : 'Existing',
                 value: this.code,
             };
-            const raw = await this.api.call.contractsApi.instantiate(caller, value, gasLimit, storageDepositLimit, code, bytes, salt);
+            const raw = await this.client.call.contractsApi.instantiate(caller, value, gasLimit, storageDepositLimit, code, bytes, salt);
             if (raw.result.isErr) {
                 throw new ContractInstantiateDispatchError(raw.result.err, raw);
             }

package/executor/ConstructorTxExecutor.d.ts

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

package/executor/ConstructorTxExecutor.js

@@ -3,8 +3,8 @@ import { normalizeLabel } from '../utils.js';
 import { Executor } from './Executor.js';
 export class ConstructorTxExecutor extends Executor {
     code;
-    constructor(api, registry, code) {
-        super(api, registry);
+    constructor(client, registry, code) {
+        super(client, registry);
         this.code = code;
     }
     doExecute(constructor) {
@@ -20,10 +20,11 @@ export class ConstructorTxExecutor extends Executor {
             const formattedInputs = args.map((arg, index) => this.tryEncode(arg, params[index]));
             const bytes = u8aToHex(concatU8a(hexToU8a(meta.selector), ...formattedInputs));
             if (isWasm(this.code)) {
-                return this.api.tx.contracts.instantiateWithCode(value, gasLimit, storageDepositLimit, this.code, bytes, salt);
+                return this.client.tx.contracts.instantiateWithCode(value, gasLimit, storageDepositLimit, this.code, bytes, salt);
             }
             else {
-                return this.api.tx.contracts.instantiate(value, gasLimit, storageDepositLimit, this.code, bytes, salt);
+                return this.client.tx.contracts.instantiate(value, // prettier-end-here
+                gasLimit, storageDepositLimit, this.code, bytes, salt);
             }
         };
         callFn.meta = meta;

package/executor/EventExecutor.js

@@ -8,7 +8,7 @@ export class EventExecutor extends Executor {
         const is = (event) => {
             if (isEventRecord(event)) {
                 try {
-                    event = this.registry.decodeEvent(event);
+                    event = this.registry.decodeEvent(event, this.address);
                 }
                 catch {
                     return false;
@@ -20,7 +20,7 @@ export class EventExecutor extends Executor {
             if (!events || events.length === 0)
                 return undefined;
             if (isEventRecord(events[0])) {
-                return this.registry.decodeEvents(events).find(is);
+                return this.registry.decodeEvents(events, this.address).find(is);
             }
             else {
                 return events.find(is);
@@ -28,7 +28,7 @@ export class EventExecutor extends Executor {
         };
         const filter = (events) => {
             if (isEventRecord(events[0])) {
-                return this.registry.decodeEvents(events).filter(is);
+                return this.registry.decodeEvents(events, this.address).filter(is);
             }
             else {
                 return events.filter(is);

package/executor/Executor.d.ts

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

package/executor/Executor.js

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

package/executor/QueryExecutor.js

@@ -14,7 +14,7 @@ export class QueryExecutor extends Executor {
             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));
-            const raw = await this.api.call.contractsApi.call(caller, this.address, value, gasLimit, storageDepositLimit, bytes);
+            const raw = await this.client.call.contractsApi.call(caller, this.address, value, gasLimit, storageDepositLimit, bytes);
             if (raw.result.isErr) {
                 throw new ContractDispatchError(raw.result.err, raw);
             }

package/executor/TxExecutor.js

@@ -13,7 +13,7 @@ export class TxExecutor extends Executor {
             assert(gasLimit, 'Expected a gas limit in ContractTxOptions');
             const formattedInputs = args.map((arg, index) => this.tryEncode(arg, params[index]));
             const bytes = u8aToHex(concatU8a(hexToU8a(meta.selector), ...formattedInputs));
-            return this.api.tx.contracts.call(this.address, value, gasLimit, storageDepositLimit, bytes);
+            return this.client.tx.contracts.call(this.address, value, gasLimit, storageDepositLimit, bytes);
         };
         callFn.meta = meta;
         return callFn;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/contracts",
-  "version": "0.4.1",
+  "version": "0.5.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.4.1",
-    "@dedot/codecs": "0.4.1",
-    "@dedot/types": "0.4.1",
-    "@dedot/utils": "0.4.1"
+    "@dedot/api": "0.5.0",
+    "@dedot/codecs": "0.5.0",
+    "@dedot/types": "0.5.0",
+    "@dedot/utils": "0.5.0"
   },
   "publishConfig": {
     "access": "public",
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "05b2a88dd2c78b17d68f0dd211e50be79e79852e",
+  "gitHead": "968148ade63e07644094fc033be719b320e18a18",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/utils.d.ts

@@ -1,12 +1,13 @@
 import { ISubstrateClient } from '@dedot/api';
+import { SubstrateApi } from '@dedot/api/chaintypes';
 import { PortableType, TypeDef } from '@dedot/codecs';
-import { GenericSubstrateApi } from '@dedot/types';
+import { GenericSubstrateApi, RpcVersion } from '@dedot/types';
 import { Executor } from './executor/index.js';
 import { ContractMetadata, ContractTypeDef, ReturnFlags } from './types/index.js';
 export declare const extractContractTypes: (contractMetadata: ContractMetadata) => PortableType[];
 export declare const normalizeContractTypeDef: (def: ContractTypeDef) => TypeDef;
 export declare const parseRawMetadata: (rawMetadata: string) => ContractMetadata;
 export declare function newProxyChain<ChainApi extends GenericSubstrateApi>(carrier: Executor<ChainApi>): unknown;
-export declare function ensureSupportContractsPallet<ChainApi extends GenericSubstrateApi>(api: ISubstrateClient<ChainApi>): void;
+export declare function ensureSupportContractsPallet(client: ISubstrateClient<SubstrateApi[RpcVersion]>): void;
 export declare function normalizeLabel(label?: string): string;
 export declare function toReturnFlags(bits: number): ReturnFlags;

package/utils.js

@@ -84,9 +84,9 @@ export function newProxyChain(carrier) {
         },
     });
 }
-export function ensureSupportContractsPallet(api) {
+export function ensureSupportContractsPallet(client) {
     try {
-        !!api.call.contractsApi.call.meta && !!api.tx.contracts.call.meta;
+        !!client.call.contractsApi.call.meta && !!client.tx.contracts.call.meta;
     }
     catch {
         throw new Error('Contracts pallet is not available');