@berachain/berajs 0.1.2 → 0.2.1

package/src/actions/dex/aggregators/wbera.ts

@@ -1,12 +1,8 @@
 import { ChainId } from "@berachain/config/internal";
 
 import { wberaAbi } from "~/abi/pol/wbera";
-import { BeraError } from "~/errors/BeraError";
-import {
-  Aggregators,
-  type IAggregatorArgs,
-  type IRawAggregatorQuote,
-} from "~/types";
+import { Aggregators } from "~/enum/dex";
+import type { IAggregatorArgs, IRawAggregatorQuote, Token } from "~/types/dex";
 import type { IContractWrite } from "~/types/global";
 import { isToken } from "~/utils/tokens";
 import { BaseAggregator } from "./base";
@@ -16,55 +12,71 @@ class WBeraAggregator extends BaseAggregator {
   supportedChains = [ChainId.MAINNET, ChainId.BEPOLIA];
   readonly type = "rpc";
 
-  // handles native swaps: wrap and unwrap
-  async getQuote({
+  checkChainSupport({
     tokenIn,
     tokenOut,
-    amount,
-  }: Omit<IAggregatorArgs, "slippage" | "feeBps">): Promise<
-    IRawAggregatorQuote<false>
-  > {
-    this.checkChainSupport();
-
+  }: {
+    tokenIn: Token;
+    tokenOut: Token;
+  }): boolean {
     if (
-      (!isToken(tokenIn, "BERA") && !isToken(tokenIn, "WBERA")) ||
-      (!isToken(tokenOut, "WBERA") && !isToken(tokenOut, "BERA"))
+      // same chain
+      tokenIn.chainId !== tokenOut.chainId ||
+      // must be one of our chains
+      !super.checkChainSupport({ tokenIn, tokenOut })
     ) {
-      throw new BeraError({
-        message: "Invalid token pair",
-        level: "error",
-      });
+      return false;
     }
 
+    return (
+      (isToken(tokenIn, "BERA") && isToken(tokenOut, "WBERA")) ||
+      (isToken(tokenIn, "WBERA") && isToken(tokenOut, "BERA"))
+    );
+  }
+
+  // handles native swaps: wrap and unwrap
+  async getQuote({
+    tokenIn,
+    tokenOut,
+    amount,
+  }: Omit<
+    IAggregatorArgs,
+    "slippage" | "feeBps"
+  >): Promise<IRawAggregatorQuote> {
+    this.assertChainSupport({ tokenIn, tokenOut });
+
     const isWrap = isToken(tokenIn, "BERA") && isToken(tokenOut, "WBERA");
+
     return {
       amountOut: amount,
       amountIn: amount,
-      spender: undefined,
+      allowanceRequirements: [],
       name: isWrap ? Aggregators.Wrap : Aggregators.Unwrap,
       isNativeSwap: true,
       swapFeeBps: 0,
-      calldata: isWrap
-        ? ({
-            abi: wberaAbi,
-            address: this.config.tokens.wbera,
-            functionName: "deposit",
-            params: [],
-            value: BigInt(amount),
-          } satisfies Omit<
-            IContractWrite<typeof wberaAbi, "deposit">,
-            "message" | "actionType"
-          >)
-        : ({
-            abi: wberaAbi,
-            address: this.config.tokens.wbera,
-            functionName: "withdraw",
-            params: [BigInt(amount)],
-            value: BigInt(0),
-          } satisfies Omit<
-            IContractWrite<typeof wberaAbi, "withdraw">,
-            "message" | "actionType"
-          >),
+      getCalldata: () => {
+        return isWrap
+          ? ({
+              abi: wberaAbi,
+              address: this.config.tokens.wbera,
+              functionName: "deposit",
+              params: [],
+              value: BigInt(amount),
+            } satisfies Omit<
+              IContractWrite<typeof wberaAbi, "deposit">,
+              "message" | "actionType"
+            >)
+          : ({
+              abi: wberaAbi,
+              address: this.config.tokens.wbera,
+              functionName: "withdraw",
+              params: [BigInt(amount)],
+              value: BigInt(0),
+            } satisfies Omit<
+              IContractWrite<typeof wberaAbi, "withdraw">,
+              "message" | "actionType"
+            >);
+      },
     };
   }
 }

package/src/actions/dex/b-sdk.ts

@@ -24,8 +24,11 @@ for (const chain of Object.keys(chainConfigs)) {
   });
 
   API_CHAIN_NAMES[chainId] = config.bex.chainName;
