@dedot/contracts 0.17.0 → 0.17.1-next.db98ff20.1

package/cjs/executor/sol/abstract/SolExecutor.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolExecutor = void 0;
+class SolExecutor {
+    client;
+    registry;
+    options;
+    constructor(client, registry, options = {}) {
+        this.client = client;
+        this.registry = registry;
+        this.options = options;
+    }
+    get abi() {
+        return this.registry.abi;
+    }
+}
+exports.SolExecutor = SolExecutor;

package/cjs/executor/sol/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("./SolExecutor.js"), exports);
+__exportStar(require("./SolDeployerExecutor.js"), exports);
+__exportStar(require("./SolContractExecutor.js"), exports);

package/cjs/executor/sol/index.js

@@ -0,0 +1,22 @@
+"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("./SolTxExecutor.js"), exports);
+__exportStar(require("./SolQueryExecutor.js"), exports);
+__exportStar(require("./SolConstructorTxExecutor.js"), exports);
+__exportStar(require("./SolConstructorQueryExecutor.js"), exports);
+__exportStar(require("./SolEventExecutor.js"), exports);
+__exportStar(require("./abstract/index.js"), exports);

package/cjs/types/index.js

@@ -14,7 +14,6 @@ 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("./ink/index.js"), exports);
+__exportStar(require("./sol/index.js"), exports);
 __exportStar(require("./shared.js"), exports);
-__exportStar(require("./v4.js"), exports);
-__exportStar(require("./v5.js"), exports);
-__exportStar(require("./v6.js"), exports);

package/cjs/types/ink/index.js

@@ -0,0 +1,20 @@
+"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("./shared.js"), exports);
+__exportStar(require("./v4.js"), exports);
+__exportStar(require("./v5.js"), exports);
+__exportStar(require("./v6.js"), exports);

package/cjs/types/ink/v6.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/types/sol/abi.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/types/sol/index.js

@@ -0,0 +1,17 @@
+"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("./abi.js"), exports);

package/cjs/utils/address.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toEvmAddress = exports.CREATE2 = exports.CREATE1 = void 0;
 const codecs_1 = require("@dedot/codecs");
 const utils_1 = require("@dedot/utils");
-const rlp_1 = require("@ethereumjs/rlp");
+const utils_2 = require("viem/utils");
 /**
  * Calculate new contract's address is based on the deployer's address and a nonce
  *
@@ -13,7 +13,7 @@ const rlp_1 = require("@ethereumjs/rlp");
  * @param nonce
  */
 function CREATE1(deployer, nonce) {
-    const encodedData = rlp_1.RLP.encode([new codecs_1.AccountId20(deployer).raw, (0, utils_1.toHex)(nonce)]);
+    const encodedData = (0, utils_2.toRlp)([new codecs_1.AccountId20(deployer).raw, (0, utils_1.toHex)(nonce)]);
     const hash = (0, utils_1.keccakAsU8a)(encodedData);
     return (0, utils_1.u8aToHex)(hash.subarray(12));
 }

