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

package/Contract.d.ts

@@ -2,11 +2,11 @@ import { ISubstrateClient } from '@dedot/api';
 import { IEventRecord } from '@dedot/types';
 import { SolRegistry } from './SolRegistry.js';
 import { TypinkRegistry } from './TypinkRegistry.js';
-import { AB, ContractAddress, ContractEvent, ContractMetadata, ExecutionOptions, GenericContractApi, LooseContractMetadata, SolAbi } from './types/index.js';
+import { AB, ContractAddress, ContractEvent, ContractMetadata, ExecutionOptions, GenericContractApi, LooseContractMetadata, LooseSolAbi, SolAbi } 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 | SolAbi | string, address: ContractAddress, options?: ExecutionOptions);
+    constructor(client: ISubstrateClient<ContractApi['types']['ChainApi']>, metadata: LooseContractMetadata | LooseSolAbi | string, address: ContractAddress, options?: ExecutionOptions);
     decodeEvent(eventRecord: IEventRecord): ContractEvent;
     decodeEvents(eventRecords: IEventRecord[]): ContractEvent[];
     get address(): ContractAddress;

package/ContractDeployer.d.ts

@@ -2,11 +2,11 @@ import { ISubstrateClient } from '@dedot/api';
 import { Hash } from '@dedot/codecs';
 import { SolRegistry } from './SolRegistry.js';
 import { TypinkRegistry } from './TypinkRegistry.js';
-import { AB, ContractMetadata, ExecutionOptions, GenericContractApi, LooseContractMetadata, SolAbi } from './types/index.js';
+import { AB, ContractMetadata, ExecutionOptions, GenericContractApi, LooseContractMetadata, LooseSolAbi, SolAbi } 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: AB<ContractApi['metadataType'], LooseContractMetadata, SolAbi> | string, codeHashOrCode: Hash | Uint8Array | string, options?: ExecutionOptions);
+    constructor(client: ISubstrateClient<ContractApi['types']['ChainApi']>, metadata: AB<ContractApi['metadataType'], LooseContractMetadata, LooseSolAbi> | string, codeHashOrCode: Hash | Uint8Array | string, options?: ExecutionOptions);
     get metadata(): AB<ContractApi['metadataType'], ContractMetadata, SolAbi>;
     get registry(): AB<ContractApi['metadataType'], TypinkRegistry, SolRegistry>;
     get tx(): ContractApi['constructorTx'];

package/SolRegistry.js

@@ -57,7 +57,7 @@ export class SolRegistry {
         if (contractAddress) {
             // @ts-ignore
             const emittedContract = event.palletEvent.data?.contract;
-            return emittedContract === contractAddress;
+            return emittedContract?.toLowerCase() === contractAddress.toLowerCase();
         }
         return true;
     }

package/TypinkRegistry.js

@@ -129,7 +129,7 @@ export class TypinkRegistry extends TypeRegistry {
             // @ts-ignore
             const emittedContract = event.palletEvent.data?.contract;
             if (this.isRevive()) {
-                return emittedContract === contractAddress;
+                return emittedContract?.toLowerCase() === contractAddress.toLowerCase();
             }
             else if (emittedContract instanceof AccountId32) {
                 return emittedContract.eq(contractAddress);

package/cjs/SolRegistry.js

@@ -60,7 +60,7 @@ class SolRegistry {
         if (contractAddress) {
             // @ts-ignore
             const emittedContract = event.palletEvent.data?.contract;
-            return emittedContract === contractAddress;
+            return emittedContract?.toLowerCase() === contractAddress.toLowerCase();
         }
         return true;
     }

package/cjs/TypinkRegistry.js

@@ -155,7 +155,7 @@ class TypinkRegistry extends codecs_1.TypeRegistry {
             // @ts-ignore
             const emittedContract = event.palletEvent.data?.contract;
             if (this.isRevive()) {
-                return emittedContract === contractAddress;
+                return emittedContract?.toLowerCase() === contractAddress.toLowerCase();
             }
             else if (emittedContract instanceof codecs_1.AccountId32) {
                 return emittedContract.eq(contractAddress);

package/cjs/utils/ensure.js

@@ -38,10 +38,16 @@ async function ensureContractPresence(client, isRevive, address, cache) {
     }
     const contractInfo = await (async () => {
         if (isRevive) {
-            const accountInfo = await client.query.revive.accountInfoOf(address);
-            if (accountInfo?.accountType && accountInfo?.accountType?.type === 'Contract') {
-                return accountInfo.accountType.value;
+            try {
+                const accountInfo = await client.query.revive.accountInfoOf(address);
+                if (accountInfo?.accountType && accountInfo?.accountType?.type === 'Contract') {
+                    return accountInfo.accountType.value;
+                }
+                return undefined;
             }
+            catch { }
+            // Fallback to contractInfoOf for older versions of pallet-revive
+            return client.query.revive.contractInfoOf(address);
         }
         else {
             return client.query.contracts.contractInfoOf(address);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/contracts",
-  "version": "0.17.1-next.db98ff20.1+db98ff20",
+  "version": "0.18.0",
   "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.17.1-next.db98ff20.1+db98ff20",
-    "@dedot/codecs": "0.17.1-next.db98ff20.1+db98ff20",
-    "@dedot/types": "0.17.1-next.db98ff20.1+db98ff20",
-    "@dedot/utils": "0.17.1-next.db98ff20.1+db98ff20",
+    "@dedot/api": "0.18.0",
+    "@dedot/codecs": "0.18.0",
+    "@dedot/types": "0.18.0",
+    "@dedot/utils": "0.18.0",
     "viem": "^2.37.7"
   },
   "publishConfig": {
@@ -32,7 +32,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "db98ff20684d2a74b5e5402cabf43ef601d05d31",
+  "gitHead": "32395b356a4febaac0d52506742947c916ac9895",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/types/index.d.ts

@@ -25,6 +25,10 @@ export interface LooseContractMetadata {
     version: number | string;
     [prop: string]: any;
 }
+export type LooseSolAbi = Array<{
+    type: string;
+    [prop: string]: any;
+}>;
 export type GenericContractQueryCall<ChainApi extends GenericSubstrateApi, F extends AsyncMethod = (...args: any[]) => Promise<GenericContractCallResult<any, ContractCallResult<ChainApi>>>, Type extends MetadataType = MetadataType> = F & {
     meta: Type extends 'ink' ? ContractCallMessage : SolAbiFunction;
 };

package/utils/ensure.js

@@ -33,10 +33,16 @@ export async function ensureContractPresence(client, isRevive, address, cache) {
     }
     const contractInfo = await (async () => {
         if (isRevive) {
-            const accountInfo = await client.query.revive.accountInfoOf(address);
-            if (accountInfo?.accountType && accountInfo?.accountType?.type === 'Contract') {
-                return accountInfo.accountType.value;
+            try {
+                const accountInfo = await client.query.revive.accountInfoOf(address);
+                if (accountInfo?.accountType && accountInfo?.accountType?.type === 'Contract') {
+                    return accountInfo.accountType.value;
+                }
+                return undefined;
             }
+            catch { }
+            // Fallback to contractInfoOf for older versions of pallet-revive
+            return client.query.revive.contractInfoOf(address);
         }
         else {
             return client.query.contracts.contractInfoOf(address);