-  // @ts-expect-error
-  CHAINS[chainId] = chainId === berachain.id ? berachain : berachainBepolia;
+
+  // this needs to be typed this way, because leaving @ts-expect-error
+  // is incredibly expensive (TypeScript takes 4 seconds to compile)
+  (CHAINS as Record<number, any>)[chainId] =
+    chainId === berachain.id ? berachain : berachainBepolia;
   BALANCER_RELAYER[chainId] = config.bex.relayer;
   VAULT[chainId] = config.bex.vault;
   BALANCER_QUERIES[chainId] = config.bex.queries;

package/src/actions/dex/getIsTokenExploited.ts

@@ -1,4 +1,3 @@
-import BigNumber from "bignumber.js";
 import { erc20Abi, formatUnits, type PublicClient } from "viem";
 
 import {
@@ -6,8 +5,9 @@ import {
   type GetExploitedTokensQuery,
   type GetExploitedTokensQueryVariables,
 } from "@berachain/graphql/dex/subgraph";
+import BigNumber from "@berachain/utils/pkg/bignumber.js";
 
-import type { Token } from "~/types";
+import type { Token } from "~/types/dex";
 import { getApolloClient } from "../clients/getApolloClient";
 
 /**

package/src/actions/enso/{zap.ts → getEnsoSwapBundle.ts}

@@ -3,12 +3,12 @@ import { ethAddress, zeroAddress } from "viem";
 
 import { InvalidArgumentError } from "~/errors/InvalidArgumentError";
 import type {
-  GetZapTransactionRequestsArgs,
+  GetEnsoSwapBundleArgs,
   GetZapTransactionResponse,
-} from "~/types";
+} from "~/types/enso";
 import { getTransactionsFromBundle } from "./util";
 
-export async function getZapTransactionRequests({
+export async function getEnsoSwapBundle({
   fromAddress,
   amountIn,
   tokenIn,
@@ -18,7 +18,7 @@ export async function getZapTransactionRequests({
   destinationChainId,
   slippage,
   publicClient,
-}: GetZapTransactionRequestsArgs): Promise<GetZapTransactionResponse> {
+}: GetEnsoSwapBundleArgs): Promise<GetZapTransactionResponse> {
   if (!fromAddress) {
     throw new InvalidArgumentError({
       property: "fromAddress",
@@ -46,7 +46,6 @@ export async function getZapTransactionRequests({
   if (destinationChainId && destinationChainId !== chainId) {
     bundleAction.args = {
       ...bundleAction.args,
-      //@ts-expect-error enso are releasing a fix in the next 2 weeks for this.
       destinationChainId: destinationChainId,
       refundReceiver: fromAddress,
     };

package/src/actions/enso/getEnsoUserTokensWithBalances.debug.test.ts

@@ -0,0 +1,73 @@
+import {
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  type MockInstance,
+  vi,
+} from "vitest";
+
+import { appConfig } from "@berachain/config/internal";
+import {
+  defaultChain,
+  externalChains,
+  transports,
+} from "@berachain/config/internal/wagmi";
+
+import { getConfig } from "@berachain/wagmi/config";
+
+import { BeraMonitoring } from "~/errors/BeraMonitoring";
+import { getEnsoClient } from "../clients/getEnsoClient";
+import { getEnsoUserTokensWithBalances } from "./getEnsoUserTokensWithBalances";
+
+describe("getEnsoUserTokensWithBalances", () => {
+  let fetchSpy: MockInstance<typeof global.fetch>;
+  let captureSpy: MockInstance;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    captureSpy = vi.spyOn(BeraMonitoring, "capture");
+    fetchSpy = vi.spyOn(global, "fetch");
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  const address = "0x79f453D56C4bC66586215827FbBc7B34Bc006b33";
+  it("should be using multicall for each chain", async () => {
+    const ensoClient = getEnsoClient();
+
+    const beraWagmiConfig = getConfig({
+      transports,
+      defaultChain,
+      chains: externalChains,
+      thirdweb: { clientId: appConfig.apiKeys.public.thirdweb },
+    });
+    const wagmiConfig = beraWagmiConfig.wagmi;
+
+    const ensoUserBalances = await getEnsoUserTokensWithBalances({
+      account: address,
+      wagmiConfig: wagmiConfig,
+      chainId: "all",
+      ensoClient: ensoClient,
+    });
+
+    expect(ensoUserBalances.length).toBeGreaterThan(0);
+
+    expect(fetchSpy).toHaveBeenCalled();
+    expect(captureSpy).not.toHaveBeenCalled();
+
+    const chains = Object.groupBy(
+      ensoUserBalances,
+      (token) => token.chainId ?? 0,
+    );
+    const chainIds = Object.keys(chains)
+      .map(Number)
+      .filter((chainId) => chainId !== 0);
+
+    expect(fetchSpy).toHaveBeenCalledTimes(1 + chainIds.length);
+  });
+});

package/src/actions/enso/{getEnsoUserToken.ts → getEnsoUserTokensWithBalances.ts}

@@ -1,11 +1,12 @@
 import type { EnsoClient } from "@ensofinance/sdk";
-import * as Sentry from "@sentry/nextjs";
 import { type Config, getChains, multicall } from "@wagmi/core";
 import { type Address, formatUnits } from "viem";
 
+import { BeraMonitoring } from "~/errors/BeraMonitoring";
 import { InvalidArgumentError } from "~/errors/InvalidArgumentError";
 import { initBeraError } from "~/errors/initBeraError";
-import type { BalanceTokenWithMetadata } from "~/types/dex";
+import type { BalanceToken } from "~/types/dex";
+import { beraToken, isToken } from "~/utils/tokens";
 import { getBalanceCall } from "../tokens/getWalletBalances";
 
 /**
@@ -13,7 +14,7 @@ import { getBalanceCall } from "../tokens/getWalletBalances";
  *
  * This uses enso's balance endpoint to get the balances and RPC to get fresh balances.
  */
-export async function getEnsoUserToken({
+export async function getEnsoUserTokensWithBalances({
   account,
   wagmiConfig,
   chainId,
@@ -23,27 +24,35 @@ export async function getEnsoUserToken({
   wagmiConfig: Config;
   chainId: number | "all";
   ensoClient: EnsoClient;
-}): Promise<BalanceTokenWithMetadata[]> {
+}): Promise<BalanceToken[]> {
   const ensoBalances = await ensoClient.getBalances({
     useEoa: true,
     chainId: chainId ?? "all",
     eoaAddress: account,
   });
 
-  const tokens: BalanceTokenWithMetadata[] = ensoBalances.map((balance) => ({
-    name: balance.name,
-    symbol: balance.symbol,
-    decimals: balance.decimals,
-    address: balance.token,
-    logoURI: balance.logoUri,
-    balance: BigInt(balance.amount),
-    formattedBalance: formatUnits(BigInt(balance.amount), balance.decimals),
-    chainId: Number(
-      // @ts-expect-error - balance.chainId is defined just not typed by enso
-      balance.chainId,
-    ),
-    price: Number(balance.price),
-  }));
+  const tokens: BalanceToken[] = ensoBalances.map(
+    (balance) =>
+      ({
+        name: balance.name,
+        symbol: balance.symbol,
+        decimals: balance.decimals,
+        address: isToken(balance.token, "ETH")
+          ? beraToken.address
+          : balance.token,
+        logoURI: balance.logoUri,
+        balance: {
+          raw: balance.amount.toString(),
+          formatted: formatUnits(BigInt(balance.amount), balance.decimals),
+        },
+
+        chainId: Number(
+          // @ts-expect-error - balance.chainId is defined just not typed by enso
+          balance.chainId,
+        ),
+        price: Number(balance.price),
+      }) as const satisfies BalanceToken,
+  );
 
   const tokenByChainId = Object.groupBy(tokens, (a) => a.chainId ?? 0);
 
@@ -66,7 +75,7 @@ export async function getEnsoUserToken({
       if (!multicallAddress) {
         // if multicall is not supported on this chain, we need to use the enso balance
         // first let's report the error, as this is likely unexpected
-        Sentry.captureException(
+        BeraMonitoring.captureException(
           new InvalidArgumentError({
             property: "multicallAddress",
             value: multicallAddress,
@@ -91,22 +100,25 @@ export async function getEnsoUserToken({
         allowFailure: true,
       });
 
-      const tokensWithBalances: BalanceTokenWithMetadata[] = [];
+      const tokensWithBalances: BalanceToken[] = [];
 
       for (let index = 0; index < chainTokens.length; index++) {
         const token = chainTokens[index];
         if (balances[index].status === "success") {
+          const balance = balances[index].result;
+
           tokensWithBalances.push({
             ...token,
-            balance: balances[index].result as bigint,
-            formattedBalance: formatUnits(
-              balances[index].result as bigint,
-              token.decimals,
-            ),
+            balance: {
+              raw: balance?.toString() ?? "0",
+              formatted: formatUnits(balance ?? 0n, token.decimals),
+            },
           });
         } else {
           console.error("error getting balance", balances[index].error);
-          captureException(initBeraError({ cause: balances[index].error }));
+          BeraMonitoring.captureException(
+            initBeraError({ cause: balances[index].error }),
+          );
           // uses enso balance as fallback
           tokensWithBalances.push(token);
         }
@@ -116,18 +128,18 @@ export async function getEnsoUserToken({
     }),
   );
 
-  const flattenedBalances: BalanceTokenWithMetadata[] = [];
+  const flattenedBalances: BalanceToken[] = [];
   for (const result of balances) {
     if (result.status === "fulfilled") {
       flattenedBalances.push(...(result.value ?? []));
     } else {
-      captureException(initBeraError({ cause: result.reason }));
+      BeraMonitoring.captureException(initBeraError({ cause: result.reason }));
     }
   }
 
   return flattenedBalances.sort((a, b) => {
-    const aValue = Number(a.formattedBalance) * (a.price ?? 0);
-    const bValue = Number(b.formattedBalance) * (b.price ?? 0);
+    const aValue = Number(a.balance.formatted) * (a.price ?? 0);
+    const bValue = Number(b.balance.formatted) * (b.price ?? 0);
     return bValue - aValue;
   });
 }

package/src/actions/enso/util.ts

@@ -1,6 +1,6 @@
 import { type Address, erc20Abi, ethAddress } from "viem";
 
-import type { GetZapTransactions, GetZapTransactionsArgs } from "~/types";
+import type { GetZapTransactions, GetZapTransactionsArgs } from "~/types/enso";
 
 /**
  * Get the zap transactions for a given bundle.

package/src/actions/{index.ts → exports.ts}

@@ -8,10 +8,12 @@
 
 export * from "./bend/getConvertToAssets";
 export * from "./bend/getMaxDeposit";
+export { BeraApolloClient } from "./clients/BeraApolloClient";
 export {
   getApolloClient,
   gql,
 } from "./clients/getApolloClient";
+export * from "./clients/getEnsoClient";
 export * from "./dex/aggregators/base";
 export * from "./dex/b-sdk";
 export * from "./dex/getAllPools";
@@ -52,8 +54,10 @@ export * from "./honey/isBasketModeEnabled";
 export * from "./misc/getBlockTimestamp";
 export * from "./pol/getBgtAprSimulation";
 export * from "./pol/getBlockTime";
+export * from "./pol/getEarnedStakedBeraVault";
 export * from "./pol/getGlobalData";
 export * from "./pol/getIncentiveFeeClaimStats";
+export * from "./pol/getLSTStakeConfig";
 export * from "./pol/getMarkets";
 export * from "./pol/getRewardProofsByValidator";
 export * from "./pol/getRewardTokenToBeraRate";
@@ -69,6 +73,7 @@ export * from "./pol/getStakedBeraSnapshots";
 export * from "./pol/getStakeWithdrawalCooldown";
 export * from "./pol/getSWBeraVaultMetadata";
 export * from "./pol/getSWBeraWithdrawal";
+export * from "./pol/getTotalStakedAmount";
 export * from "./pol/getUserClaimableIncentives";
 export * from "./pol/getUserVaultInfo";
 export * from "./pol/getUserVaults";

package/src/actions/governance/__tests__/checkProposalField.unit.test.ts

@@ -1,8 +1,8 @@
 import { describe, expect, it } from "vitest";
 
+import { ProposalErrorCodes } from "~/enum/governance";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 import { beraChefAbi } from "../../../abi/pol/beraChef";
-import { ProposalErrorCodes } from "../../../types/governance";
 import { checkProposalField } from "../checkProposalField";
 
 describe("checkProposalField", () => {

package/src/actions/governance/__tests__/getQuorum.integration.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";
 
 import { ChainId, defaultChainId } from "@berachain/config/internal";
 
-import { getServerSidePublicClient } from "~/utils";
+import { getServerSidePublicClient } from "~/utils/getServerSideClient";
 import { getTestClient } from "~/utils/getTestClient";
 import { getQuorum } from "../getQuorum";
 

package/src/actions/governance/checkProposalField.ts

@@ -1,6 +1,6 @@
 import { type AbiParameter, isAddress, isHex } from "viem";
 
-import { ProposalErrorCodes } from "~/types";
+import { ProposalErrorCodes } from "~/enum/governance";
 
 type CheckProposalFieldResultMinimal = ProposalErrorCodes | null;
 

package/src/actions/governance/computeActualStatus.ts

@@ -3,7 +3,7 @@ import {
   ProposalStatus,
 } from "@berachain/graphql/governance";
 
-import { ProposalState } from "~/types";
+import { ProposalState } from "~/enum/governance";
 
 const GOVERNANCE_ACCELERATE_PROPOSAL = false;
 

package/src/actions/governance/getBodyErrors.ts

@@ -2,7 +2,7 @@ import type {
   CustomProposal,
   CustomProposalErrors,
   GovernanceTopic,
-} from "~/types";
+} from "~/types/governance";
 import { checkProposalField } from "./checkProposalField";
 
 export const getBodyErrors = (

package/src/actions/governance/getDecodedFunctionData.ts

@@ -15,7 +15,6 @@ import { appConfig, defaultChainId } from "@berachain/config/internal";
 
 import { beraChefAbi } from "~/abi/pol/beraChef";
 import { rewardVaultAbi } from "~/abi/pol/rewardVault";
-import { daysInSeconds } from "~/utils/time";
 
 // Function to check if ABI contains proxy-related functions
 function isProxyABI(abi: Abi[]): boolean {
@@ -42,9 +41,7 @@ async function _getAbi({
 }) {
   const url = `https://api.etherscan.io/v2/api?module=contract&action=getabi&address=${contractAddress}&apikey=${appConfig.apiKeys.private.etherscan}&chainId=${chainId}`;
 
-  const response = await fetch(url, {
-    next: { revalidate: daysInSeconds(1) }, // 24h cache
-  });
+  const response = await fetch(url);
 
   if (!response.ok) {
     throw new Error(`Failed to fetch ABI: ${response.statusText}`);

package/src/actions/governance/getProposalDetails.ts

@@ -1,4 +1,4 @@
-import type { GetPublicClientReturnType } from "@wagmi/core";
+import type { PublicClient } from "viem";
 
 import {
   GetProposal,
@@ -15,7 +15,7 @@ export async function getProposalDetails({
   ...args
 }: BeraJS.BaseFunctionArgs & {
   proposalId: string;
-  client?: GetPublicClientReturnType;
+  client?: PublicClient;
 }): Promise<ProposalWithVotesFragment | undefined> {
   const governanceClient = getApolloClient("governance.subgraph", args);
 

package/src/actions/governance/getProposalFromTx.ts

@@ -1,4 +1,3 @@
-import type { GetPublicClientReturnType } from "@wagmi/core";
 import {
   type Address,
   type PublicClient,
@@ -18,7 +17,7 @@ import { parseProposalBody } from "./parseProposalBody";
 
 export async function getProposalFromTx(
   args: {
-    publicClient: PublicClient | GetPublicClientReturnType;
+    publicClient: PublicClient | undefined;
   } & (
     | {
         tx: TransactionReceipt;

package/src/actions/governance/getProposalParams.ts

@@ -9,14 +9,13 @@ import {
 
 import { beraChefAbi } from "~/abi/pol/beraChef";
 import { rewardVaultAbi } from "~/abi/pol/rewardVault";
-import {
-  type CustomProposal,
-  type CustomProposalActionErrors,
-  type CustomProposalErrors,
-  type GovernanceTopic,
-  ProposalErrorCodes,
-  ProposalTypeEnum,
-} from "~/types";
+import { ProposalErrorCodes, ProposalTypeEnum } from "~/enum/governance";
+import type {
+  CustomProposal,
+  CustomProposalActionErrors,
+  CustomProposalErrors,
+  GovernanceTopic,
+} from "~/types/governance";
 import { hasAnyTruthyValues } from "~/utils/hasAnyTruthyValues";
 import { checkProposalField } from "./checkProposalField";
 import { getBodyErrors } from "./getBodyErrors";

package/src/actions/governance/getQuorum.ts

@@ -1,4 +1,3 @@
-import type { GetPublicClientReturnType } from "@wagmi/core";
 import { formatEther, type PublicClient } from "viem";
 
 import { governanceAbi } from "~/abi/governance/governance";
@@ -19,7 +18,7 @@ export async function getQuorum({
    * Timestamp in seconds
    */
   at?: number | string;
-  publicClient: PublicClient | GetPublicClientReturnType;
+  publicClient: PublicClient | undefined;
 } & BeraJS.BaseFunctionArgs): Promise<string> {
   const { config } = parseBaseArgs(args);
   assertPublicClient(publicClient);

package/src/actions/honey/getCollateralWeights.ts

@@ -1,7 +1,7 @@
 import type { Address, PublicClient } from "viem";
 
 import { honeyFactoryAbi } from "~/abi/honey/honeyFactory";
-import type { Token } from "~/types";
+import type { Token } from "~/types/dex";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 
 /**

package/src/actions/honey/getHoneyCollaterals.ts

@@ -87,6 +87,7 @@ export async function getHoneyCollaterals({
       // in case that specific collateral is missing, fetch the token information from the contract
       return getTokenInformation({
         address: coll,
+        chainId: config.chainId,
         publicClient: client,
       });
     }),