@dedot/contracts 0.0.1-next.d731b849.13 → 0.1.1-next.066b3f1e.2

package/cjs/executor/ConstructorQueryExecutor.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 {
@@ -14,7 +13,7 @@ class ConstructorQueryExecutor extends Executor_js_1.Executor {
     doExecute(constructor) {
         const meta = this.#findConstructorMeta(constructor);
         (0, utils_1.assert)(meta, `Constructor message not found: ${constructor}`);
-        const callFn = async (...params) => {
+        const callFn = (...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];
@@ -27,19 +26,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);
-            if (raw.result.isErr) {
-                throw new errors_js_1.ContractInstantiateDispatchError(raw.result.err, raw);
-            }
-            const data = this.tryDecode(meta, raw.result.value.result.data);
-            if (data.isErr) {
-                throw new errors_js_1.ContractInstantiateLangError(data.err, raw);
-            }
-            return {
-                raw,
-                data: data.value,
-                address: raw.result.value.accountId,
-            };
+            return this.api.call.contractsApi.instantiate(caller, value, gasLimit, storageDepositLimit, code, bytes, salt);
         };
         callFn.meta = meta;
         return callFn;

package/cjs/executor/QueryExecutor.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 {
@@ -18,17 +17,17 @@ class QueryExecutor 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));
             const raw = await this.api.call.contractsApi.call(caller, this.address, value, gasLimit, storageDepositLimit, bytes);
-            if (raw.result.isErr) {
-                throw new errors_js_1.ContractDispatchError(raw.result.err, raw);
-            }
-            const data = this.tryDecode(meta, raw.result.value.data);
-            if (data.isErr) {
-                throw new errors_js_1.ContractLangError(data.err, raw);
-            }
-            return {
-                data: data.value,
-                raw,
-            };
+            return (raw.result.isOk
+                ? {
+                    isOk: true,
+                    data: this.tryDecode(meta, raw.result.value.data),
+                    raw,
+                }
+                : {
+                    isOk: false,
+                    err: raw.result.err,
+                    raw,
+                });
         };
         callFn.meta = meta;
         return callFn;

package/cjs/index.js

@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./utils.js"), exports);
-__exportStar(require("./errors.js"), exports);
 __exportStar(require("./executor/index.js"), exports);
 __exportStar(require("./types/index.js"), exports);
 __exportStar(require("./TypinkRegistry.js"), exports);

package/cjs/utils.js

