@dedot/contracts 0.16.0 → 0.16.1-next.fa430c5d.7

package/Contract.d.ts

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

package/ContractDeployer.d.ts

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

package/cjs/utils/ensure.js

@@ -8,7 +8,8 @@ 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) {
+function ensurePalletPresence(_client, registry) {
+    const client = _client;
     if (registry.isRevive()) {
         try {
             !!client.call.reviveApi.call.meta && !!client.tx.revive.call.meta;
@@ -27,10 +28,14 @@ function ensurePalletPresence(client, registry) {
     }
 }
 exports.ensurePalletPresence = ensurePalletPresence;
-async function ensureContractPresence(client, registry, address) {
-    const contractInfo = await (() => {
+async function ensureContractPresence(_client, registry, address) {
+    const client = _client;
+    const contractInfo = await (async () => {
         if (registry.isRevive()) {
-            return client.query.revive.contractInfoOf(address);
+            const accountInfo = await client.query.revive.accountInfoOf(address);
+            if (accountInfo?.accountType && accountInfo?.accountType?.type === 'Contract') {
+                return accountInfo.accountType.value;
+            }
         }
         else {
             return client.query.contracts.contractInfoOf(address);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/contracts",
-  "version": "0.16.0",
+  "version": "0.16.1-next.fa430c5d.7+fa430c5d",
   "description": "Delightful ink! Contract APIs",
   "author": "Tung Vu <tung@dedot.dev>",
   "homepage": "https://dedot.dev",
@@ -18,10 +18,10 @@
     "test": "npx vitest --watch=false"
   },
   "dependencies": {
-    "@dedot/api": "0.16.0",
-    "@dedot/codecs": "0.16.0",
-    "@dedot/types": "0.16.0",
-    "@dedot/utils": "0.16.0",
+    "@dedot/api": "0.16.1-next.fa430c5d.7+fa430c5d",
+    "@dedot/codecs": "0.16.1-next.fa430c5d.7+fa430c5d",
+    "@dedot/types": "0.16.1-next.fa430c5d.7+fa430c5d",
+    "@dedot/utils": "0.16.1-next.fa430c5d.7+fa430c5d",
     "@ethereumjs/rlp": "^10.0.0"
   },
   "publishConfig": {
@@ -32,7 +32,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "3e78a8eebb8977de0c5fb956154e5b09c4448f31",
+  "gitHead": "fa430c5d862bc45ec959cb5272619515172ab54b",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/utils/ensure.d.ts

@@ -1,12 +1,10 @@
 import { ISubstrateClient } from '@dedot/api';
-import { SubstrateApi } from '@dedot/api/chaintypes';
 import { Hash } from '@dedot/codecs';
-import { RpcVersion } from '@dedot/types';
 import { TypinkRegistry } from 'src/TypinkRegistry';
 import { ContractAddress, LooseContractMetadata } from 'src/types';
 export declare const ensureStorageApiSupports: (version: string | number) => void;
-export declare function ensurePalletPresence(client: ISubstrateClient<SubstrateApi[RpcVersion]>, registry: TypinkRegistry): void;
-export declare function ensureContractPresence(client: ISubstrateClient<SubstrateApi[RpcVersion]>, registry: TypinkRegistry, address: ContractAddress): Promise<void>;
+export declare function ensurePalletPresence(_client: ISubstrateClient<any, any>, registry: TypinkRegistry): void;
+export declare function ensureContractPresence(_client: ISubstrateClient<any, any>, registry: TypinkRegistry, address: ContractAddress): Promise<void>;
 export declare function ensureValidContractAddress(address: ContractAddress, registry: TypinkRegistry): void;
 export declare function ensureValidCodeHashOrCode(codeHashOrCode: Hash | Uint8Array | string, registry: TypinkRegistry): void;
 export declare function ensureSupportedContractMetadataVersion(metadata: LooseContractMetadata): void;

package/utils/ensure.js

@@ -4,7 +4,8 @@ export const ensureStorageApiSupports = (version) => {
     const numberedVersion = typeof version === 'number' ? version : parseInt(version);
     assert(numberedVersion >= 5, `Contract Storage Api Only Available for metadata version >= 5, current version: ${version}`);
 };
-export function ensurePalletPresence(client, registry) {
+export function ensurePalletPresence(_client, registry) {
+    const client = _client;
     if (registry.isRevive()) {
         try {
             !!client.call.reviveApi.call.meta && !!client.tx.revive.call.meta;
@@ -22,10 +23,14 @@ export function ensurePalletPresence(client, registry) {
         }
     }
 }
-export async function ensureContractPresence(client, registry, address) {
-    const contractInfo = await (() => {
+export async function ensureContractPresence(_client, registry, address) {
+    const client = _client;
+    const contractInfo = await (async () => {
         if (registry.isRevive()) {
-            return client.query.revive.contractInfoOf(address);
+            const accountInfo = await client.query.revive.accountInfoOf(address);
+            if (accountInfo?.accountType && accountInfo?.accountType?.type === 'Contract') {
+                return accountInfo.accountType.value;
+            }
         }
         else {
             return client.query.contracts.contractInfoOf(address);