[SDK] Fix decodeFunction and decodeError functions (#7767)

Author: joaquim-verges

.changeset/tangy-ghosts-joke.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Fix decodeFunction and decodeError functions

packages/thirdweb/src/utils/abi/decodeError.ts

@@ -1,3 +1,4 @@
+import { AbiError } from "ox";
 import type * as ox__Abi from "ox/Abi";
 import * as ox__AbiError from "ox/AbiError";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
@@ -32,6 +33,12 @@ export async function decodeError<abi extends ox__Abi.Abi>(options: {
       `No ABI found for contract ${contract.address} on chain ${contract.chain.id}`,
     );
   }
-  const abiError = ox__AbiError.fromAbi(abi, data) as ox__AbiError.AbiError;
+  const err = abi.filter(
+    (i) => i.type === "error" && AbiError.getSelector(i) === data.slice(0, 10),
+  );
+  const abiError = err[0] as ox__AbiError.AbiError;
+  if (!abiError) {
+    throw new Error(`No ABI function found for selector ${data.slice(0, 10)}`);
+  }
   return ox__AbiError.decode(abiError, data);
 }

packages/thirdweb/src/utils/abi/decodeFunctionData.test.ts

@@ -0,0 +1,25 @@
+import { expect, it } from "vitest";
+import { TEST_CLIENT } from "../../../test/src/test-clients.js";
+import { defineChain } from "../../chains/utils.js";
+import { getContract } from "../../contract/contract.js";
+import { decodeFunctionData } from "./decodeFunctionData.js";
+
+it.runIf(process.env.TW_SECRET_KEY)(
+  "decodes function data correctly",
+  async () => {
+    const result = await decodeFunctionData({
+      contract: getContract({
+        address: "0x9480d58e14b1851a2A3C7aEFAd17D48e31D3F93b",
+        client: TEST_CLIENT,
+        chain: defineChain(17177),
+      }),
+      data: "0xd8fd8f44000000000000000000000000f117ed9dcc8960062484b781097321c8380cead30000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002466353238316131632d363830352d343536622d623738322d38356165326165623336643800000000000000000000000000000000000000000000000000000000",
+    });
+    expect(result).toMatchInlineSnapshot(`
+      [
+        "0xf117ed9dcc8960062484b781097321c8380cead3",
+        "0x66353238316131632d363830352d343536622d623738322d383561653261656233366438",
+      ]
+    `);
+  },
+);

packages/thirdweb/src/utils/abi/decodeFunctionData.ts

@@ -32,6 +32,14 @@ export async function decodeFunctionData<abi extends ox__Abi.Abi>(options: {
       `No ABI found for contract ${contract.address} on chain ${contract.chain.id}`,
     );
   }
-  const abiFunction = ox__AbiFunction.fromAbi(abi, data);
+  const fn = abi.filter(
+    (i) =>
+      i.type === "function" &&
+      ox__AbiFunction.getSelector(i) === data.slice(0, 10),
+  );
+  const abiFunction = fn[0] as ox__AbiFunction.AbiFunction;
+  if (!abiFunction) {
+    throw new Error(`No ABI function found for selector ${data.slice(0, 10)}`);
+  }
   return ox__AbiFunction.decodeData(abiFunction, data);
 }

packages/thirdweb/src/utils/abi/decodeFunctionResult.ts

@@ -32,6 +32,16 @@ export async function decodeFunctionResult<abi extends ox__Abi.Abi>(options: {
       `No ABI found for contract ${contract.address} on chain ${contract.chain.id}`,
     );
   }
-  const abiFunction = ox__AbiFunction.fromAbi(abi, rest.data);
+  const fn = abi.filter(
+    (i) =>
+      i.type === "function" &&
+      ox__AbiFunction.getSelector(i) === rest.data.slice(0, 10),
+  );
+  const abiFunction = fn[0] as ox__AbiFunction.AbiFunction;
+  if (!abiFunction) {
+    throw new Error(
+      `No ABI function found for selector ${rest.data.slice(0, 10)}`,
+    );
+  }
   return ox__AbiFunction.decodeResult(abiFunction, rest.data);
 }