chore: rename abi-wan-kanabi to abi-wan-kanabi-v1 (#942)

This avoid `npx abi-wan-kanabi` to use the installed version and
forces it to get the latest version from npm

Author: haroune-mohammedi

__tests__/cairo1_typed.test.ts

@@ -9,7 +9,7 @@ import {
   DeclareDeployUDCResponse,
   RawArgsArray,
   RawArgsObject,
-  TypedContract,
+  TypedContractV1,
   cairo,
   num,
   selector,
@@ -35,7 +35,7 @@ describeIfDevnet('Cairo 1 Devnet', () => {
     const provider = getTestProvider();
     const account = getTestAccount(provider);
     let dd: DeclareDeployUDCResponse;
-    let cairo1Contract: TypedContract<typeof tAbi>;
+    let cairo1Contract: TypedContractV1<typeof tAbi>;
     initializeMatcher(expect);
 
     beforeAll(async () => {
@@ -48,7 +48,7 @@ describeIfDevnet('Cairo 1 Devnet', () => {
         compiledHelloSierra.abi,
         dd.deploy.contract_address,
         account
-      ).typed(tAbi);
+      ).typedv1(tAbi);
     });
 
     test('Declare & deploy v2 - Hello Cairo 1 contract', async () => {
@@ -503,7 +503,7 @@ describeIfSequencerGoerli('Cairo1 Testnet', () => {
     const classHash: any = '0x028b6f2ee9ae00d55a32072d939a55a6eb522974a283880f3c73a64c2f9fd6d6';
     const contractAddress: any =
       '0x771bbe2ba64fa5ab52f0c142b4296fc67460a3a2372b4cdce752c620e3e8194';
-    let cairo1Contract: TypedContract<typeof tAbi>;
+    let cairo1Contract: TypedContractV1<typeof tAbi>;
     initializeMatcher(expect);
 
     test('GetClassByHash', async () => {

package-lock.json

@@ -67,7 +67,7 @@
     "@types/url-join": "^4.0.1",
     "@typescript-eslint/eslint-plugin": "^5.28.0",
     "@typescript-eslint/parser": "^5.28.0",
-    "abi-wan-kanabi": "^1.0.3",
+    "abi-wan-kanabi-v1": "npm:abi-wan-kanabi@^1.0.3",
     "abi-wan-kanabi-v2": "npm:abi-wan-kanabi@^2.1.0",
     "ajv": "^8.12.0",
     "ajv-keywords": "^5.1.0",

package.json

@@ -31,7 +31,7 @@ import { CallData, cairo } from '../utils/calldata';
 import { createAbiParser } from '../utils/calldata/parser';
 import { getAbiEvents, parseEvents as parseRawEvents } from '../utils/events/index';
 import { cleanHex } from '../utils/num';
-import { ContractInterface, TypedContract } from './interface';
+import { ContractInterface, TypedContractV1 } from './interface';
 
 export type TypedContractV2<TAbi extends AbiKanabiV2> = AbiWanTypedContractV2<TAbi> & Contract;
 
@@ -349,8 +349,8 @@ export class Contract implements ContractInterface {
     return this.providerOrAccount.getContractVersion(this.address);
   }
 
-  public typed<TAbi extends AbiKanabi>(tAbi: TAbi): TypedContract<TAbi> {
-    return this as TypedContract<typeof tAbi>;
+  public typedv1<TAbi extends AbiKanabi>(tAbi: TAbi): TypedContractV1<TAbi> {
+    return this as TypedContractV1<typeof tAbi>;
   }
 
   public typedv2<TAbi extends AbiKanabiV2>(tAbi: TAbi): TypedContractV2<TAbi> {

src/contract/default.ts

@@ -1,4 +1,4 @@
-import type { Abi as AbiKanabi, TypedContract as AbiWanTypedContract } from 'abi-wan-kanabi';
+import type { Abi as AbiKanabiV1, TypedContract as AbiWanTypedContractV1 } from 'abi-wan-kanabi-v1';
 import type { Abi as AbiKanabiV2, TypedContract as AbiWanTypedContractV2 } from 'abi-wan-kanabi-v2';
 
 import { AccountInterface } from '../account';
@@ -42,7 +42,8 @@ declare module 'abi-wan-kanabi-v2' {
   }
 }
 
-export type TypedContract<TAbi extends AbiKanabi> = AbiWanTypedContract<TAbi> & ContractInterface;
+export type TypedContractV1<TAbi extends AbiKanabiV1> = AbiWanTypedContractV1<TAbi> &
+  ContractInterface;
 type TypedContractV2<TAbi extends AbiKanabiV2> = AbiWanTypedContractV2<TAbi> & ContractInterface;
 
 export abstract class ContractInterface {
@@ -162,6 +163,6 @@ export abstract class ContractInterface {
    */
   public abstract getVersion(): Promise<ContractVersion>;
 
-  public abstract typed<TAbi extends AbiKanabi>(tAbi: TAbi): TypedContract<TAbi>;
+  public abstract typedv1<TAbi extends AbiKanabiV1>(tAbi: TAbi): TypedContractV1<TAbi>;
   public abstract typedv2<TAbi extends AbiKanabiV2>(tAbi: TAbi): TypedContractV2<TAbi>;
 }

src/contract/interface.ts

@@ -63,7 +63,7 @@ import { tAbi } from '../__mocks__/hello';
 
 let cairo1Contract = new Contract(compiledHelloSierra.abi, dd.deploy.contract_address, account);
 
-let cairo1ContractTyped = cairo1Contract.typed(tAbi);
+let cairo1ContractTyped = cairo1Contract.typedv1(tAbi); // or typedv2(tAbi) if you are using Cairo compiler v2
 
 cairo1ContractTyped.test_bool();
 ```