@berachain/berajs 0.2.3 → 0.2.5

package/src/errors/getRevertReason.integration.test.ts

@@ -23,11 +23,12 @@ import {
   getRpcUrls,
 } from "@berachain/config/internal";
 
+import { metaMorphoV11Abi as metaMorphoAbi } from "@berachain/abis/bend-metamorpho/metaMorphoV11";
+import { bgtAbi } from "@berachain/abis/pol/bgt";
+import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
+
 import { getConfig } from "@berachain/wagmi/config";
 
-import { metaMorphoAbi } from "~/abi/bend/metaMorpho";
-import { bgtAbi } from "~/abi/pol/bgt";
-import { rewardVaultAbi } from "~/abi/pol/rewardVault";
 import { beraWriteContract } from "~/actions/transactions/beraWriteContract";
 import { ContractName } from "~/enum/contracts";
 import { TransactionActionType } from "~/enum/txnEnum";
@@ -146,38 +147,38 @@ describe.skipIf(defaultChainId !== ChainId.MAINNET)("getRevertReason", () => {
     expect(revertReason.reason).toBe("ERC20InsufficientAllowance");
   });
 
-  it.concurrent.each(errors)(
-    "should return the expected revert onchain reason ($error)",
-    async ({ tx, error, ...args }) => {
-      const revertReason = await getRevertReason({
-        publicClient,
-        abi: [...vaultV2Abi, ...metaMorphoAbi, ...rewardVaultAbi],
-        txHash: tx,
-      });
+  it.concurrent.each(
+    errors,
+  )("should return the expected revert onchain reason ($error)", async ({
+    tx,
+    error,
+    ...args
+  }) => {
+    const revertReason = await getRevertReason({
+      publicClient,
+      abi: [...vaultV2Abi, ...metaMorphoAbi, ...rewardVaultAbi],
+      txHash: tx,
+    });
 
-      expect(revertReason.reason).toBe(error);
+    expect(revertReason.reason).toBe(error);
 
-      if ("message" in args) {
-        expect(getErrorMessage({ reason: error })).toBe(args.message);
-      }
-    },
-  );
-
-  it.concurrent(
-    "should parse the error from nested contract calls",
-    async () => {
-      const revertReason = await getRevertReason({
-        publicClient,
-        account: "0xC0090EFF4C7818E46FE4eDd46588c6799180aFD4",
-        to: "0x56811e1BFfF951B98c7940d3aCe0e549Ec4fDee8",
-        value: 0n,
-        data: "0x374f435d0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000180000000000000000000000000257a41e20bbfe90d750646c2e00ba700d55958c500000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064d96ca0b90000000000000000000000000de23153bc280dd95be914ddafb5591ae877e067000000000000000000000000257a41e20bbfe90d750646c2e00ba700d55958c50000000000000000000000000000000000000000000089a4921338674240000000000000000000000000000000000000000000000000000000000000000000000000000000000000257a41e20bbfe90d750646c2e00ba700d55958c500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000846ef5eeae000000000000000000000000c0808a144ce2ea85bf84ebd1ddf5d59429f59dde0000000000000000000000000000000000000000000089a492133867424000000000000000000000000000000000000000000000033b6ec5be4c67d4cc54f101000000000000000000000000c0090eff4c7818e46fe4edd46588c6799180afd400000000000000000000000000000000000000000000000000000000",
-        abi: [...rewardVaultAbi, ...metaMorphoAbi],
-        blockNumber: 11765133n,
-      });
-      expect(revertReason.reason).toBe("AllCapsReached");
-    },
-  );
+    if ("message" in args) {
+      expect(getErrorMessage({ reason: error })).toBe(args.message);
+    }
+  });
+
+  it.concurrent("should parse the error from nested contract calls", async () => {
+    const revertReason = await getRevertReason({
+      publicClient,
+      account: "0xC0090EFF4C7818E46FE4eDd46588c6799180aFD4",
+      to: "0x56811e1BFfF951B98c7940d3aCe0e549Ec4fDee8",
+      value: 0n,
+      data: "0x374f435d0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000180000000000000000000000000257a41e20bbfe90d750646c2e00ba700d55958c500000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064d96ca0b90000000000000000000000000de23153bc280dd95be914ddafb5591ae877e067000000000000000000000000257a41e20bbfe90d750646c2e00ba700d55958c50000000000000000000000000000000000000000000089a4921338674240000000000000000000000000000000000000000000000000000000000000000000000000000000000000257a41e20bbfe90d750646c2e00ba700d55958c500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000846ef5eeae000000000000000000000000c0808a144ce2ea85bf84ebd1ddf5d59429f59dde0000000000000000000000000000000000000000000089a492133867424000000000000000000000000000000000000000000000033b6ec5be4c67d4cc54f101000000000000000000000000c0090eff4c7818e46fe4edd46588c6799180afd400000000000000000000000000000000000000000000000000000000",
+      abi: [...rewardVaultAbi, ...metaMorphoAbi],
+      blockNumber: 11765133n,
+    });
+    expect(revertReason.reason).toBe("AllCapsReached");
+  });
 
   it.concurrent("should return the expected simulation error", async () => {
     expect.hasAssertions();
@@ -287,43 +288,47 @@ describe("test errors contract", () => {
 
   const anvilMockAccount = mnemonicToAccount(anvilMnemonic);
 
-  it.concurrent.each(expectedRevertReasons)(
-    "should return the expected revert reason for $functionName",
-    async ({ functionName, ...rest }) => {
-      expect.hasAssertions();
-      const resultPromise = getRevertReason({
-        publicClient,
-        abi: testErrorContractAbi,
-        blockNumber: 11768554n,
-        to: "0x47a9E3A4b5a26eEDD0E53BC468bae31c24c9B158",
-        functionName,
-        args: "args" in rest ? rest.args : undefined,
-        account: anvilMockAccount.address,
-      });
+  it.concurrent.each(
+    expectedRevertReasons,
+  )("should return the expected revert reason for $functionName", async ({
+    functionName,
+    ...rest
+  }) => {
+    expect.hasAssertions();
+    const resultPromise = getRevertReason({
+      publicClient,
+      abi: testErrorContractAbi,
+      blockNumber: 11768554n,
+      to: "0x47a9E3A4b5a26eEDD0E53BC468bae31c24c9B158",
+      functionName,
+      args: "args" in rest ? rest.args : undefined,
+      account: anvilMockAccount.address,
+    });
 
-      const result = await resultPromise;
+    const result = await resultPromise;
 
-      expect(result.reason).toBe(
-        "onChainReason" in rest ? rest.onChainReason : rest.revertReason,
-      );
-    },
-  );
-
-  it.concurrent.each(expectedRevertReasons.filter((i) => !!i.txHashWith5972))(
-    "should return the expected revert reason for $functionName with txHashWith5972",
-    async ({ txHashWith5972, ...rest }) => {
-      expect.hasAssertions();
-      const result = await getRevertReason({
-        publicClient,
-        abi: testErrorContractAbi,
-        txHash: txHashWith5972,
-      });
+    expect(result.reason).toBe(
+      "onChainReason" in rest ? rest.onChainReason : rest.revertReason,
+    );
+  });
 
-      expect(result.reason).toBe(
-        "onChainReason" in rest ? rest.onChainReason : rest.revertReason,
-      );
-    },
-  );
+  it.concurrent.each(
+    expectedRevertReasons.filter((i) => !!i.txHashWith5972),
+  )("should return the expected revert reason for $functionName with txHashWith5972", async ({
+    txHashWith5972,
+    ...rest
+  }) => {
+    expect.hasAssertions();
+    const result = await getRevertReason({
+      publicClient,
+      abi: testErrorContractAbi,
+      txHash: txHashWith5972,
+    });
+
+    expect(result.reason).toBe(
+      "onChainReason" in rest ? rest.onChainReason : rest.revertReason,
+    );
+  });
 });
 
 /**
@@ -418,44 +423,47 @@ describe("eip5972 transactions", () => {
   });
   const wagmiConfig = beraWagmiConfig.wagmi;
 
-  it.concurrent.each(expectedRevertReasons)(
-    "should return the expected revert reason on sendCalls for $functionName to be $revertReason",
-    async ({ functionName, revertReason, ...rest }) => {
-      await beraWriteContract({
-        wagmiConfig,
-        walletClient,
-        errorsAbi: testErrorContractAbi,
-        account: anvilMockAccount,
-        enableSimulateCalls: true,
-        calls: [
-          {
-            address: config.tokens.wbera,
-            contractName: ContractName.ERC20,
-            abi: erc20Abi,
-            functionName: "approve",
-            params: [zeroAddress, 0n],
-          } as NonNullable<IContractWrite["calls"]>[number],
-          {
-            contractName: ContractName.ERC20,
-            address: "0x47a9E3A4b5a26eEDD0E53BC468bae31c24c9B158",
-            abi: testErrorContractAbi,
-            functionName,
-            params: "args" in rest ? rest.args : undefined,
-          } as NonNullable<IContractWrite["calls"]>[number],
-        ],
-        message: "test",
-        actionType: TransactionActionType.REDEEM_BGT,
-        onSuccess: () => {
-          assert.fail("Transaction should fail");
-        },
-        onError: (e) => {
-          expect(e).toBeInstanceOf(BeraError);
-          if (e instanceof BeraError) {
-            expect(e.reason).toBe(revertReason);
-          }
-        },
-      });
-      // assert.fail("Transaction should fail");
-    },
-  );
+  it.concurrent.each(
+    expectedRevertReasons,
+  )("should return the expected revert reason on sendCalls for $functionName to be $revertReason", async ({
+    functionName,
+    revertReason,
+    ...rest
+  }) => {
+    await beraWriteContract({
+      wagmiConfig,
+      walletClient,
+      errorsAbi: testErrorContractAbi,
+      account: anvilMockAccount,
+      enableSimulateCalls: true,
+      calls: [
+        {
+          address: config.tokens.wbera,
+          contractName: ContractName.ERC20,
+          abi: erc20Abi,
+          functionName: "approve",
+          params: [zeroAddress, 0n],
+        } as NonNullable<IContractWrite["calls"]>[number],
+        {
+          contractName: ContractName.ERC20,
+          address: "0x47a9E3A4b5a26eEDD0E53BC468bae31c24c9B158",
+          abi: testErrorContractAbi,
+          functionName,
+          params: "args" in rest ? rest.args : undefined,
+        } as NonNullable<IContractWrite["calls"]>[number],
+      ],
+      message: "test",
+      actionType: TransactionActionType.REDEEM_BGT,
+      onSuccess: () => {
+        assert.fail("Transaction should fail");
+      },
+      onError: (e) => {
+        expect(e).toBeInstanceOf(BeraError);
+        if (e instanceof BeraError) {
+          expect(e.reason).toBe(revertReason);
+        }
+      },
+    });
+    // assert.fail("Transaction should fail");
+  });
 });

package/src/hooks/dex/useAggregatorsRouterFeeBps.ts

@@ -1,9 +1,10 @@
 import useSWRImmutable from "swr/immutable";
 import { type PublicClient, zeroAddress } from "viem";
 
+import { metaAggregatorAbi as aggregatorsRouterAbi } from "@berachain/abis/meta-aggregator/metaAggregator";
+
 import { usePublicClient } from "@berachain/wagmi/hooks";
 
-import { aggregatorsRouterAbi } from "~/abi/bex/aggregatorsRouter";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 
 export const useAggregatorsRouterFeeBps = () => {

package/src/hooks/dex/useCreatePool.ts

@@ -9,13 +9,14 @@ import {
   zeroAddress,
 } from "viem";
 
+import { poolCreationHelperAbi as balancerPoolCreationHelperAbi } from "@berachain/abis/bex/poolCreationHelper";
+
 import {
   GetDedupedSubgraphPools,
   type GetDedupedSubgraphPoolsQuery,
   type SubgraphPoolFragment,
 } from "@berachain/graphql/dex/subgraph";
 
-import { balancerPoolCreationHelperAbi } from "~/abi/bex/balancerPoolCreationHelper";
 import { getApolloClient } from "~/actions/clients/getApolloClient";
 import { TransactionActionType } from "~/enum/txnEnum";
 import type { Token, TokenWithAmount } from "~/types/dex";

package/src/hooks/dex/usePollPoolCreationRelayerApproval.ts

@@ -1,9 +1,10 @@
 import useSWR from "swr";
 import type { Address } from "viem";
 
+import { vaultAbi as balancerVaultAbi } from "@berachain/abis/bex/vault";
+
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
 
-import { balancerVaultAbi } from "~/abi/bex/balancerVault";
 import { assertPublicClient } from "~/errors/assert";
 import type { DefaultHookOptions } from "~/types/global";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";

package/src/hooks/governance/useGetPastVotes.ts

@@ -1,9 +1,10 @@
 import useSWRImmutable from "swr/immutable";
 import { type Address, formatUnits } from "viem";
 
+import { bgtAbi } from "@berachain/abis/pol/bgt";
+
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
 
-import { bgtAbi } from "~/abi/pol/bgt";
 import { assertPublicClient } from "~/errors/assert";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 import { useProposalSnapshot } from "./useProposalSnapshot";

package/src/hooks/governance/useHasVoted.ts

@@ -1,9 +1,10 @@
 import useSWR from "swr";
 import { type Address, isAddress } from "viem";
 
+import { berachainGovernanceAbi as governanceAbi } from "@berachain/abis/gov/berachainGovernance";
+
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
 
-import { governanceAbi } from "~/abi/governance/governance";
 import { assertPublicClient } from "~/errors/assert";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 

package/src/hooks/governance/useIsCanceller.ts

@@ -1,9 +1,10 @@
 import useSWR from "swr";
 import type { Address } from "viem";
 
+import { timeLockAbi as governanceTimelockAbi } from "@berachain/abis/gov/timeLock";
+
 import { usePublicClient } from "@berachain/wagmi/hooks";
 
-import { governanceTimelockAbi } from "~/abi/governance/governanceTimelock";
 import { CANCELLER_ROLE } from "~/actions/governance/constants";
 import { POLLING } from "~/enum/polling";
 import { assertPublicClient } from "~/errors/assert";

package/src/hooks/governance/usePollProposalThreshold.ts

@@ -1,9 +1,10 @@
 import useSWR from "swr";
 import { type Address, formatEther } from "viem";
 
+import { berachainGovernanceAbi as governanceAbi } from "@berachain/abis/gov/berachainGovernance";
+
 import { usePublicClient } from "@berachain/wagmi/hooks";
 
-import { governanceAbi } from "~/abi/governance/governance";
 import { POLLING } from "~/enum/polling";
 import { assertPublicClient } from "~/errors/assert";
 import type { DefaultHookReturnType } from "~/types/global";

package/src/hooks/governance/usePollUserDelegates.ts

@@ -1,9 +1,10 @@
 import useSWR from "swr";
 import { type Address, formatEther } from "viem";
 
+import { bgtAbi } from "@berachain/abis/pol/bgt";
+
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
 
-import { bgtAbi } from "~/abi/pol/bgt";
 import { POLLING } from "~/enum/polling";
 import { assertPublicClient } from "~/errors/assert";
 import type { DefaultHookOptions, DefaultHookReturnType } from "~/types/global";

package/src/hooks/governance/useProposalSnapshot.ts

@@ -1,9 +1,10 @@
 import type { SWRResponse } from "swr";
 import useSWRImmutable from "swr/immutable";
 
+import { berachainGovernanceAbi as governanceAbi } from "@berachain/abis/gov/berachainGovernance";
+
 import { usePublicClient } from "@berachain/wagmi/hooks";
 
-import { governanceAbi } from "~/abi/governance/governance";
 import { assertPublicClient } from "~/errors/assert";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 

package/src/hooks/governance/useProposalState.ts

@@ -2,9 +2,10 @@ import type { SWRResponse } from "swr";
 import useSWRImmutable from "swr/immutable";
 import type { Address } from "viem";
 
+import { berachainGovernanceAbi as governanceAbi } from "@berachain/abis/gov/berachainGovernance";
+
 import { usePublicClient } from "@berachain/wagmi/hooks";
 
-import { governanceAbi } from "~/abi/governance/governance";
 import { ProposalState } from "~/enum/governance";
 import { assertPublicClient } from "~/errors/assert";
 

package/src/hooks/governance/useProposalTimelockState.ts

@@ -1,11 +1,12 @@
 import useSWR, { type SWRResponse } from "swr";
 import type { Address } from "viem";
 
+import { timeLockAbi as governanceTimelockAbi } from "@berachain/abis/gov/timeLock";
+
 import { usePublicClient } from "@berachain/wagmi/hooks";
 
 import { POLLING } from "~/enum/polling";
 import { assertPublicClient } from "~/errors/assert";
-import { governanceTimelockAbi } from "../../abi/governance/governanceTimelock";
 
 const TimelockOperationState = {
   0: "unset",
@@ -18,7 +19,7 @@ const TimelockOperationState = {
  * Fetches the state of a proposal timelock
  * @returns state of the proposal timelock (unset, waiting, ready, done)
  */
-export const useProposalTimelockState = ({
+export function useProposalTimelockState({
   proposalTimelockId,
   timelockAddress,
 }: {
@@ -26,7 +27,7 @@ export const useProposalTimelockState = ({
   timelockAddress: Address;
 }): SWRResponse<
   (typeof TimelockOperationState)[keyof typeof TimelockOperationState]
-> => {
+> {
   const publicClient = usePublicClient();
 
   const QUERY_KEY =
@@ -58,4 +59,4 @@ export const useProposalTimelockState = ({
       refreshInterval: POLLING.SLOW,
     },
   );
-};
+}

package/src/hooks/pol/useBgtUnstakedBalance.ts

@@ -1,9 +1,10 @@
 import useSWR from "swr";
 import { formatEther } from "viem";
 
+import { bgtAbi } from "@berachain/abis/pol/bgt";
+
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
 
-import { bgtAbi } from "~/abi/pol/bgt";
 import { POLLING } from "~/enum/polling";
 import { assertPublicClient } from "~/errors/assert";
 import type { DefaultHookOptions, DefaultHookReturnType } from "~/types/global";

package/src/hooks/pol/useOnChainRewardVault.ts

@@ -1,10 +1,11 @@
 import useSWR from "swr";
 import { type Address, erc20Abi, formatUnits, isAddress } from "viem";
 
+import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
+
 import type { ApiVaultFragment } from "@berachain/graphql/pol/api";
 import { usePublicClient } from "@berachain/wagmi/hooks";
 
-import { beraChefAbi } from "~/abi/pol/beraChef";
 import { getRewardVaultIncentives } from "~/actions/pol/getRewardVaultIncentives";
 import { getRewardVaultStakingToken } from "~/actions/pol/getRewardVaultStakingToken";
 import { getStakingTokenInformation } from "~/actions/pol/getStakingTokenInformation";

package/src/hooks/pol/useRewardVaultBalanceFromStakingToken.ts

@@ -1,9 +1,10 @@
 import useSWR from "swr";
 import { type Address, isAddress, zeroAddress } from "viem";
 
+import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
+
 import { useBeraWallet, usePublicClient } from "@berachain/wagmi/hooks";
 
-import { rewardVaultAbi } from "~/abi/pol/rewardVault";
 import { assertPublicClient } from "~/errors/assert";
 import type { DefaultHookOptions } from "~/types/global";
 import { useRewardVaultFromToken } from "./useRewardVaultFromToken";

package/src/hooks/pol/useRewardVaultFromToken.ts

@@ -1,9 +1,10 @@
 import useSWRImmutable from "swr/immutable";
 import { type Address, isAddress, zeroAddress } from "viem";
 
+import { rewardVaultFactoryAbi } from "@berachain/abis/pol/rewards/rewardVaultFactory";
+
 import { usePublicClient } from "@berachain/wagmi/hooks";
 
-import { rewardVaultFactoryAbi } from "~/abi/pol/rewardVaultFactory";
 import { assertPublicClient } from "~/errors/assert";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 

package/src/hooks/validators/useOnChainValidator.ts

@@ -1,12 +1,13 @@
 import useSWR from "swr";
 import { type Address, keccak256 } from "viem";
 
+import { beaconDepositAbi } from "@berachain/abis/pol/beaconDeposit";
+import { bgtAbi } from "@berachain/abis/pol/bgt";
+import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
+
 import type { ApiValidatorFragment } from "@berachain/graphql/pol/api";
 import { usePublicClient } from "@berachain/wagmi/hooks";
 
-import { beaconDepositAbi } from "~/abi/pol/beaconDeposit";
-import { beraChefAbi } from "~/abi/pol/beraChef";
-import { bgtAbi } from "~/abi/pol/bgt";
 import { assertPublicClient } from "~/errors/assert";
 import type { DefaultHookOptions, DefaultHookReturnType } from "~/types/global";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";