fix: cairo isCairo1Abi optimization

starknet-io · Sep 23, 2023 · da76508 · da76508
1 parent 54ffca4
commit da76508
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/src/utils/calldata/cairo.ts b/src/utils/calldata/cairo.ts
@@ -51,21 +51,11 @@ export const getArrayType = (type: string) => {
  * ```
  */
 export function isCairo1Abi(abi: Abi): boolean {
-  const firstFunction = abi.find((entry) => entry.type === 'function');
-  if (!firstFunction) {
-    if (abi.find((it) => it.type === 'interface')) {
-      // Expected in Cairo1 version 2
-      return true;
-    }
-    throw new Error(`Error in ABI. No function in ABI.`);
+  const { cairo } = getAbiContractVersion(abi);
+  if (cairo === undefined) {
+    throw Error('Unable to determine Cairo version');
   }
-  if (firstFunction.inputs.length) {
-    return isCairo1Type(firstFunction.inputs[0].type);
-  }
-  if (firstFunction.outputs.length) {
-    return isCairo1Type(firstFunction.outputs[0].type);
-  }
-  throw new Error(`Error in ABI. No input/output in function ${firstFunction.name}`);
+  return cairo === '1';
 }
 
 /**