feat: abiwan v2 intergation

package.json

@@ -68,6 +68,7 @@
  "@typescript-eslint/eslint-plugin": "^5.28.0",
  "@typescript-eslint/parser": "^5.28.0",
  "abi-wan-kanabi": "^1.0.3",
+ "abi-wan-kanabi-v2": "npm:abi-wan-kanabi@^2.1.0-rc.0",
  "ajv": "^8.12.0",
  "ajv-keywords": "^5.1.0",
  "eslint": "^8.17.0",

src/contract/default.ts

@@ -1,4 +1,5 @@
 import type { Abi as AbiKanabi } from 'abi-wan-kanabi';
+import type { Abi as AbiKanabiV2, TypedContract as AbiWanTypedContractV2 } from 'abi-wan-kanabi-v2';
 
 import { AccountInterface } from '../account';
 import { ProviderInterface, defaultProvider } from '../provider';
@@ -32,6 +33,8 @@ import { getAbiEvents, parseEvents as parseRawEvents } from '../utils/events/ind
 import { cleanHex } from '../utils/num';
 import { ContractInterface, TypedContract } from './interface';
 
+export type TypedContractV2<TAbi extends AbiKanabiV2> = AbiWanTypedContractV2<TAbi> & Contract;
+
 export const splitArgsAndOptions = (args: ArgsOrCalldataWithOptions) => {
  const options = [
  'blockIdentifier',
@@ -349,4 +352,8 @@ export class Contract implements ContractInterface {
  public typed<TAbi extends AbiKanabi>(tAbi: TAbi): TypedContract<TAbi> {
  return this as TypedContract<typeof tAbi>;
  }
+
+ public typedv2<TAbi extends AbiKanabiV2>(tAbi: TAbi): TypedContractV2<TAbi> {
+ return this as unknown as TypedContractV2<typeof tAbi>;
+ }
 }

src/contract/interface.ts

@@ -1,13 +1,16 @@
 import type { Abi as AbiKanabi, TypedContract as AbiWanTypedContract } from 'abi-wan-kanabi';
+import type { Abi as AbiKanabiV2, TypedContract as AbiWanTypedContractV2 } from 'abi-wan-kanabi-v2';
 
 import { AccountInterface } from '../account';
 import { ProviderInterface } from '../provider';
 import {
  Abi,
  ArgsOrCalldata,
  AsyncContractFunction,
+ BigNumberish,
  BlockIdentifier,
  CallOptions,
+ Calldata,
  ContractFunction,
  ContractVersion,
  EstimateFeeResponse,
@@ -16,10 +19,35 @@ import {
  InvokeFunctionResponse,
  InvokeOptions,
  ParsedEvents,
+ RawArgs,
  Result,
+ Uint256,
 } from '../types';
+import { CairoCustomEnum } from '../utils/calldata/enum/CairoCustomEnum';
+import { CairoOption } from '../utils/calldata/enum/CairoOption';
+import { CairoResult } from '../utils/calldata/enum/CairoResult';
+
+// import { ResolvedConfig } from 'abi-wan-kanabi-v2/config';
+
+declare module 'abi-wan-kanabi-v2' {
+ export interface Config<OptionT = any, ResultT = any, ErrorT = any> {
+ FeltType: BigNumberish;
+ U256Type: number | bigint | Uint256;
+ Option: CairoOption<OptionT>;
+ Tuple: Record<number, BigNumberish | object | boolean>;
+ Result: CairoResult<ResultT, ErrorT>;
+ Enum: CairoCustomEnum;
+ Calldata: RawArgs | Calldata;
+ CallOptions: CallOptions;
+ InvokeOptions: InvokeOptions;
+ InvokeFunctionResponse: InvokeFunctionResponse;
+ }
+}
+
+// export type X = ResolvedConfig['InvokeOptions'];
 
 export type TypedContract<TAbi extends AbiKanabi> = AbiWanTypedContract<TAbi> & ContractInterface;
+type TypedContractV2<TAbi extends AbiKanabiV2> = AbiWanTypedContractV2<TAbi> & ContractInterface;
 
 export abstract class ContractInterface {
  public abstract abi: Abi;
@@ -139,4 +167,5 @@ export abstract class ContractInterface {
  public abstract getVersion(): Promise<ContractVersion>;
 
  public abstract typed<TAbi extends AbiKanabi>(tAbi: TAbi): TypedContract<TAbi>;
+ public abstract typedv2<TAbi extends AbiKanabiV2>(tAbi: TAbi): TypedContractV2<TAbi>;
 }