feat!: bump dedot

e2e/nodes/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "@dedot/chaintypes": "^0.161.0",
     "@polkadot/keyring": "^13.5.6",
-    "dedot": "^0.18.3",
+    "dedot": "^1.0.0",
     "typink": "workspace:*"
   },
   "license": "MIT"

e2e/nodes/src/global.d.ts

@@ -1,7 +1,7 @@
-import { DedotClient, LegacyClient } from 'dedot';
+import { DedotClient } from 'dedot';
 
 declare global {
-  var contractsClient: LegacyClient;
+  var contractsClient: DedotClient;
   var reviveClient: DedotClient;
 }
 

e2e/zombienet/src/contracts/flipper/constructor-query.d.ts → e2e/nodes/src/legacy/contracts/flipper-v5/constructor-query.d.ts

@@ -8,10 +8,11 @@ import type {
   GenericConstructorCallResult,
   ConstructorCallOptions,
   ContractInstantiateResult,
+  MetadataType,
 } from 'dedot/contracts';
 import type { InkPrimitivesLangError, FlipperFlipperError } from './types.js';
 
-export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends GenericConstructorQuery<ChainApi> {
+export interface ConstructorQuery<Type extends MetadataType> extends GenericConstructorQuery<Type> {
   /**
    * Creates a new flipper smart contract initialized with the given value.
    *
@@ -21,11 +22,11 @@ export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends
    * @selector 0x9bae9d5e
    **/
   new: GenericConstructorQueryCall<
-    ChainApi,
     (
       initValue: boolean,
       options?: ConstructorCallOptions,
-    ) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult<ChainApi>>>
+    ) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult>>,
+    Type
   >;
 
   /**
@@ -36,8 +37,8 @@ export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends
    * @selector 0x61ef7e3e
    **/
   newDefault: GenericConstructorQueryCall<
-    ChainApi,
-    (options?: ConstructorCallOptions) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult<ChainApi>>>
+    (options?: ConstructorCallOptions) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult>>,
+    Type
   >;
 
   /**
@@ -49,10 +50,10 @@ export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends
    * @selector 0x6d4cae81
    **/
   fromSeed: GenericConstructorQueryCall<
-    ChainApi,
     (
       seed: Hash,
       options?: ConstructorCallOptions,
-    ) => Promise<GenericConstructorCallResult<Result<[], FlipperFlipperError>, ContractInstantiateResult<ChainApi>>>
+    ) => Promise<GenericConstructorCallResult<Result<[], FlipperFlipperError>, ContractInstantiateResult>>,
+    Type
   >;
 }

e2e/nodes/src/legacy/contracts/flipper/constructor-tx.d.ts → e2e/nodes/src/legacy/contracts/flipper-v5/constructor-tx.d.ts

@@ -1,19 +1,20 @@
 // Generated by dedot cli
 
+import type { GenericSubstrateApi } from 'dedot/types';
 import type { Hash } from 'dedot/codecs';
 import type {
-  ConstructorTxOptions,
   GenericConstructorTx,
   GenericConstructorTxCall,
-  GenericContractApi,
+  ConstructorTxOptions,
+  InkGenericContractApi,
   GenericInstantiateSubmittableExtrinsic,
+  MetadataType,
 } from 'dedot/contracts';
-import type { GenericSubstrateApi } from 'dedot/types';
 
 export interface ConstructorTx<
