@berachain/berajs 0.2.5 → 0.2.6-patch.2

package/src/actions/pol/getSWBeraVaultMetadata.ts

@@ -1,11 +1,8 @@
-import { type Address, erc20Abi, type PublicClient } from "viem";
-
-import { wberaStakerVaultAbi as stakeBeraVaultAbi } from "@berachain/abis/pol/wberaStakerVault";
+import { type Address, erc20Abi, erc4626Abi, type PublicClient } from "viem";
 
 import BigNumber from "@berachain/utils/pkg/bignumber.js";
 
-import { assertPublicClient } from "~/errors/assert";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { assertPublicClient } from "../../errors/assert";
 import { getIncentiveFeeClaimStats } from "./getIncentiveFeeClaimStats";
 import { getStakeWithdrawalCooldown } from "./getStakeWithdrawalCooldown";
 
@@ -26,32 +23,32 @@ export interface VaultMetadata {
   lockPeriod?: number;
   totalBuyBacks: number;
   totalBuyBacksInLast24Hours: number;
+  address: Address;
 }
 /**
  *
  * @param address - The address of the vault
+ * @param underlyingAsset - The address of the vault's underlying asset token
  * @throws {Error} If the vault is not found
  * @returns
  */
 export async function getSWBeraVaultMetadata({
   address,
+  underlyingAsset,
   publicClient,
   blockTime,
-  ...args
 }: {
   address: Address;
+  underlyingAsset: Address;
   publicClient?: PublicClient;
   blockTime: number;
-} & BeraJS.BaseFunctionArgs): Promise<VaultMetadata> {
-  const { config } = parseBaseArgs(args);
+}): Promise<VaultMetadata> {
   assertPublicClient(publicClient);
 
   const hoursWindow = 26; // 26 hours is the window for the vault to ensure at least 1 claim per APR window.
   try {
-    // Get current block number
-    const [currentBlock] = await Promise.all([
-      publicClient.getBlock({ blockTag: "latest" }),
-    ]);
+    const currentBlock = await publicClient.getBlock({ blockTag: "latest" });
+
     const blocksPerWindow = Math.floor((hoursWindow * 60 * 60) / blockTime); // hoursWindow * 60 minutes * 60 seconds / actual block time
     const blockWindowAgo = currentBlock.number - BigInt(blocksPerWindow);
 
@@ -64,36 +61,36 @@ export async function getSWBeraVaultMetadata({
       totalSupply24HoursAgo,
       oneShareWorthWindowAgo,
       tvl24HoursAgo,
-      totalWBeraIssued,
+      underlyingTotalSupply,
       lockPeriod,
       incentiveFeeClaimStats,
     ] = await Promise.all([
       publicClient.readContract({
         address,
-        abi: stakeBeraVaultAbi,
+        abi: erc4626Abi,
         functionName: "totalAssets",
       }),
       publicClient.readContract({
         address,
-        abi: stakeBeraVaultAbi,
+        abi: erc4626Abi,
         functionName: "totalSupply",
       }),
       publicClient.readContract({
         address,
-        abi: stakeBeraVaultAbi,
+        abi: erc4626Abi,
         functionName: "previewRedeem",
         args: [10n ** 18n],
         blockNumber: currentBlock.number,
       }),
       publicClient.readContract({
-        address: config.tokens.wbera,
+        address: underlyingAsset,
         abi: erc20Abi,
         functionName: "balanceOf",
         args: [address],
       }),
       publicClient.readContract({
         address,
-        abi: stakeBeraVaultAbi,
+        abi: erc4626Abi,
         functionName: "totalAssets",
         blockNumber: blockWindowAgo,
       }),
@@ -105,20 +102,20 @@ export async function getSWBeraVaultMetadata({
       }),
       publicClient.readContract({
         address,
-        abi: stakeBeraVaultAbi,
+        abi: erc4626Abi,
         functionName: "previewRedeem",
         args: [10n ** 18n],
         blockNumber: blockWindowAgo,
       }),
       publicClient.readContract({
-        address: config.tokens.wbera,
+        address: underlyingAsset,
         abi: erc20Abi,
         functionName: "balanceOf",
         args: [address],
         blockNumber: blockWindowAgo,
       }),
       publicClient.readContract({
-        address: config.tokens.wbera,
+        address: underlyingAsset,
         abi: erc20Abi,
         functionName: "totalSupply",
       }),
@@ -135,6 +132,7 @@ export async function getSWBeraVaultMetadata({
     const currentExchangeRate = new BigNumber(currentOneShareWorth.toString());
 
     return {
+      address,
       current: {
         exchangeRate: currentExchangeRate.toString(),
         totalSupply: new BigNumber(currentTotalSupply.toString())
@@ -155,7 +153,7 @@ export async function getSWBeraVaultMetadata({
           .toString(),
         tvl: new BigNumber(tvl24HoursAgo.toString()).dividedBy(1e18).toString(),
       },
-      totalWBeraIssued: new BigNumber(totalWBeraIssued.toString())
+      totalWBeraIssued: new BigNumber(underlyingTotalSupply.toString())
         .dividedBy(1e18)
         .toString(),
       lockPeriod,

package/src/actions/pol/getSWBeraWithdrawal.ts

@@ -2,10 +2,10 @@ import type { Address, PublicClient } from "viem";
 
 import { wberaStakerVaultAbi as stakeBeraVaultAbi } from "@berachain/abis/pol/wberaStakerVault";
 
-import { getStakeWithdrawalCooldown } from "~/actions/pol/getStakeWithdrawalCooldown";
-import { formatTimeLeft } from "~/utils/formatTimestamps";
-import { msToSeconds } from "~/utils/time";
-import { isToken } from "~/utils/tokens";
+import { formatTimeLeft } from "../../utils/formatTimestamps";
+import { msToSeconds } from "../../utils/time";
+import { isToken } from "../../utils/tokens";
+import { getStakeWithdrawalCooldown } from "./getStakeWithdrawalCooldown";
 
 /**
  * Calculates and returns formatted time remaining until a target date

package/src/actions/pol/getStakedBeraAPR.ts

@@ -6,8 +6,8 @@ import {
   GqlSWberaVaultMetadataResolution,
 } from "@berachain/graphql/pol/api";
 
-import { getApolloClient } from "~/actions/clients/getApolloClient";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
+import { getApolloClient } from "../clients/getApolloClient";
 
 function getResolution(window: "DAY" | "WEEK") {
   if (window === "DAY") {

package/src/actions/pol/getStakedBeraSnapshots.ts

@@ -6,8 +6,8 @@ import {
   GqlVaultSnapshotDataRange,
 } from "@berachain/graphql/pol/api";
 
-import { getApolloClient } from "~/actions/clients/getApolloClient";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
+import { getApolloClient } from "../clients/getApolloClient";
 
 export type GetStakedBeraSnapshotsArgs = {
   chain?: GqlChain;

package/src/actions/pol/getStakingDailyAssets.ts

@@ -1,7 +1,7 @@
 import type { Address } from "viem";
 
-import { beraFetchJson } from "~/utils/beraFetch";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { beraFetchJson } from "../../utils/beraFetch";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
 export async function getStakingDailyAssets({
   address,
@@ -16,7 +16,7 @@ export async function getStakingDailyAssets({
   );
 
   const { config } = parseBaseArgs({});
-  const url = `${config.bonder}/vaults/${address}/total-assets-by-day?start=${startDayDate.toISOString().split("T")[0]}`;
+  const url = `${config.staking}/vaults/${address}/total-assets-by-day?start=${startDayDate.toISOString().split("T")[0]}`;
   return beraFetchJson<{ _timestamp: number; total_assets: string }[]>({
     url,
     type: "rest",

package/src/actions/pol/getStakingTokenInformation.ts

@@ -1,7 +1,7 @@
 import { type Address, erc20Abi, formatUnits, type PublicClient } from "viem";
 
-import { assertPublicClient } from "~/errors/assert";
-import type { Token } from "~/types/dex";
+import { assertPublicClient } from "../../errors/assert";
+import type { Token } from "../../types/dex";
 
 export interface GetStakingTokenInformation {
   address: Address;

package/src/actions/pol/getTotalStakedAmount.ts

@@ -4,7 +4,7 @@ import type { Address } from "@berachain/config";
 
 import { wberaStakerVaultAbi as stakeBeraVaultAbi } from "@berachain/abis/pol/wberaStakerVault";
 
-import { assertPublicClient } from "~/errors/assert";
+import { assertPublicClient } from "../../errors/assert";
 
 /**
  * Get the total staked amount for a given vault address

package/src/actions/pol/getUserClaimableIncentives.ts

@@ -1,9 +1,9 @@
 import type { Address } from "viem";
 
-import { BeraError } from "~/errors/BeraError";
-import type { BribeBoostRewardItem } from "~/types/bribe-boost";
-import { getErrorResponse } from "~/utils/getErrorResponse";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { BeraError } from "../../errors/BeraError";
+import type { BribeBoostRewardItem } from "../../types/bribe-boost";
+import { getErrorResponse } from "../../utils/getErrorResponse";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
 /**
  * Server-side function to get user claimable incentives grouped by validator

package/src/actions/pol/getUserVaultInfo.ts

@@ -1,6 +1,6 @@
 import { type Address, formatEther, type PublicClient } from "viem";
 
-import type { UserVaultInfo } from "~/types/pol";
+import type { UserVaultInfo } from "../../types/pol";
 import { getUserVaultsBalance } from "./getUserVaultsBalance";
 import { getUserVaultsReward } from "./getUserVaultsReward";
 import { getVaultsSupply } from "./getVaultsSupply";

package/src/actions/pol/getUserVaults.ts

@@ -10,10 +10,10 @@ import {
   type GqlChain,
 } from "@berachain/graphql/pol/api";
 
-import { getApolloClient } from "~/actions/clients/getApolloClient";
-import { BeraError } from "~/errors/BeraError";
-import { BeraMonitoring } from "~/errors/BeraMonitoring";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { BeraError } from "../../errors/BeraError";
+import { BeraMonitoring } from "../../errors/BeraMonitoring";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
+import { getApolloClient } from "../clients/getApolloClient";
 
 export interface UserVault {
   unclaimedBgt: string;

package/src/actions/pol/getUserVaultsBalance.ts

@@ -2,7 +2,7 @@ import type { Address, PublicClient } from "viem";
 
 import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
 
-import { assertAddress, assertPublicClient } from "~/errors/assert";
+import { assertAddress, assertPublicClient } from "../../errors/assert";
 
 export interface GetUserVaultsInfo {
   account: string | undefined;

package/src/actions/pol/getVaultHistory.ts

@@ -7,8 +7,8 @@ import {
   type GqlChain,
 } from "@berachain/graphql/pol/api";
 
-import { getApolloClient } from "~/actions/clients/getApolloClient";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
+import { getApolloClient } from "../clients/getApolloClient";
 
 export type GetVaultHistoryArgs = {
   vault: Address;

package/src/actions/pol/getVaultValidators.ts

@@ -7,7 +7,7 @@ import {
   type GetVaultValidatorsQueryVariables,
 } from "@berachain/graphql/pol/api";
 
-import { getApolloClient } from "~/actions/clients/getApolloClient";
+import { getApolloClient } from "../clients/getApolloClient";
 
 export async function getVaultValidators({
   address,

package/src/actions/prices/__tests__/prices.integration.test.ts

@@ -1,8 +1,8 @@
 import { getAddress } from "viem";
 import { describe, expect, it } from "vitest";
 
-import { getTokens } from "~/actions/tokens/getTokens";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { parseBaseArgs } from "../../../utils/parseBaseArgs";
+import { getTokens } from "../../tokens/getTokens";
 import { getTokenCurrentPrices } from "../getTokenCurrentPrices";
 
 describe("prices", async () => {

package/src/actions/prices/getTokenCurrentPrices.ts

@@ -7,11 +7,11 @@ import {
   type GqlChain,
 } from "@berachain/graphql/dex/api";
 
-import { getApolloClient } from "~/actions/clients/getApolloClient";
-import type { TokenCurrentPriceMap } from "~/types/dex";
-import { getSafeNumber } from "~/utils/formatNumber";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
-import { isToken } from "~/utils/tokens";
+import type { TokenCurrentPriceMap } from "../../types/dex";
+import { getSafeNumber } from "../../utils/formatNumber";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
+import { isToken } from "../../utils/tokens";
+import { getApolloClient } from "../clients/getApolloClient";
 
 export async function getTokenCurrentPrices({
   addressIn: _addressIn,

package/src/actions/pyth/getHoneyPythFeeds.ts

@@ -4,8 +4,8 @@ import type { Address } from "@berachain/config";
 
 import { pythPriceOracleAbi } from "@berachain/abis/extras/pythPriceOracle";
 
-import type { PythPriceFeedMap } from "~/types/honeySwap";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import type { PythPriceFeedMap } from "../../types/honeySwap";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
 /**
  * Given a list of tokens, it will return the price feed ids for each token according to honey priceOracle

package/src/actions/pyth/getUpdateFee.ts

@@ -1,7 +1,7 @@
 import type { Address, PublicClient } from "viem";
 
-import { pythAbi } from "~/abi/pyth/pyth";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { pythAbi } from "../../abi/pyth/pyth";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
 export async function getPythUpdateFee({
   client,

package/src/actions/tokens/getAllowances.ts

@@ -6,8 +6,8 @@ import {
   formatUnits,
 } from "viem";
 
-import { assertDefined, assertPublicClient } from "~/errors/assert";
-import type { AllowanceQueryItem, AllowanceToken } from "~/types/dex";
+import { assertDefined, assertPublicClient } from "../../errors/assert";
+import type { AllowanceQueryItem, AllowanceToken } from "../../types/dex";
 
 export interface GetAllowances {
   items: AllowanceQueryItem[] | undefined;

package/src/actions/tokens/getTokenInformation.ts

@@ -1,7 +1,7 @@
 import { type Address, erc20Abi, type PublicClient } from "viem";
 
-import { initBeraError } from "~/errors/initBeraError";
-import type { MinimalERC20 } from "~/types/dex";
+import { initBeraError } from "../../errors/initBeraError";
+import type { MinimalERC20 } from "../../types/dex";
 
 export interface GetTokenInformation {
   address: Address;

package/src/actions/tokens/getTokens.ts

@@ -1,6 +1,6 @@
-import type { TokenWithMetadata } from "~/types/dex";
-import { beraFetchJson } from "~/utils/beraFetch";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import type { TokenWithMetadata } from "../../types/dex";
+import { beraFetchJson } from "../../utils/beraFetch";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
 export async function getTokens({
   url,

package/src/actions/tokens/getUnderlyingToken.ts

@@ -1,10 +1,10 @@
 import { type Config, getPublicClient } from "@wagmi/core";
 import { erc4626Abi } from "viem";
 
-import { assertPublicClient } from "~/errors/assert";
-import { initBeraError } from "~/errors/initBeraError";
-import type { MinimalERC20 } from "~/types/dex";
-import { isToken } from "~/utils/tokens";
+import { assertPublicClient } from "../../errors/assert";
+import { initBeraError } from "../../errors/initBeraError";
+import type { MinimalERC20 } from "../../types/dex";
+import { isToken } from "../../utils/tokens";
 import { getTokenInformation } from "./getTokenInformation";
 
 /**

package/src/actions/tokens/getWalletBalances.integration.test.ts

@@ -10,7 +10,7 @@ import {
 
 import { getConfig } from "@berachain/wagmi/config";
 
-import { isToken } from "~/utils/tokens";
+import { isToken } from "../../utils/tokens";
 import { getTokens } from "./getTokens";
 import { getWalletBalances } from "./getWalletBalances";
 

package/src/actions/tokens/getWalletBalances.ts

@@ -7,14 +7,14 @@ import {
   isAddress,
 } from "viem";
 
-import { multicall3Abi } from "~/abi/utils/multicall3";
+import { multicall3Abi } from "../../abi/utils/multicall3";
 import {
   assertAddress,
   assertDefined,
   assertPublicClient,
-} from "~/errors/assert";
-import type { BalanceToken, Token } from "~/types/dex";
-import { isToken } from "~/utils/tokens";
+} from "../../errors/assert";
+import type { BalanceToken, Token } from "../../types/dex";
+import { isToken } from "../../utils/tokens";
 
 export interface GetWalletBalances {
   account: string | undefined;

package/src/actions/transactions/beraWriteContract.integration.test.ts

@@ -22,12 +22,12 @@ import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
 
 import { getConfig } from "@berachain/wagmi/config";
 
-import { TransactionActionType } from "~/enum/txnEnum";
-import type { IContractWriteFn } from "~/types/global";
-import { getServerSidePublicClient } from "~/utils/getServerSideClient";
-import { getTestClient } from "~/utils/getTestClient";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
-import { anvilMnemonic } from "~/utils/test-utils";
+import { TransactionActionType } from "../../enum/txnEnum";
+import type { IContractWriteFn } from "../../types/global";
+import { getServerSidePublicClient } from "../../utils/getServerSideClient";
+import { getTestClient } from "../../utils/getTestClient";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
+import { anvilMnemonic } from "../../utils/test-utils";
 import { getUserVaults } from "../pol/getUserVaults";
 import { beraWriteContract } from "./beraWriteContract";
 

package/src/actions/transactions/beraWriteContract.ts

@@ -22,18 +22,18 @@ import {
 
 import { ChainId, defaultChainId } from "@berachain/config/internal";
 
-import { commonAbiErrors } from "~/abi/utils/commonAbiErrors";
-import { assertPublicClient } from "~/errors/assert";
-import { BeraError } from "~/errors/BeraError";
-import { getRevertReason } from "~/errors/getRevertReason";
-import { InvalidArgumentError } from "~/errors/InvalidArgumentError";
-import { parseDecodedError, parseViemError } from "~/errors/parseViemError";
-import { RequestError } from "~/errors/RequestError";
-import { TransactionFailedError } from "~/errors/TransactionFailedError";
-import type { IContractWrite } from "~/types/global";
-import { DEFAULT_METAMASK_GAS_LIMIT } from "~/utils/constants";
-import { getTestClient } from "~/utils/getTestClient";
-import { seconds } from "~/utils/time";
+import { commonAbiErrors } from "../../abi/utils/commonAbiErrors";
+import { assertPublicClient } from "../../errors/assert";
+import { BeraError } from "../../errors/BeraError";
+import { getRevertReason } from "../../errors/getRevertReason";
+import { InvalidArgumentError } from "../../errors/InvalidArgumentError";
+import { parseDecodedError, parseViemError } from "../../errors/parseViemError";
+import { RequestError } from "../../errors/RequestError";
+import { TransactionFailedError } from "../../errors/TransactionFailedError";
+import type { IContractWrite } from "../../types/global";
+import { DEFAULT_METAMASK_GAS_LIMIT } from "../../utils/constants";
+import { getTestClient } from "../../utils/getTestClient";
+import { seconds } from "../../utils/time";
 
 /**
  * Setting 1 seconds as refresh interval since block time is 2 seconds.

package/src/actions/validators/getActiveBoostAndCommissionChangeDelay.integration.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import { getServerSidePublicClient } from "~/utils/getServerSideClient";
+import { getServerSidePublicClient } from "../../utils/getServerSideClient";
 import { getActiveBoostAndCommissionChangeDelay } from "./getActiveBoostAndCommissionChangeDelay";
 
 describe("getActiveBoostAndCommissionChangeDelay", () => {

package/src/actions/validators/getActiveBoostAndCommissionChangeDelay.ts

@@ -5,7 +5,7 @@ import type { EdgeConfigSchema } from "@berachain/config/internal/edge-config";
 import { bgtAbi } from "@berachain/abis/pol/bgt";
 import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
 
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
 export interface ActiveBoostAndCommissionChangeDelay {
   boostDelay: number;

package/src/actions/validators/getAllValidators.ts

@@ -5,8 +5,8 @@ import {
   type GqlChain,
 } from "@berachain/graphql/pol/api";
 
-import { getApolloClient } from "~/actions/clients/getApolloClient";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
+import { getApolloClient } from "../clients/getApolloClient";
 
 export async function getAllValidators({
   variables = {},

package/src/actions/validators/getApiValidator.ts

@@ -7,8 +7,8 @@ import {
   type GqlChain,
 } from "@berachain/graphql/pol/api";
 
-import { getApolloClient } from "~/actions/clients/getApolloClient";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
+import { getApolloClient } from "../clients/getApolloClient";
 
 export async function getApiValidator({
   id,

package/src/actions/validators/getBaselineRewardAllocation.ts

@@ -2,7 +2,7 @@ import type { PublicClient } from "viem";
 
 import { rewardAllocatorFactoryAbi as rewardAllocationFactoryAbi } from "@berachain/abis/pol/rewards/rewardAllocatorFactory";
 
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
 import { formatValidatorRewardAllocation } from "./getValidatorRewardAllocation";
 
 export async function getBaselineRewardAllocation({

package/src/actions/validators/getDailyValidatorBlockStats.ts

@@ -6,7 +6,7 @@ import {
   type GetValidatorBlockStatsQueryVariables,
 } from "@berachain/graphql/pol/subgraph";
 
-import { getApolloClient } from "~/actions/clients/getApolloClient";
+import { getApolloClient } from "../clients/getApolloClient";
 
 export async function getDailyValidatorBlockStats({
   pubKey,

package/src/actions/validators/getDefaultRewardAllocation.ts

@@ -2,7 +2,7 @@ import type { PublicClient } from "viem";
 
 import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
 
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
 import {
   formatValidatorRewardAllocation,
   type ValidatorRewardAllocation,