@@ -41,11 +41,11 @@ const normalizeContractTypeDef = (def) => {
     else if (def.composite) {
         type = 'Struct';
         value = {
-            fields: def.composite.fields.map((one) => ({
+            fields: def.composite.fields?.map((one) => ({
                 typeId: one.type,
                 name: one.name,
                 typeName: one.typeName,
-            })),
+            })) || [],
         };
     }
     else if (def.primitive) {

package/executor/ConstructorQueryExecutor.js

@@ -1,5 +1,4 @@
 import { assert, concatU8a, hexToU8a, isWasm, u8aToHex } from '@dedot/utils';
-import { ContractInstantiateDispatchError, ContractInstantiateLangError } from '../errors.js';
 import { normalizeLabel } from '../utils.js';
 import { Executor } from './Executor.js';
 export class ConstructorQueryExecutor extends Executor {
@@ -11,7 +10,7 @@ export class ConstructorQueryExecutor extends Executor {
     doExecute(constructor) {
         const meta = this.#findConstructorMeta(constructor);
         assert(meta, `Constructor message not found: ${constructor}`);
-        const callFn = async (...params) => {
+        const callFn = (...params) => {
             const { args } = meta;
             assert(params.length === args.length + 1, `Expected ${args.length + 1} arguments, got ${params.length}`);
             const callOptions = params[args.length];
@@ -24,19 +23,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);
-            if (raw.result.isErr) {
-                throw new ContractInstantiateDispatchError(raw.result.err, raw);
-            }
-            const data = this.tryDecode(meta, raw.result.value.result.data);
-            if (data.isErr) {
-                throw new ContractInstantiateLangError(data.err, raw);
-            }
-            return {
-                raw,
-                data: data.value,
-                address: raw.result.value.accountId,
-            };
+            return this.api.call.contractsApi.instantiate(caller, value, gasLimit, storageDepositLimit, code, bytes, salt);
         };
         callFn.meta = meta;
         return callFn;

package/executor/Executor.d.ts

@@ -3,7 +3,7 @@ import { SubstrateApi } from '@dedot/api/chaintypes';
 import { AccountId32 } from '@dedot/codecs';
 import { GenericSubstrateApi, RpcVersion } from '@dedot/types';
 import { TypinkRegistry } from '../TypinkRegistry.js';
-import { ContractMessageArg, ContractMessage } from '../types/index.js';
+import { ContractMessageArg, ContractCallMessage } from '../types/index.js';
 import { ContractMetadata } from '../types/index.js';
 export declare abstract class Executor<ChainApi extends GenericSubstrateApi = SubstrateApi[RpcVersion]> {
     #private;
@@ -14,5 +14,5 @@ export declare abstract class Executor<ChainApi extends GenericSubstrateApi = Su
     get registry(): TypinkRegistry;
     abstract doExecute(...paths: string[]): unknown;
     tryEncode(param: ContractMessageArg, value: any): Uint8Array;
-    tryDecode(meta: ContractMessage, raw: any): unknown;
+    tryDecode(meta: ContractCallMessage, raw: any): unknown;
 }

package/executor/QueryExecutor.js

@@ -1,5 +1,4 @@
 import { assert, concatU8a, hexToU8a, u8aToHex } from '@dedot/utils';
-import { ContractDispatchError, ContractLangError } from '../errors.js';
 import { normalizeLabel } from '../utils.js';
 import { Executor } from './Executor.js';
 export class QueryExecutor extends Executor {
@@ -15,17 +14,17 @@ export class QueryExecutor extends Executor {
             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);
-            if (raw.result.isErr) {
-                throw new ContractDispatchError(raw.result.err, raw);
-            }
-            const data = this.tryDecode(meta, raw.result.value.data);
-            if (data.isErr) {
-                throw new ContractLangError(data.err, raw);
-            }
-            return {
-                data: data.value,
-                raw,
-            };
+            return (raw.result.isOk
+                ? {
+                    isOk: true,
+                    data: this.tryDecode(meta, raw.result.value.data),
+                    raw,
+                }
+                : {
+                    isOk: false,
+                    err: raw.result.err,
+                    raw,
+                });
         };
         callFn.meta = meta;
         return callFn;

package/index.d.ts

@@ -1,5 +1,4 @@
 export * from './utils.js';
-export * from './errors.js';
 export * from './executor/index.js';
 export * from './types/index.js';
 export * from './TypinkRegistry.js';

package/index.js

@@ -1,5 +1,4 @@
 export * from './utils.js';
-export * from './errors.js';
 export * from './executor/index.js';
 export * from './types/index.js';
 export * from './TypinkRegistry.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/contracts",
-  "version": "0.0.1-next.d731b849.13+d731b84",
+  "version": "0.1.1-next.066b3f1e.2+066b3f1",
   "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.0.1-next.d731b849.13+d731b84",
-    "@dedot/codecs": "0.0.1-next.d731b849.13+d731b84",
-    "@dedot/types": "0.0.1-next.d731b849.13+d731b84",
-    "@dedot/utils": "0.0.1-next.d731b849.13+d731b84"
+    "@dedot/api": "0.1.1-next.066b3f1e.2+066b3f1",
+    "@dedot/codecs": "0.1.1-next.066b3f1e.2+066b3f1",
+    "@dedot/types": "0.1.1-next.066b3f1e.2+066b3f1",
+    "@dedot/utils": "0.1.1-next.066b3f1e.2+066b3f1"
   },
   "publishConfig": {
     "access": "public",
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "d731b849f66c92ca6fa69894e45792c49381d407",
+  "gitHead": "066b3f1e519f03d80f859f9a9ffb93d22de13626",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/types/index.d.ts

@@ -1,20 +1,20 @@
 import { SubstrateApi } from '@dedot/api/chaintypes';
-import { AccountId32, AccountId32Like, BytesLike, Weight } from '@dedot/codecs';
+import { AccountId32Like, BytesLike, DispatchError, Weight } from '@dedot/codecs';
 import { AnyFunc, AsyncMethod, GenericSubstrateApi, RpcVersion, VersionedGenericSubstrateApi } from '@dedot/types';
 import { ContractCallMessage, ContractConstructorMessage } from './shared.js';
 import { ContractEventV4, ContractMetadataV4 } from './v4.js';
 import { ContractEventV5, ContractMetadataV5 } from './v5.js';
 export * from './shared.js';
 export type ContractEventMeta = ContractEventV4 | ContractEventV5;
-export type GenericContractCallResult<DecodedData = any, ContractResult = any> = {
+export type GenericContractCallResult<DecodedData, ContractResult> = ({
+    isOk: true;
     data: DecodedData;
+} | {
+    isOk: false;
+    err: DispatchError;
+}) & {
     raw: ContractResult;
 };
-export type GenericConstructorCallResult<DecodedData = any, ContractResult = any> = {
-    data: DecodedData;
-    raw: ContractResult;
-    address: AccountId32;
-};
 export type ContractCallResult<ChainApi extends GenericSubstrateApi> = Awaited<ReturnType<ChainApi['call']['contractsApi']['call']>>;
 export type ContractInstantiateResult<ChainApi extends GenericSubstrateApi> = Awaited<ReturnType<ChainApi['call']['contractsApi']['instantiate']>>;
 export type ContractSubmittableExtrinsic<ChainApi extends GenericSubstrateApi> = ReturnType<ChainApi['tx']['contracts']['call']>;
@@ -47,7 +47,7 @@ export type GenericContractQueryCall<ChainApi extends GenericSubstrateApi, F ext
 export type GenericContractTxCall<ChainApi extends GenericSubstrateApi, F extends AnyFunc = (...args: any[]) => ContractSubmittableExtrinsic<ChainApi>> = F & {
     meta: ContractCallMessage;
 };
-export type GenericConstructorQueryCall<ChainApi extends GenericSubstrateApi, F extends AsyncMethod = (...args: any[]) => Promise<GenericConstructorCallResult<any, ContractInstantiateResult<ChainApi>>>> = F & {
+export type GenericConstructorQueryCall<ChainApi extends GenericSubstrateApi, F extends AsyncMethod = (...args: any[]) => Promise<ContractInstantiateResult<ChainApi>>> = F & {
     meta: ContractConstructorMessage;
 };
 export type GenericConstructorTxCall<ChainApi extends GenericSubstrateApi, F extends AnyFunc = (...args: any[]) => GenericInstantiateSubmittableExtrinsic<ChainApi>> = F & {
@@ -79,15 +79,10 @@ export interface GenericContractEvent<EventName extends string = string, Data ex
 export interface GenericContractEvents<_ extends GenericSubstrateApi> {
     [event: string]: GenericContractEvent;
 }
-export type GenericInkLangError = 'CouldNotReadInput' | any;
 export interface GenericContractApi<Rv extends RpcVersion = RpcVersion, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> {
     query: GenericContractQuery<ChainApi[Rv]>;
     tx: GenericContractTx<ChainApi[Rv]>;
     constructorQuery: GenericConstructorQuery<ChainApi[Rv]>;
     constructorTx: GenericConstructorTx<ChainApi[Rv]>;
     events: GenericContractEvents<ChainApi[Rv]>;
-    types: {
-        LangError: GenericInkLangError;
-        ChainApi: ChainApi[Rv];
-    };
 }

package/types/shared.d.ts

@@ -59,7 +59,7 @@ export interface ContractTypeDef {
     tuple?: number[];
 }
 export interface CompositeType {
-    fields: {
+    fields?: {
         type: number;
         typeName: string;
         name?: string;

package/utils.js

@@ -37,11 +37,11 @@ export const normalizeContractTypeDef = (def) => {
     else if (def.composite) {
         type = 'Struct';
         value = {
-            fields: def.composite.fields.map((one) => ({
+            fields: def.composite.fields?.map((one) => ({
                 typeId: one.type,
                 name: one.name,
                 typeName: one.typeName,
-            })),
+            })) || [],
         };
     }
     else if (def.primitive) {

package/cjs/errors.js

@@ -1,84 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isContractInstantiateLangError = exports.isContractInstantiateDispatchError = exports.isContractInstantiateExecutionError = exports.isContractLangError = exports.isContractDispatchError = exports.isContractExecutionError = exports.ContractLangError = exports.ContractDispatchError = exports.ContractExecutionError = exports.ContractInstantiateLangError = exports.ContractInstantiateDispatchError = exports.ContractInstantiateExecutionError = void 0;
-const utils_1 = require("@dedot/utils");
-class ContractInstantiateExecutionError extends utils_1.DedotError {
-    raw;
-    constructor(raw) {
-        super();
-        this.raw = raw;
-    }
-}
-exports.ContractInstantiateExecutionError = ContractInstantiateExecutionError;
-class ContractInstantiateDispatchError extends ContractInstantiateExecutionError {
-    err;
-    constructor(err, raw) {
-        super(raw);
-        this.err = err;
-    }
-}
-exports.ContractInstantiateDispatchError = ContractInstantiateDispatchError;
-/*
- * LangError represents an error which comes from the smart contracting language itself
- * Ref: https://use.ink/faq/migrating-from-ink-3-to-4#:~:text=Add%20support%20for,equivalent%20LangError.
- */
-class ContractInstantiateLangError extends ContractInstantiateExecutionError {
-    err;
-    constructor(err, raw) {
-        super(raw);
-        this.err = err;
-    }
-}
-exports.ContractInstantiateLangError = ContractInstantiateLangError;
-class ContractExecutionError extends utils_1.DedotError {
-    raw;
-    constructor(raw) {
-        super();
-        this.raw = raw;
-    }
-}
-exports.ContractExecutionError = ContractExecutionError;
-class ContractDispatchError extends ContractExecutionError {
-    err;
-    constructor(err, raw) {
-        super(raw);
-        this.err = err;
-    }
-}
-exports.ContractDispatchError = ContractDispatchError;
-/*
- * LangError represents an error which comes from the smart contracting language itself
- * Ref: https://use.ink/faq/migrating-from-ink-3-to-4#:~:text=Add%20support%20for,equivalent%20LangError.
- */
-class ContractLangError extends ContractExecutionError {
-    err;
-    constructor(err, raw) {
-        super(raw);
-        this.err = err;
-    }
-}
-exports.ContractLangError = ContractLangError;
-function isContractExecutionError(e) {
-    return e instanceof ContractExecutionError;
-}
-exports.isContractExecutionError = isContractExecutionError;
-function isContractDispatchError(e) {
-    return e instanceof ContractDispatchError;
-}
-exports.isContractDispatchError = isContractDispatchError;
-function isContractLangError(e) {
-    return e instanceof ContractLangError;
-}
-exports.isContractLangError = isContractLangError;
-function isContractInstantiateExecutionError(e) {
-    return e instanceof ContractInstantiateExecutionError;
-}
-exports.isContractInstantiateExecutionError = isContractInstantiateExecutionError;
-function isContractInstantiateDispatchError(e) {
-    return e instanceof ContractInstantiateDispatchError;
-}
-exports.isContractInstantiateDispatchError = isContractInstantiateDispatchError;
-function isContractInstantiateLangError(e) {
-    return e instanceof ContractInstantiateLangError;
-}
-exports.isContractInstantiateLangError = isContractInstantiateLangError;

package/errors.d.ts

@@ -1,33 +0,0 @@
-import { DispatchError } from '@dedot/codecs';
-import { DedotError } from '@dedot/utils';
-import { ContractCallResult, ContractInstantiateResult, GenericContractApi } from './types';
-export declare class ContractInstantiateExecutionError<ContractApi extends GenericContractApi = GenericContractApi> extends DedotError {
-    raw: ContractInstantiateResult<ContractApi['types']['ChainApi']>;
-    constructor(raw: ContractInstantiateResult<ContractApi['types']['ChainApi']>);
-}
-export declare class ContractInstantiateDispatchError<ContractApi extends GenericContractApi = GenericContractApi> extends ContractInstantiateExecutionError<ContractApi> {
-    err: DispatchError;
-    constructor(err: DispatchError, raw: ContractInstantiateResult<ContractApi['types']['ChainApi']>);
-}
-export declare class ContractInstantiateLangError<ContractApi extends GenericContractApi = GenericContractApi> extends ContractInstantiateExecutionError<ContractApi> {
-    err: ContractApi['types']['LangError'];
-    constructor(err: ContractApi['types']['LangError'], raw: ContractInstantiateResult<ContractApi['types']['ChainApi']>);
-}
-export declare class ContractExecutionError<ContractApi extends GenericContractApi = GenericContractApi> extends DedotError {
-    raw: ContractCallResult<ContractApi['types']['ChainApi']>;
-    constructor(raw: ContractCallResult<ContractApi['types']['ChainApi']>);
-}
-export declare class ContractDispatchError<ContractApi extends GenericContractApi = GenericContractApi> extends ContractExecutionError<ContractApi> {
-    err: DispatchError;
-    constructor(err: DispatchError, raw: ContractCallResult<ContractApi['types']['ChainApi']>);
-}
-export declare class ContractLangError<ContractApi extends GenericContractApi = GenericContractApi> extends ContractExecutionError<ContractApi> {
-    err: ContractApi['types']['LangError'];
-    constructor(err: ContractApi['types']['LangError'], raw: ContractCallResult<ContractApi['types']['ChainApi']>);
-}
-export declare function isContractExecutionError<ContractApi extends GenericContractApi = GenericContractApi>(e: Error): e is ContractExecutionError<ContractApi>;
-export declare function isContractDispatchError<ContractApi extends GenericContractApi = GenericContractApi>(e: Error): e is ContractDispatchError<ContractApi>;
-export declare function isContractLangError<ContractApi extends GenericContractApi = GenericContractApi>(e: Error): e is ContractLangError<ContractApi>;
-export declare function isContractInstantiateExecutionError<ContractApi extends GenericContractApi = GenericContractApi>(e: Error): e is ContractInstantiateExecutionError<ContractApi>;
-export declare function isContractInstantiateDispatchError<ContractApi extends GenericContractApi = GenericContractApi>(e: Error): e is ContractInstantiateDispatchError<ContractApi>;
-export declare function isContractInstantiateLangError<ContractApi extends GenericContractApi = GenericContractApi>(e: Error): e is ContractInstantiateLangError<ContractApi>;

package/errors.js

@@ -1,69 +0,0 @@
-import { DedotError } from '@dedot/utils';
-export class ContractInstantiateExecutionError extends DedotError {
-    raw;
-    constructor(raw) {
-        super();
-        this.raw = raw;
-    }
-}
-export class ContractInstantiateDispatchError extends ContractInstantiateExecutionError {
-    err;
-    constructor(err, raw) {
-        super(raw);
-        this.err = err;
-    }
-}
-/*
- * LangError represents an error which comes from the smart contracting language itself
- * Ref: https://use.ink/faq/migrating-from-ink-3-to-4#:~:text=Add%20support%20for,equivalent%20LangError.
- */
-export class ContractInstantiateLangError extends ContractInstantiateExecutionError {
-    err;
-    constructor(err, raw) {
-        super(raw);
-        this.err = err;
-    }
-}
-export class ContractExecutionError extends DedotError {
-    raw;
-    constructor(raw) {
-        super();
-        this.raw = raw;
-    }
-}
-export class ContractDispatchError extends ContractExecutionError {
-    err;
-    constructor(err, raw) {
-        super(raw);
-        this.err = err;
-    }
-}
-/*
- * LangError represents an error which comes from the smart contracting language itself
- * Ref: https://use.ink/faq/migrating-from-ink-3-to-4#:~:text=Add%20support%20for,equivalent%20LangError.
- */
-export class ContractLangError extends ContractExecutionError {
-    err;
-    constructor(err, raw) {
-        super(raw);
-        this.err = err;
-    }
-}
-export function isContractExecutionError(e) {
-    return e instanceof ContractExecutionError;
-}
-export function isContractDispatchError(e) {
-    return e instanceof ContractDispatchError;
-}
-export function isContractLangError(e) {
-    return e instanceof ContractLangError;
-}
-export function isContractInstantiateExecutionError(e) {
-    return e instanceof ContractInstantiateExecutionError;
-}
-export function isContractInstantiateDispatchError(e) {
-    return e instanceof ContractInstantiateDispatchError;
-}
-export function isContractInstantiateLangError(e) {
-    return e instanceof ContractInstantiateLangError;
-}