-  ChainApi extends GenericSubstrateApi,
-  ContractApi extends GenericContractApi = GenericContractApi,
-> extends GenericConstructorTx<ChainApi> {
+  ContractApi extends InkGenericContractApi,
+  Type extends MetadataType,
+> extends GenericConstructorTx<Type> {
   /**
    * Creates a new flipper smart contract initialized with the given value.
    *
@@ -23,11 +24,8 @@ export interface ConstructorTx<
    * @selector 0x9bae9d5e
    **/
   new: GenericConstructorTxCall<
-    ChainApi,
-    (
-      initValue: boolean,
-      options?: ConstructorTxOptions,
-    ) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>
+    (initValue: boolean, options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ContractApi>,
+    Type
   >;
 
   /**
@@ -38,8 +36,8 @@ export interface ConstructorTx<
    * @selector 0x61ef7e3e
    **/
   newDefault: GenericConstructorTxCall<
-    ChainApi,
-    (options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>
+    (options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ContractApi>,
+    Type
   >;
 
   /**
@@ -51,7 +49,7 @@ export interface ConstructorTx<
    * @selector 0x6d4cae81
    **/
   fromSeed: GenericConstructorTxCall<
-    ChainApi,
-    (seed: Hash, options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>
+    (seed: Hash, options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ContractApi>,
+    Type
   >;
 }

e2e/nodes/src/legacy/contracts/flipper/events.d.ts → e2e/nodes/src/legacy/contracts/flipper-v5/events.d.ts

@@ -1,9 +1,9 @@
 // Generated by dedot cli
 
-import type { GenericContractEvent, GenericContractEvents } from 'dedot/contracts';
 import type { GenericSubstrateApi } from 'dedot/types';
+import type { GenericContractEvents, GenericContractEvent, MetadataType } from 'dedot/contracts';
 
-export interface ContractEvents<ChainApi extends GenericSubstrateApi> extends GenericContractEvents<ChainApi> {
+export interface ContractEvents<Type extends MetadataType> extends GenericContractEvents<Type> {
   /**
    * Emitted when the flip function is called.
    *
@@ -24,6 +24,7 @@ export interface ContractEvents<ChainApi extends GenericSubstrateApi> extends Ge
        * @indexed: false
        **/
       new: boolean;
-    }
+    },
+    Type
   >;
 }

e2e/zombienet/src/contracts/flipper/index.d.ts → e2e/nodes/src/legacy/contracts/flipper-v5/index.d.ts

@@ -1,7 +1,7 @@
 // Generated by dedot cli
 
-import type { VersionedGenericSubstrateApi, RpcVersion, RpcV2 } from 'dedot/types';
-import type { GenericContractApi, WithLazyStorage } from 'dedot/contracts';
+import type { GenericSubstrateApi, RpcVersion, RpcV2 } from 'dedot/types';
+import type { InkGenericContractApi, WithLazyStorage } from 'dedot/contracts';
 import type { SubstrateApi } from 'dedot/chaintypes';
 import type { InkPrimitivesLangError, Flipper } from './types.js';
 import { ContractQuery } from './query.js';
@@ -13,30 +13,30 @@ import { ContractEvents } from './events.js';
 export * from './types.js';
 
 /**
- * @name: FlipperContractApi
+ * @name: FlipperV5ContractApi
  * @contractName: flipper
  * @contractVersion: 5.0.0
  * @authors: Parity Technologies <admin@parity.io>
  * @language: ink! 5.0.0
  **/
-export interface FlipperContractApi<
-  Rv extends RpcVersion = RpcVersion,
-  ChainApi extends VersionedGenericSubstrateApi = SubstrateApi,
-> extends GenericContractApi<Rv, ChainApi> {
-  query: ContractQuery<ChainApi[Rv]>;
-  tx: ContractTx<ChainApi[Rv]>;
-  constructorQuery: ConstructorQuery<ChainApi[Rv]>;
-  constructorTx: ConstructorTx<ChainApi[Rv], FlipperContractApi>;
-  events: ContractEvents<ChainApi[Rv]>;
+export interface FlipperV5ContractApi<
+  ChainApi extends GenericSubstrateApi = SubstrateApi,
+> extends InkGenericContractApi<ChainApi> {
+  metadataType: 'ink';
+  query: ContractQuery<'ink'>;
+  tx: ContractTx<'ink'>;
+  constructorQuery: ConstructorQuery<'ink'>;
+  constructorTx: ConstructorTx<FlipperV5ContractApi, 'ink'>;
+  events: ContractEvents<'ink'>;
   storage: {
     root(): Promise<Flipper>;
     lazy(): WithLazyStorage<Flipper>;
   };
 
   types: {
+    ChainApi: ChainApi;
     RootStorage: Flipper;
     LazyStorage: WithLazyStorage<Flipper>;
     LangError: InkPrimitivesLangError;
-    ChainApi: ChainApi[Rv];
   };
 }

e2e/zombienet/src/contracts/flipper/query.d.ts → e2e/nodes/src/legacy/contracts/flipper-v5/query.d.ts

@@ -8,10 +8,11 @@ import type {
   ContractCallOptions,
   GenericContractCallResult,
   ContractCallResult,
+  MetadataType,
 } from 'dedot/contracts';
 import type { FlipperFlipperError, InkPrimitivesLangError } from './types.js';
 
-export interface ContractQuery<ChainApi extends GenericSubstrateApi> extends GenericContractQuery<ChainApi> {
+export interface ContractQuery<Type extends MetadataType> extends GenericContractQuery<Type> {
   /**
    * Flips the current value, value based on seed.
    *
@@ -21,11 +22,11 @@ export interface ContractQuery<ChainApi extends GenericSubstrateApi> extends Gen
    * @selector 0x847d0968
    **/
   flipWithSeed: GenericContractQueryCall<
-    ChainApi,
     (
       seed: Hash,
       options?: ContractCallOptions,
-    ) => Promise<GenericContractCallResult<Result<boolean, FlipperFlipperError>, ContractCallResult<ChainApi>>>
+    ) => Promise<GenericContractCallResult<Result<boolean, FlipperFlipperError>, ContractCallResult>>,
+    Type
   >;
 
   /**
@@ -36,8 +37,8 @@ export interface ContractQuery<ChainApi extends GenericSubstrateApi> extends Gen
    * @selector 0x633aa551
    **/
   flip: GenericContractQueryCall<
-    ChainApi,
-    (options?: ContractCallOptions) => Promise<GenericContractCallResult<[], ContractCallResult<ChainApi>>>
+    (options?: ContractCallOptions) => Promise<GenericContractCallResult<[], ContractCallResult>>,
+    Type
   >;
 
   /**
@@ -48,7 +49,7 @@ export interface ContractQuery<ChainApi extends GenericSubstrateApi> extends Gen
    * @selector 0x2f865bd9
    **/
   get: GenericContractQueryCall<
-    ChainApi,
-    (options?: ContractCallOptions) => Promise<GenericContractCallResult<boolean, ContractCallResult<ChainApi>>>
+    (options?: ContractCallOptions) => Promise<GenericContractCallResult<boolean, ContractCallResult>>,
+    Type
   >;
 }

e2e/nodes/src/legacy/contracts/flipper/tx.d.ts → e2e/nodes/src/legacy/contracts/flipper-v5/tx.d.ts

@@ -1,15 +1,16 @@
 // Generated by dedot cli
 
+import type { GenericSubstrateApi } from 'dedot/types';
 import type { Hash } from 'dedot/codecs';
 import type {
-  ContractSubmittableExtrinsic,
-  ContractTxOptions,
   GenericContractTx,
   GenericContractTxCall,
+  ContractTxOptions,
+  ContractSubmittableExtrinsic,
+  MetadataType,
 } from 'dedot/contracts';
-import type { GenericSubstrateApi } from 'dedot/types';
 
-export interface ContractTx<ChainApi extends GenericSubstrateApi> extends GenericContractTx<ChainApi> {
+export interface ContractTx<Type extends MetadataType> extends GenericContractTx<Type> {
   /**
    * Flips the current value, value based on seed.
    *
@@ -18,10 +19,7 @@ export interface ContractTx<ChainApi extends GenericSubstrateApi> extends Generi
    *
    * @selector 0x847d0968
    **/
-  flipWithSeed: GenericContractTxCall<
-    ChainApi,
-    (seed: Hash, options?: ContractTxOptions) => ContractSubmittableExtrinsic<ChainApi>
-  >;
+  flipWithSeed: GenericContractTxCall<(seed: Hash, options?: ContractTxOptions) => ContractSubmittableExtrinsic, Type>;
 
   /**
    * Flips the current value of the Flipper's boolean.
@@ -30,5 +28,5 @@ export interface ContractTx<ChainApi extends GenericSubstrateApi> extends Generi
    *
    * @selector 0x633aa551
    **/
-  flip: GenericContractTxCall<ChainApi, (options?: ContractTxOptions) => ContractSubmittableExtrinsic<ChainApi>>;
+  flip: GenericContractTxCall<(options?: ContractTxOptions) => ContractSubmittableExtrinsic, Type>;
 }

e2e/nodes/src/v6/contracts/flipper/constructor-query.d.ts → e2e/nodes/src/legacy/contracts/flipper-v6/constructor-query.d.ts

@@ -8,10 +8,11 @@ import type {
   GenericConstructorCallResult,
   ConstructorCallOptions,
   ContractInstantiateResult,
+  MetadataType,
 } from 'dedot/contracts';
 import type { InkPrimitivesLangError, FlipperFlipperError } from './types.js';
 
-export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends GenericConstructorQuery<ChainApi> {
+export interface ConstructorQuery<Type extends MetadataType> extends GenericConstructorQuery<Type> {
   /**
    * Creates a new flipper smart contract initialized with the given value.
    *
@@ -21,11 +22,11 @@ export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends
    * @selector 0x9bae9d5e
    **/
   new: GenericConstructorQueryCall<
-    ChainApi,
     (
       initValue: boolean,
       options?: ConstructorCallOptions,
-    ) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult<ChainApi>>>
+    ) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult>>,
+    Type
   >;
 
   /**
@@ -36,8 +37,8 @@ export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends
    * @selector 0x61ef7e3e
    **/
   newDefault: GenericConstructorQueryCall<
-    ChainApi,
-    (options?: ConstructorCallOptions) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult<ChainApi>>>
+    (options?: ConstructorCallOptions) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult>>,
+    Type
   >;
 
   /**
@@ -49,10 +50,10 @@ export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends
    * @selector 0x6d4cae81
    **/
   fromSeed: GenericConstructorQueryCall<
-    ChainApi,
     (
       seed: Hash,
       options?: ConstructorCallOptions,
-    ) => Promise<GenericConstructorCallResult<Result<[], FlipperFlipperError>, ContractInstantiateResult<ChainApi>>>
+    ) => Promise<GenericConstructorCallResult<Result<[], FlipperFlipperError>, ContractInstantiateResult>>,
+    Type
   >;
 }

e2e/zombienet/src/contracts/flipper/constructor-tx.d.ts → e2e/nodes/src/legacy/contracts/flipper-v6/constructor-tx.d.ts

@@ -6,14 +6,15 @@ import type {
   GenericConstructorTx,
   GenericConstructorTxCall,
   ConstructorTxOptions,
-  GenericContractApi,
+  InkGenericContractApi,
   GenericInstantiateSubmittableExtrinsic,
+  MetadataType,
 } from 'dedot/contracts';
 
 export interface ConstructorTx<
-  ChainApi extends GenericSubstrateApi,
-  ContractApi extends GenericContractApi = GenericContractApi,
-> extends GenericConstructorTx<ChainApi> {
+  ContractApi extends InkGenericContractApi,
+  Type extends MetadataType,
+> extends GenericConstructorTx<Type> {
   /**
    * Creates a new flipper smart contract initialized with the given value.
    *
@@ -23,11 +24,8 @@ export interface ConstructorTx<
    * @selector 0x9bae9d5e
    **/
   new: GenericConstructorTxCall<
-    ChainApi,
-    (
-      initValue: boolean,
-      options?: ConstructorTxOptions,
-    ) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>
+    (initValue: boolean, options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ContractApi>,
+    Type
   >;
 
   /**
@@ -38,8 +36,8 @@ export interface ConstructorTx<
    * @selector 0x61ef7e3e
    **/
   newDefault: GenericConstructorTxCall<
-    ChainApi,
-    (options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>
+    (options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ContractApi>,
+    Type
   >;
 
   /**
@@ -51,7 +49,7 @@ export interface ConstructorTx<
    * @selector 0x6d4cae81
    **/
   fromSeed: GenericConstructorTxCall<
-    ChainApi,
-    (seed: Hash, options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>
+    (seed: Hash, options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ContractApi>,
+    Type
   >;
 }