Fix: cached parseAbi inputs/outputs (#277)

cartesi · Dec 11, 2024 · ec9cba8 · ec9cba8
1 parent 324d1cd
commit ec9cba8
Show file tree

Hide file tree

Showing 9 changed files with 140 additions and 35 deletions.
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -31,7 +31,6 @@
         "@tanstack/react-query": "^5.27.5",
         "@vercel/analytics": "^1.2.2",
         "@vercel/speed-insights": "^1.0.10",
-        "abitype": "^0.9",
         "dexie": "^4.0.4",
         "encoding": "^0.1",
         "graphql": "^16",

diff --git a/apps/web/src/components/applications/applicationsTable.tsx b/apps/web/src/components/applications/applicationsTable.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { ActionIcon, Box, Group, Tooltip } from "@mantine/core";
-import { Address as AddressType } from "abitype/dist/types/abi";
 import Link from "next/link";
 import { FC } from "react";
 import {
@@ -10,6 +9,7 @@ import {
     TbPlugConnectedX,
     TbStack2,
 } from "react-icons/tb";
+import { Address as AddressType } from "viem";
 import { ApplicationItemFragment } from "../../graphql/explorer/operations";
 import { useConnectionConfig } from "../../providers/connectionConfig/hooks";
 import Address from "../address";

diff --git a/apps/web/src/components/applications/latestInputsTable.tsx b/apps/web/src/components/applications/latestInputsTable.tsx
@@ -1,12 +1,12 @@
 "use client";
 import { Badge, Box, Button, Group, Loader, Table, Text } from "@mantine/core";
-import type { Address as AddressType } from "abitype/dist/types/abi";
 import prettyMilliseconds from "pretty-ms";
 import { FC, useCallback, useState } from "react";
-import Address from "../address";
-import { InputItemFragment } from "../../graphql/explorer/operations";
 import { TbArrowRight } from "react-icons/tb";
+import type { Address as AddressType } from "viem";
+import { InputItemFragment } from "../../graphql/explorer/operations";
 import { methodResolver } from "../../lib/methodResolver";
+import Address from "../address";
 
 export interface Entry {
     appId: AddressType;

diff --git a/apps/web/src/components/latestEntries.tsx b/apps/web/src/components/latestEntries.tsx
@@ -8,11 +8,11 @@ import {
     useMantineTheme,
 } from "@mantine/core";
 import { useMediaQuery } from "@mantine/hooks";
-import type { Address as AddressType } from "abitype/dist/types/abi";
 import Link from "next/link";
 import type { FC } from "react";
 import { IconType } from "react-icons";
 import { TbApps, TbInbox } from "react-icons/tb";
+import type { Address as AddressType } from "viem";
 import {
     useApplicationsConnectionQuery,
     useInputsQuery,

diff --git a/apps/web/src/components/latestEntriesTable.tsx b/apps/web/src/components/latestEntriesTable.tsx
@@ -1,8 +1,8 @@
 "use client";
 import { Button, Loader, Table, Text } from "@mantine/core";
-import type { Address as AddressType } from "abitype/dist/types/abi";
 import prettyMilliseconds from "pretty-ms";
 import { FC, useCallback, useState } from "react";
+import type { Address as AddressType } from "viem";
 import Address from "./address";
 
 export interface Entry {

diff --git a/apps/web/test/components/specification/SpecificationFormView.test.tsx b/apps/web/test/components/specification/SpecificationFormView.test.tsx
@@ -1,3 +1,4 @@
+import * as mantineHooks from "@mantine/hooks";
 import { notifications } from "@mantine/notifications";
 import {
     cleanup,
@@ -19,7 +20,6 @@ import withMantineTheme from "../../utils/WithMantineTheme";
 import { encodedDataSamples } from "./encodedData.stubs";
 import { JotaiTestProvider } from "./jotaiHelpers";
 import { erc1155JSONABISpecStub } from "./specification.stubs";
-import * as mantineHooks from "@mantine/hooks";
 
 vi.mock("@mantine/hooks", async () => {
     const actual = await vi.importActual<typeof mantineHooks>("@mantine/hooks");
@@ -687,7 +687,7 @@ describe("Specification Form View", () => {
 
                     expect(
                         screen.getByText(
-                            `Unknown type. Type "bla" is not a valid ABI type. Version: [email protected].0`,
+                            `Unknown type. Type "bla" is not a valid ABI type. Version: [email protected].7`,
                         ),
                     ).toBeInTheDocument();
                 });
@@ -712,7 +712,7 @@ describe("Specification Form View", () => {
 
                     expect(
                         screen.getByText(
-                            `Invalid ABI parameter. "address" is a protected Solidity keyword. More info: https://docs.soliditylang.org/en/latest/cheatsheet.html Details: uint address Version: [email protected].0`,
+                            `Invalid ABI parameter. "address" is a protected Solidity keyword. More info: https://docs.soliditylang.org/en/latest/cheatsheet.html Details: uint address Version: [email protected].7`,
                         ),
                     ).toBeInTheDocument();
                 });

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -35,8 +35,8 @@
         "ramda": "0.30.1",
         "ramda-adjunct": "^5.0.1",
         "react-icons": "^4",
-        "viem": "^2",
         "uuid": "^11.0.3",
+        "viem": "^2",
         "wagmi": "^2"
     },
     "peerDependencies": {

diff --git a/packages/ui/test/GenericInputForm/index.test.tsx b/packages/ui/test/GenericInputForm/index.test.tsx
@@ -1,8 +1,8 @@
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { AbiFunction, getAddress, stringToHex } from "viem";
 import { afterAll, describe, it } from "vitest";
 import { GenericInputForm } from "../../src/GenericInputForm";
 import withMantineTheme from "../utils/WithMantineTheme";
-import { AbiFunction, getAddress, stringToHex } from "viem";
 import { abiParam, formSpecification, functionSignature } from "./mocks";
 
 const Component = withMantineTheme(GenericInputForm);
@@ -819,7 +819,7 @@ describe("GenericInputForm", () => {
             });
             expect(
                 screen.getByText(
-                    "Unknown signature. Details: invalid-value Version: [email protected].0",
+                    "Unknown signature. Details: invalid-value Version: [email protected].7",
                 ),
             ).toBeInTheDocument();
 
@@ -1022,7 +1022,7 @@ describe("GenericInputForm", () => {
             });
             expect(
                 screen.getByText(
-                    "Invalid ABI parameter. Details: invalid-value Version: [email protected].0",
+                    "Invalid ABI parameter. Details: invalid-value Version: [email protected].7",
                 ),
             ).toBeInTheDocument();
             fireEvent.change(abiParameterInput, {