feat: clean airdropABI import error

sismo-core · Jul 25, 2023 · 16b9b16 · 16b9b16
1 parent 4626325
commit 16b9b16
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/front/script/register-root/latest-root.txt b/front/script/register-root/latest-root.txt
@@ -1 +1 @@
-0x1e66c7019d3ee0187b65d1cbd242fa5f9d2cea21d5d38661fc73b30258e30d3e
+0x04377750dde97e90a959fdf4cc762702199b43214ed250836b1fbd7bf9820715
diff --git a/front/src/app/page.tsx b/front/src/app/page.tsx
@@ -7,7 +7,6 @@ import { useConnectModal } from "@rainbow-me/rainbowkit";
 import { formatEther } from "viem";
 import {
  formatError,
- getAuthRequestsAndClaimRequestsFromSismoConnectRequest,
  getProofDataForAuth,
  getProofDataForClaim,
  getUserIdFromHex,

diff --git a/front/src/utils/misc.ts b/front/src/utils/misc.ts
@@ -1,6 +1,4 @@
 import { decodeAbiParameters, encodeAbiParameters } from "viem";
-import { abi as AirdropABI } from "../../../abi/Airdrop.json";
-import { errorsABI } from "./errorsABI";
 import {
  AuthRequest,
  AuthType,
@@ -19,10 +17,6 @@ export function removeDashAndCapitalizeFirstLetter(str: string) {
  return str.replace(/-/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
 }
 
-export const baseContractInputs = {
- abi: [...AirdropABI, ...errorsABI],
-};
-
 export const signMessage = (address: `0x${string}`) => {
  if (!address) return "";
 

diff --git a/front/src/utils/useContract.tsx b/front/src/utils/useContract.tsx
@@ -9,14 +9,16 @@ import {
 } from "viem";
 import { useAccount, useNetwork, useSwitchNetwork, useWalletClient } from "wagmi";
 import { waitForTransaction, getPublicClient } from "@wagmi/core";
-import { abi as AirdropABI } from "../../../abi/Airdrop.json";
+import Airdrop from "../../../abi/Airdrop.json";
 import { errorsABI } from "./errorsABI";
 import { formatError } from "./misc";
 import { fundMyAccountOnLocalFork } from "./fundMyAccountOnLocalFork";
 import { transactions } from "../../../broadcast/Airdrop.s.sol/5151111/run-latest.json";
 
+export const airdropABI = [...Airdrop.abi, ...errorsABI] as const;
+
 export type ContractClaim = {
- airdropContract: GetContractReturnType<typeof AirdropABI, PublicClient, WalletClient>;
+ airdropContract: GetContractReturnType<typeof airdropABI, PublicClient, WalletClient>;
  switchNetworkAsync: ((chainId?: number | undefined) => Promise<Chain>) | undefined;
  waitingForTransaction: (hash: `0x${string}`) => Promise<TransactionReceipt | undefined>;
  error: string;
@@ -40,7 +42,7 @@ export default function useContract({
 
  const airdropContract = getContract({
  address: transactions[0].contractAddress as `0x${string}`,
- abi: [...AirdropABI, ...errorsABI],
+ abi: airdropABI,
  publicClient,
  walletClient: walletClient as WalletClient,
  });