package/cjs/utils/ensure.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureParamsLength = exports.ensureSupportedContractMetadataVersion = exports.ensureValidCodeHashOrCode = exports.ensureValidContractAddress = exports.ensureContractPresence = exports.ensurePalletPresence = exports.ensureStorageApiSupports = void 0;
+exports.ensureParamsLength = exports.ensureSupportedContractMetadataVersion = exports.ensureValidCodeHashOrCode = exports.ensureValidAccountId32Address = exports.ensureValidContractAddress = exports.ensureContractPresence = exports.ensurePalletPresence = exports.ensureStorageApiSupports = void 0;
 const codecs_1 = require("@dedot/codecs");
 const utils_1 = require("@dedot/utils");
 const ensureStorageApiSupports = (version) => {
@@ -8,28 +8,36 @@ const ensureStorageApiSupports = (version) => {
     (0, utils_1.assert)(numberedVersion >= 5, `Contract Storage Api Only Available for metadata version >= 5, current version: ${version}`);
 };
 exports.ensureStorageApiSupports = ensureStorageApiSupports;
-function ensurePalletPresence(client, registry) {
-    if (registry.isRevive()) {
-        try {
-            !!client.call.reviveApi.call.meta && !!client.tx.revive.call.meta;
-        }
-        catch {
-            throw new utils_1.DedotError('Pallet Revive is not available');
-        }
+function ensurePalletRevive(client) {
+    try {
+        !!client.call.reviveApi.call.meta && !!client.tx.revive.call.meta;
     }
-    else {
-        try {
-            !!client.call.contractsApi.call.meta && !!client.tx.contracts.call.meta;
-        }
-        catch {
-            throw new utils_1.DedotError('Pallet Contracts is not available');
-        }
+    catch {
+        throw new utils_1.DedotError('Pallet Revive is not available');
     }
 }
+function ensurePalletContracts(client) {
+    try {
+        !!client.call.contractsApi.call.meta && !!client.tx.contracts.call.meta;
+    }
+    catch {
+        throw new utils_1.DedotError('Pallet Contracts is not available');
+    }
+}
+function ensurePalletPresence(client, isRevive) {
+    isRevive ? ensurePalletRevive(client) : ensurePalletContracts(client);
+}
 exports.ensurePalletPresence = ensurePalletPresence;
-async function ensureContractPresence(client, registry, address) {
+async function ensureContractPresence(client, isRevive, address, cache) {
+    // Check cache first if available
+    if (cache) {
+        const cached = cache.get(`${isRevive}::${address}`);
+        if (cached) {
+            return; // Contract presence was already verified
+        }
+    }
     const contractInfo = await (async () => {
-        if (registry.isRevive()) {
+        if (isRevive) {
             const accountInfo = await client.query.revive.accountInfoOf(address);
             if (accountInfo?.accountType && accountInfo?.accountType?.type === 'Contract') {
                 return accountInfo.accountType.value;
@@ -40,19 +48,28 @@ async function ensureContractPresence(client, registry, address) {
         }
     })();
     (0, utils_1.ensurePresence)(contractInfo, `Contract with address ${address} does not exist on chain!`);
+    // Cache successful presence check
+    if (cache) {
+        cache.set(`${isRevive}::${address}`, true);
+    }
 }
 exports.ensureContractPresence = ensureContractPresence;
-function ensureValidContractAddress(address, registry) {
-    if (registry.isRevive()) {
+function ensureValidContractAddress(address, isRevive) {
+    if (isRevive) {
         (0, utils_1.assert)((0, utils_1.isEvmAddress)(address), `Invalid contract address: ${address}. Expected an EVM 20-byte address as a hex string or a Uint8Array`);
     }
     else {
-        (0, utils_1.assert)((0, utils_1.hexToU8a)((0, codecs_1.accountId32ToHex)(address)).length === 32, `Invalid contract address: ${address}. Expected a Substrate 32-byte address as a hex string or a Uint8Array`);
+        ensureValidAccountId32Address(address, `Invalid contract address: ${address}. Expected a Substrate 32-byte address as a hex string or a Uint8Array`);
     }
 }
 exports.ensureValidContractAddress = ensureValidContractAddress;
-function ensureValidCodeHashOrCode(codeHashOrCode, registry) {
-    (0, utils_1.assert)((0, utils_1.toU8a)(codeHashOrCode).length === 32 || (registry.isRevive() ? (0, utils_1.isPvm)(codeHashOrCode) : (0, utils_1.isWasm)(codeHashOrCode)), 'Invalid code hash or code: expected a hash of 32-byte or a valid PVM/WASM code as a hex string or a Uint8Array');
+function ensureValidAccountId32Address(address, customErrorMessage) {
+    (0, utils_1.assert)((0, utils_1.hexToU8a)((0, codecs_1.accountId32ToHex)(address)).length === 32, customErrorMessage ||
+        `Invalid AccountId32 address: ${address}. Expected a Substrate 32-byte address as a hex string or a Uint8Array`);
+}
+exports.ensureValidAccountId32Address = ensureValidAccountId32Address;
+function ensureValidCodeHashOrCode(codeHashOrCode, isRevive) {
+    (0, utils_1.assert)((0, utils_1.toU8a)(codeHashOrCode).length === 32 || (isRevive ? (0, utils_1.isPvm)(codeHashOrCode) : (0, utils_1.isWasm)(codeHashOrCode)), 'Invalid code hash or code: expected a hash of 32-byte or a valid PVM/WASM code as a hex string or a Uint8Array');
 }
 exports.ensureValidCodeHashOrCode = ensureValidCodeHashOrCode;
 const UNSUPPORTED_VERSIONS = ['V3', 'V2', 'V1'];

package/cjs/utils/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLazyType = exports.KnownLazyType = exports.toReturnFlags = exports.normalizeLabel = exports.normalizeContractTypeDef = exports.extractContractTypes = void 0;
+exports.isSolAbi = exports.isInkAbi = exports.isLazyType = exports.KnownLazyType = exports.toReturnFlags = exports.normalizeLabel = exports.normalizeContractTypeDef = exports.extractContractTypes = void 0;
 const utils_1 = require("@dedot/utils");
 const extractContractTypes = (contractMetadata) => {
     const { types } = contractMetadata;
@@ -125,3 +125,23 @@ function isLazyType(typePath) {
         return KnownLazyType.STORAGE_VEC;
 }
 exports.isLazyType = isLazyType;
+// https://use.ink/docs/v6/basics/metadata/ink/
+function isInkAbi(metadata) {
+    return (metadata !== null && // --
+        'source' in metadata &&
+        'contract' in metadata &&
+        'spec' in metadata);
+}
+exports.isInkAbi = isInkAbi;
+// https://docs.soliditylang.org/en/latest/abi-spec.html#json
+function isSolAbi(metadata) {
+    return (Array.isArray(metadata) &&
+        metadata.length > 0 &&
+        metadata.some((item) => item.type === 'function' ||
+            item.type === 'constructor' ||
+            item.type === 'event' ||
+            item.type === 'error' ||
+            item.type === 'fallback' ||
+            item.type === 'receive'));
+}
+exports.isSolAbi = isSolAbi;

package/errors.d.ts

@@ -1,6 +1,6 @@
 import { DispatchError, PalletErrorMetadataLatest } from '@dedot/codecs';
 import { DedotError } from '@dedot/utils';
-import { ContractCallResult, ContractInstantiateResult, GenericContractApi, ReturnFlags } from './types/index.js';
+import { ContractCallResult, ContractInstantiateResult, GenericContractApi, InkGenericContractApi, ReturnFlags, SolAbiError, SolGenericContractApi } from './types/index.js';
 /**
  * Represents an error that occurred during the instantiation of a smart contract.
  * This class extends the base `DedotError` and includes a `raw` property of type `ContractInstantiateResult`.
@@ -59,7 +59,7 @@ export declare class ContractInstantiateDispatchError<ContractApi extends Generi
  *
  * @extends ContractInstantiateError
  */
-export declare class ContractInstantiateLangError<ContractApi extends GenericContractApi = GenericContractApi> extends ContractInstantiateError<ContractApi> {
+export declare class ContractInstantiateLangError<ContractApi extends InkGenericContractApi = InkGenericContractApi> extends ContractInstantiateError<ContractApi> {
     name: string;
     /**
      * The language-specific error that occurred during the instantiation.
@@ -135,7 +135,7 @@ export declare class ContractDispatchError<ContractApi extends GenericContractAp
  *
  * @extends ContractExecutionError
  */
-export declare class ContractLangError<ContractApi extends GenericContractApi = GenericContractApi> extends ContractExecutionError<ContractApi> {
+export declare class ContractLangError<ContractApi extends InkGenericContractApi = InkGenericContractApi> extends ContractExecutionError<ContractApi> {
     name: string;
     /**
      * The language-specific error that occurred during the execution.
@@ -153,6 +153,43 @@ export declare class ContractLangError<ContractApi extends GenericContractApi =
      */
     constructor(err: ContractApi['types']['LangError'], raw: ContractCallResult<ContractApi['types']['ChainApi']>);
 }
+export type SolErrorResult = {
+    abiItem: SolAbiError;
+    args: readonly unknown[] | undefined;
+    errorName: string;
+};
+/**
+ * Represents a custom error that occurred during the instantiation of a solidity smart contract.
+ * This class extends `ContractInstantiateError` and includes properties for the error name and description.
+ *
+ * @template ContractApi - The type of the contract API. Defaults to `SolGenericContractApi`.
+ *
+ * @extends ContractInstantiateError
+ */
+export declare class SolContractInstantiateError<ContractApi extends SolGenericContractApi = SolGenericContractApi> extends ContractInstantiateError {
+    name: string;
+    details?: SolErrorResult;
+    constructor(raw: ContractInstantiateResult<ContractApi['types']['ChainApi']>, { details, message }: {
+        details?: SolErrorResult;
+        message?: string;
+    });
+}
+/**
+ * Represents a custom error that occurred during the execution of a smart contract call.
+ * This class extends `ContractExecutionError` and includes properties for the error name and description.
+ *
+ * @template ContractApi - The type of the contract API. Defaults to `SolGenericContractApi`.
+ *
+ * @extends ContractExecutionError
+ */
+export declare class SolContractExecutionError<ContractApi extends SolGenericContractApi = SolGenericContractApi> extends ContractExecutionError {
+    name: string;
+    details?: SolErrorResult;
+    constructor(raw: ContractCallResult<ContractApi['types']['ChainApi']>, { details, message }: {
+        details?: SolErrorResult;
+        message?: string;
+    });
+}
 /**
  * Checks if the provided error is an instance of `ContractExecutionError`.
  *
@@ -190,7 +227,7 @@ export declare function isContractDispatchError<ContractApi extends GenericContr
  * @returns `true` if the error is an instance of `ContractLangError`, `false` otherwise.
  *          This function returns a boolean value indicating whether the provided error is of type `ContractLangError`.
  */
-export declare function isContractLangError<ContractApi extends GenericContractApi = GenericContractApi>(e: Error): e is ContractLangError<ContractApi>;
+export declare function isContractLangError<ContractApi extends InkGenericContractApi = InkGenericContractApi>(e: Error): e is ContractLangError<ContractApi>;
 /**
  * Checks if the provided error is an instance of `ContractInstantiateError`.
  *
@@ -229,4 +266,26 @@ export declare function isContractInstantiateDispatchError<ContractApi extends G
  * @returns `true` if the error is an instance of `ContractInstantiateLangError`, `false` otherwise.
  *          This function returns a boolean value indicating whether the provided error is of type `ContractInstantiateLangError`.
  */
-export declare function isContractInstantiateLangError<ContractApi extends GenericContractApi = GenericContractApi>(e: Error): e is ContractInstantiateLangError<ContractApi>;
+export declare function isContractInstantiateLangError<ContractApi extends InkGenericContractApi = InkGenericContractApi>(e: Error): e is ContractInstantiateLangError<ContractApi>;
+/**
+ * Checks if the provided error is an instance of `isSolContractExecutionError`.
+ * This function is used to determine if a given error is a custom error specific to a smart contract.
+ *
+ * @template ContractApi - The type of the contract API. Defaults to `SolGenericContractApi`.
+ *
+ * @param e - The error to be checked. This should be an instance of `Error`.
+ *
+ * @returns `true` if the error is an instance of `isSolContractExecutionError`, `false` otherwise.
+ */
+export declare function isSolContractExecutionError<ContractApi extends SolGenericContractApi = SolGenericContractApi>(e: Error): e is SolContractExecutionError<ContractApi>;
+/**
+ * Checks if the provided error is an instance of `SolContractInstantiateError`.
+ * This function is used to determine if a given error is a custom error specific to the instantiation of a smart contract.
+ *
+ * @template ContractApi - The type of the contract API. Defaults to `SolGenericContractApi`.
+ *
+ * @param e - The error to be checked. This should be an instance of `Error`.
+ *
+ * @returns `true` if the error is an instance of `SolContractInstantiateError`, `false` otherwise.
+ */
+export declare function isSolContractInstantiateError<ContractApi extends SolGenericContractApi = SolGenericContractApi>(e: Error): e is SolContractInstantiateError<ContractApi>;

package/errors.js

@@ -193,6 +193,50 @@ export class ContractLangError extends ContractExecutionError {
         this.message = `Lang error: ${JSON.stringify(err)}`;
     }
 }
+/**
+ * Represents a custom error that occurred during the instantiation of a solidity smart contract.
+ * This class extends `ContractInstantiateError` and includes properties for the error name and description.
+ *
+ * @template ContractApi - The type of the contract API. Defaults to `SolGenericContractApi`.
+ *
+ * @extends ContractInstantiateError
+ */
+export class SolContractInstantiateError extends ContractInstantiateError {
+    name = 'SolContractInstantiateError';
+    details;
+    constructor(raw, { details, message }) {
+        super(raw);
+        this.details = details;
+        if (message) {
+            this.message = message;
+        }
+        else if (details) {
+            this.message = `Error: ${details.errorName}`;
+        }
+    }
+}
+/**
+ * Represents a custom error that occurred during the execution of a smart contract call.
+ * This class extends `ContractExecutionError` and includes properties for the error name and description.
+ *
+ * @template ContractApi - The type of the contract API. Defaults to `SolGenericContractApi`.
+ *
+ * @extends ContractExecutionError
+ */
+export class SolContractExecutionError extends ContractExecutionError {
+    name = 'SolContractExecutionError';
+    details;
+    constructor(raw, { details, message }) {
+        super(raw);
+        this.details = details;
+        if (message) {
+            this.message = message;
+        }
+        else if (details) {
+            this.message = `Error: ${details.errorName}`;
+        }
+    }
+}
 /**
  * Checks if the provided error is an instance of `ContractExecutionError`.
  *
@@ -282,3 +326,29 @@ export function isContractInstantiateDispatchError(e) {
 export function isContractInstantiateLangError(e) {
     return e instanceof ContractInstantiateLangError;
 }
+/**
+ * Checks if the provided error is an instance of `isSolContractExecutionError`.
+ * This function is used to determine if a given error is a custom error specific to a smart contract.
+ *
+ * @template ContractApi - The type of the contract API. Defaults to `SolGenericContractApi`.
+ *
+ * @param e - The error to be checked. This should be an instance of `Error`.
+ *
+ * @returns `true` if the error is an instance of `isSolContractExecutionError`, `false` otherwise.
+ */
+export function isSolContractExecutionError(e) {
+    return e instanceof SolContractExecutionError;
+}
+/**
+ * Checks if the provided error is an instance of `SolContractInstantiateError`.
+ * This function is used to determine if a given error is a custom error specific to the instantiation of a smart contract.
+ *
+ * @template ContractApi - The type of the contract API. Defaults to `SolGenericContractApi`.
+ *
+ * @param e - The error to be checked. This should be an instance of `Error`.
+ *
+ * @returns `true` if the error is an instance of `SolContractInstantiateError`, `false` otherwise.
+ */
+export function isSolContractInstantiateError(e) {
+    return e instanceof SolContractInstantiateError;
+}

package/executor/index.d.ts

@@ -1,5 +1,2 @@
-export * from './abstract/index.js';
-export * from './TxExecutor.js';
-export * from './QueryExecutor.js';
-export * from './ConstructorTxExecutor.js';
-export * from './EventExecutor.js';
+export * from './ink/index.js';
+export * from './sol/index.js';

package/executor/index.js

@@ -1,5 +1,2 @@
-export * from './abstract/index.js';
-export * from './TxExecutor.js';
-export * from './QueryExecutor.js';
-export * from './ConstructorTxExecutor.js';
-export * from './EventExecutor.js';
+export * from './ink/index.js';
+export * from './sol/index.js';

package/executor/{ConstructorQueryExecutor.d.ts → ink/ConstructorQueryExecutor.d.ts}

@@ -1,6 +1,5 @@
 import { GenericSubstrateApi } from '@dedot/types';
-import { GenericConstructorQueryCall } from '../types/index.js';
 import { DeployerExecutor } from './abstract/index.js';
 export declare class ConstructorQueryExecutor<ChainApi extends GenericSubstrateApi> extends DeployerExecutor<ChainApi> {
-    doExecute(constructor: string): GenericConstructorQueryCall<ChainApi>;
+    doExecute(constructor: string): any;
 }

package/executor/{ConstructorQueryExecutor.js → ink/ConstructorQueryExecutor.js}

@@ -1,6 +1,6 @@
 import { assert, concatU8a, hexToU8a, isPvm, isUndefined, isWasm, toHex, toU8a, u8aToHex } from '@dedot/utils';
-import { ContractInstantiateDispatchError, ContractInstantiateLangError } from '../errors.js';
-import { ensureParamsLength, toReturnFlags } from '../utils/index.js';
+import { ContractInstantiateDispatchError, ContractInstantiateLangError } from '../../errors.js';
+import { ensureParamsLength, ensureValidAccountId32Address, toReturnFlags } from '../../utils/index.js';
 import { DeployerExecutor } from './abstract/index.js';
 export class ConstructorQueryExecutor extends DeployerExecutor {
     doExecute(constructor) {
@@ -13,6 +13,7 @@ export class ConstructorQueryExecutor extends DeployerExecutor {
             const { caller = this.options.defaultCaller, // --
             value = 0n, gasLimit, storageDepositLimit, salt, } = callOptions;
             assert(caller, 'Expected a valid caller address in ConstructorCallOptions');
+            ensureValidAccountId32Address(caller);
             const formattedInputs = args.map((arg, index) => this.tryEncode(arg, params[index]));
             const bytes = u8aToHex(concatU8a(hexToU8a(meta.selector), ...formattedInputs));
             const isUpload = isPvm(this.code) || isWasm(this.code);

package/executor/{ConstructorTxExecutor.d.ts → ink/ConstructorTxExecutor.d.ts}

@@ -1,6 +1,5 @@
 import { GenericSubstrateApi } from '@dedot/types';
-import { GenericConstructorTxCall } from '../types/index.js';
 import { DeployerExecutor } from './abstract/index.js';
 export declare class ConstructorTxExecutor<ChainApi extends GenericSubstrateApi> extends DeployerExecutor<ChainApi> {
-    doExecute(constructor: string): GenericConstructorTxCall<ChainApi>;
+    doExecute(constructor: string): any;
 }

package/executor/{ConstructorTxExecutor.js → ink/ConstructorTxExecutor.js}

@@ -1,6 +1,6 @@
 import { assert, concatU8a, hexToU8a, isPvm, isUndefined, isWasm, toHex, toU8a, u8aToHex } from '@dedot/utils';
-import { Contract } from '../Contract.js';
-import { CREATE1, CREATE2, ensureContractPresence, ensureParamsLength, toEvmAddress } from '../utils/index.js';
+import { Contract } from '../../Contract.js';
+import { CREATE1, CREATE2, ensureContractPresence, ensureParamsLength, toEvmAddress } from '../../utils/index.js';
 import { ConstructorQueryExecutor } from './ConstructorQueryExecutor.js';
 import { DeployerExecutor } from './abstract/index.js';
 export class ConstructorTxExecutor extends DeployerExecutor {
@@ -105,8 +105,9 @@ export class ConstructorTxExecutor extends DeployerExecutor {
                     const contract = async (overrideOptions) => {
                         const address = await contractAddress();
                         // Check if the contract is existed on chain or not!
-                        await ensureContractPresence(client, this.registry, address);
+                        await ensureContractPresence(client, this.registry.isRevive(), address);
                         return new Contract(client, // --
+                        // @ts-ignore
                         this.metadata, address, {
                             defaultCaller: deployerAddress,
                             ...this.options,

package/executor/{EventExecutor.d.ts → ink/EventExecutor.d.ts}

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

package/executor/{QueryExecutor.d.ts → ink/QueryExecutor.d.ts}

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

package/executor/{QueryExecutor.js → ink/QueryExecutor.js}

@@ -1,6 +1,6 @@
 import { assert, concatU8a, hexToU8a, u8aToHex } from '@dedot/utils';
-import { ContractDispatchError, ContractLangError } from '../errors.js';
-import { ensureContractPresence, ensureParamsLength, toReturnFlags } from '../utils/index.js';
+import { ContractDispatchError, ContractLangError } from '../../errors.js';
+import { ensureContractPresence, ensureParamsLength, ensureValidAccountId32Address, toReturnFlags, } from '../../utils/index.js';
 import { ContractExecutor } from './abstract/index.js';
 export class QueryExecutor extends ContractExecutor {
     doExecute(message) {
@@ -12,10 +12,11 @@ export class QueryExecutor extends ContractExecutor {
             const callOptions = (params[args.length] || {});
             const { caller = this.options.defaultCaller, value = 0n, gasLimit, storageDepositLimit } = callOptions;
             assert(caller, 'Expected a valid caller address in ContractCallOptions');
+            ensureValidAccountId32Address(caller);
             const formattedInputs = args.map((arg, index) => this.tryEncode(arg, params[index]));
             const bytes = u8aToHex(concatU8a(hexToU8a(meta.selector), ...formattedInputs));
             const client = this.client;
-            await ensureContractPresence(client, this.registry, this.address);
+            await ensureContractPresence(client, this.registry.isRevive(), this.address, this.registry.cache);
             const raw = await (async () => {
                 if (this.registry.isRevive()) {
                     const raw = await client.call.reviveApi.call(caller, // --

package/executor/{TxExecutor.d.ts → ink/TxExecutor.d.ts}

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

package/executor/{TxExecutor.js → ink/TxExecutor.js}

@@ -1,5 +1,5 @@
 import { assert, concatU8a, hexToU8a, u8aToHex } from '@dedot/utils';
-import { ensureParamsLength } from '../utils/index.js';
+import { ensureParamsLength } from '../../utils/index.js';
 import { QueryExecutor } from './QueryExecutor.js';
 import { ContractExecutor } from './abstract/index.js';
 export class TxExecutor extends ContractExecutor {

package/executor/{abstract → ink/abstract}/ContractExecutor.d.ts

@@ -1,7 +1,7 @@
 import { ISubstrateClient } from '@dedot/api';
 import { GenericSubstrateApi } from '@dedot/types';
-import { TypinkRegistry } from '../../TypinkRegistry.js';
-import { ContractAddress, ContractCallMessage, ExecutionOptions } from '../../types/index.js';
+import { TypinkRegistry } from '../../../TypinkRegistry.js';
+import { ContractAddress, ContractCallMessage, ExecutionOptions } from '../../../types/index.js';
 import { Executor } from './Executor.js';
 export declare abstract class ContractExecutor<ChainApi extends GenericSubstrateApi> extends Executor<ChainApi> {
     readonly address: ContractAddress;

package/executor/{abstract → ink/abstract}/ContractExecutor.js

@@ -1,4 +1,4 @@
-import { normalizeLabel } from '../../utils/index.js';
+import { normalizeLabel } from '../../../utils/index.js';
 import { Executor } from './Executor.js';
 export class ContractExecutor extends Executor {
     address;

package/executor/{abstract → ink/abstract}/DeployerExecutor.d.ts

@@ -2,8 +2,8 @@ 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 { 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;

package/executor/{abstract → ink/abstract}/DeployerExecutor.js

@@ -1,4 +1,4 @@
-import { normalizeLabel } from '../../utils/index.js';
+import { normalizeLabel } from '../../../utils/index.js';
 import { Executor } from './Executor.js';
 export class DeployerExecutor extends Executor {
     code;