@berachain/berajs 0.2.2 → 0.2.4

package/src/actions/pol/getRewardVaultFromToken.ts

@@ -1,6 +1,7 @@
 import { type Address, type PublicClient, zeroAddress } from "viem";
 
-import { rewardVaultFactoryAbi } from "~/abi/pol/rewardVaultFactory";
+import { rewardVaultFactoryAbi } from "@berachain/abis/pol/rewards/rewardVaultFactory";
+
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 
 export async function getRewardVaultFromToken({

package/src/actions/pol/getRewardVaultIncentives.ts

@@ -1,7 +1,8 @@
 import { isSameAddress } from "@berachain-foundation/berancer-sdk";
 import { type Address, erc20Abi, formatUnits, type PublicClient } from "viem";
 
-import { rewardVaultAbi } from "~/abi/pol/rewardVault";
+import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
+
 import { BeraError } from "~/errors/BeraError";
 import { BeraMonitoring } from "~/errors/BeraMonitoring";
 

package/src/actions/pol/getRewardVaultRewards.ts

@@ -1,6 +1,7 @@
 import { type Address, formatUnits, type PublicClient } from "viem";
 
-import { rewardVaultAbi } from "~/abi/pol/rewardVault";
+import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
+
 import { msToSeconds } from "~/utils/time";
 
 export enum RewardVaultDistributionMode {

package/src/actions/pol/getRewardVaultStakingToken.ts

@@ -1,6 +1,6 @@
 import type { Address, PublicClient } from "viem";
 
-import { rewardVaultAbi } from "~/abi/pol/rewardVault";
+import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
 
 export async function getRewardVaultStakingToken({
   address,

package/src/actions/pol/getRewardVaults.ts

@@ -1,5 +1,7 @@
 import { type Address, formatUnits, type PublicClient } from "viem";
 
+import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
+
 import {
   type ApiVaultFragment,
   GetVaults,
@@ -7,7 +9,6 @@ import {
   type GetVaultsQueryVariables,
 } from "@berachain/graphql/pol/api";
 
-import { rewardVaultAbi } from "~/abi/pol/rewardVault";
 import { getApolloClient } from "~/actions/clients/getApolloClient";
 
 export interface GetGaugeData {

package/src/actions/pol/getSWBeraVaultMetadata.ts

@@ -1,8 +1,9 @@
 import { type Address, erc20Abi, type PublicClient } from "viem";
 
+import { wberaStakerVaultAbi as stakeBeraVaultAbi } from "@berachain/abis/pol/wberaStakerVault";
+
 import BigNumber from "@berachain/utils/pkg/bignumber.js";
 
-import { stakeBeraVaultAbi } from "~/abi/pol/stakeBeraVault";
 import { assertPublicClient } from "~/errors/assert";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 import { getIncentiveFeeClaimStats } from "./getIncentiveFeeClaimStats";

package/src/actions/pol/getSWBeraWithdrawal.ts

@@ -1,6 +1,7 @@
 import type { Address, PublicClient } from "viem";
 
-import { stakeBeraVaultAbi } from "~/abi/pol/stakeBeraVault";
+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";

package/src/actions/pol/getStakeWithdrawalCooldown.ts

@@ -1,6 +1,6 @@
 import type { Address, PublicClient } from "viem";
 
-import { stakeBeraVaultAbi } from "~/abi/pol/stakeBeraVault";
+import { wberaStakerVaultAbi as stakeBeraVaultAbi } from "@berachain/abis/pol/wberaStakerVault";
 
 export async function getStakeWithdrawalCooldown({
   publicClient,

package/src/actions/pol/getTotalStakedAmount.ts

@@ -2,7 +2,8 @@ import type { PublicClient } from "viem";
 
 import type { Address } from "@berachain/config";
 
-import { stakeBeraVaultAbi } from "~/abi/pol/stakeBeraVault";
+import { wberaStakerVaultAbi as stakeBeraVaultAbi } from "@berachain/abis/pol/wberaStakerVault";
+
 import { assertPublicClient } from "~/errors/assert";
 
 /**

package/src/actions/pol/getUserVaults.ts

@@ -1,5 +1,7 @@
 import { type Address, formatUnits, type PublicClient } from "viem";
 
+import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
+
 import {
   type ApiVaultFragment,
   GetUserVaults,
@@ -8,7 +10,6 @@ import {
   type GqlChain,
 } from "@berachain/graphql/pol/api";
 
-import { rewardVaultAbi } from "~/abi/pol/rewardVault";
 import { getApolloClient } from "~/actions/clients/getApolloClient";
 import { BeraError } from "~/errors/BeraError";
 import { BeraMonitoring } from "~/errors/BeraMonitoring";

package/src/actions/pol/getUserVaultsBalance.ts

@@ -1,6 +1,7 @@
 import type { Address, PublicClient } from "viem";
 
-import { rewardVaultAbi } from "~/abi/pol/rewardVault";
+import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
+
 import { assertAddress, assertPublicClient } from "~/errors/assert";
 
 export interface GetUserVaultsInfo {

package/src/actions/pol/getUserVaultsReward.ts

@@ -1,6 +1,6 @@
 import type { Address, PublicClient } from "viem";
 
-import { rewardVaultAbi } from "~/abi/pol/rewardVault";
+import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
 
 export interface GetUserVaultsInfo {
   account: string | undefined;

package/src/actions/pol/getVaultsSupply.ts

@@ -1,6 +1,6 @@
 import type { Address, PublicClient } from "viem";
 
-import { rewardVaultAbi } from "~/abi/pol/rewardVault";
+import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
 
 export interface GetVaultsSupply {
   vaultAddress: Address;

package/src/actions/pyth/getHoneyPythFeeds.ts

@@ -2,7 +2,8 @@ import type { PublicClient } from "viem";
 
 import type { Address } from "@berachain/config";
 
-import { pythPriceOracleAbi } from "~/abi/honey/pythPriceOracle";
+import { pythPriceOracleAbi } from "@berachain/abis/extras/pythPriceOracle";
+
 import type { PythPriceFeedMap } from "~/types/honeySwap";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 

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

@@ -17,16 +17,17 @@ import {
   transports,
 } from "@berachain/config/internal/wagmi";
 
+import { bgtAbi } from "@berachain/abis/pol/bgt";
+import { rewardVaultAbi } from "@berachain/abis/pol/rewards/rewardVault";
+
 import { getConfig } from "@berachain/wagmi/config";
 
-import { bgtAbi } from "~/abi/pol/bgt";
 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 { rewardVaultAbi } from "../../abi/pol/rewardVault";
 import { getUserVaults } from "../pol/getUserVaults";
 import { beraWriteContract } from "./beraWriteContract";
 
@@ -128,55 +129,51 @@ describe("beraWriteContract", () => {
 
   const redeemAmount = parseEther("1");
 
-  it(
-    "should encode and send tx",
-    {
-      // Fails frequently on CI probably because of the anvil node
-      retry: 3,
-    },
-    async () => {
-      const testClient = getTestClient();
-
-      await testClient.setBalance({
-        address: wallet,
-        value: parseEther("1000"),
-      });
-
-      const bgtBalance = await publicClient.readContract({
-        address: config.tokens.bgt,
-        abi: bgtAbi,
-        functionName: "balanceOf",
-        args: [wallet],
-      });
-
-      const tx = await beraWriteContract({
-        wagmiConfig,
-        walletClient,
-        account: wallet,
-        address: config.tokens.bgt,
-        abi: bgtAbi,
-        functionName: "redeem",
-        params: [zeroAddress, redeemAmount],
-        message: "test",
-        actionType: TransactionActionType.REDEEM_BGT,
-        onError: (e) => {
-          assert.fail(e.message);
-        },
-      });
-
-      expect(tx).toBeDefined();
-
-      const postTxBgtBalance = await publicClient.readContract({
-        address: config.tokens.bgt,
-        abi: bgtAbi,
-        blockTag: "pending",
-        functionName: "balanceOf",
-        args: [wallet],
-      });
-
-      expect(postTxBgtBalance).toBe(bgtBalance - redeemAmount);
-    },
-  );
+  it("should encode and send tx", {
+    // Fails frequently on CI probably because of the anvil node
+    retry: 3,
+  }, async () => {
+    const testClient = getTestClient();
+
+    await testClient.setBalance({
+      address: wallet,
+      value: parseEther("1000"),
+    });
+
+    const bgtBalance = await publicClient.readContract({
+      address: config.tokens.bgt,
+      abi: bgtAbi,
+      functionName: "balanceOf",
+      args: [wallet],
+    });
+
+    const tx = await beraWriteContract({
+      wagmiConfig,
+      walletClient,
+      account: wallet,
+      address: config.tokens.bgt,
+      abi: bgtAbi,
+      functionName: "redeem",
+      params: [zeroAddress, redeemAmount],
+      message: "test",
+      actionType: TransactionActionType.REDEEM_BGT,
+      onError: (e) => {
+        assert.fail(e.message);
+      },
+    });
+
+    expect(tx).toBeDefined();
+
+    const postTxBgtBalance = await publicClient.readContract({
+      address: config.tokens.bgt,
+      abi: bgtAbi,
+      blockTag: "pending",
+      functionName: "balanceOf",
+      args: [wallet],
+    });
+
+    expect(postTxBgtBalance).toBe(bgtBalance - redeemAmount);
+  });
 
   it("should send raw tx", async () => {
     const testClient = getTestClient();

package/src/actions/validators/getActiveBoostAndCommissionChangeDelay.ts

@@ -2,8 +2,9 @@ import type { PublicClient } from "viem";
 
 import type { EdgeConfigSchema } from "@berachain/config/internal/edge-config";
 
-import { beraChefAbi } from "~/abi/pol/beraChef";
-import { bgtAbi } from "~/abi/pol/bgt";
+import { bgtAbi } from "@berachain/abis/pol/bgt";
+import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
+
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 
 export interface ActiveBoostAndCommissionChangeDelay {

package/src/actions/validators/getBaselineRewardAllocation.ts

@@ -1,6 +1,7 @@
 import type { PublicClient } from "viem";
 
-import { rewardAllocationFactoryAbi } from "~/abi/pol/rewardAllocationFactory";
+import { rewardAllocatorFactoryAbi as rewardAllocationFactoryAbi } from "@berachain/abis/pol/rewards/rewardAllocatorFactory";
+
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 import { formatValidatorRewardAllocation } from "./getValidatorRewardAllocation";
 

package/src/actions/validators/getDefaultRewardAllocation.ts

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

package/src/actions/validators/getUserBoostsOnValidator.ts

@@ -1,6 +1,7 @@
 import { type Address, formatEther, type PublicClient } from "viem";
 
-import { bgtAbi } from "~/abi/pol/bgt";
+import { bgtAbi } from "@berachain/abis/pol/bgt";
+
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 
 export type UserBoostsOnValidator = {

package/src/actions/validators/getValidatorCommission.ts

@@ -1,6 +1,7 @@
 import type { Address, PublicClient } from "viem";
 
-import { beraChefAbi } from "~/abi/pol/beraChef";
+import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
+
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 
 export async function getValidatorCommission({

package/src/actions/validators/getValidatorOperatorAddress.ts

@@ -1,6 +1,7 @@
 import type { Address, PublicClient } from "viem";
 
-import { beaconDepositAbi } from "~/abi/pol/beaconDeposit";
+import { beaconDepositAbi } from "@berachain/abis/pol/beaconDeposit";
+
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 
 export async function getValidatorOperatorAddress({

package/src/actions/validators/getValidatorQueuedCommission.ts

@@ -1,6 +1,7 @@
 import type { Address, PublicClient } from "viem";
 
-import { beraChefAbi } from "~/abi/pol/beraChef";
+import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
+
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 
 export interface ValidatorQueuedCommission {

package/src/actions/validators/getValidatorQueuedOperatorAddress.ts

@@ -1,6 +1,7 @@
 import type { Address, PublicClient } from "viem";
 
-import { beaconDepositAbi } from "~/abi/pol/beaconDeposit";
+import { beaconDepositAbi } from "@berachain/abis/pol/beaconDeposit";
+
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 
 export type ValidatorQueuedOperatorAddress = [bigint, string];

package/src/actions/validators/getValidatorQueuedRewardAllocation.ts

@@ -1,6 +1,7 @@
 import type { Address, PublicClient } from "viem";
 
-import { beraChefAbi } from "~/abi/pol/beraChef";
+import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
+
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 import {
   formatValidatorRewardAllocation,

package/src/actions/validators/getValidatorRewardAllocation.ts

@@ -1,6 +1,7 @@
 import type { Address, PublicClient } from "viem";
 
-import { beraChefAbi } from "~/abi/pol/beraChef";
+import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
+
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 
 export interface ValidatorRewardAllocationRaw {

package/src/actions/validators/getValidatorRewardAllocatorAddress.ts

@@ -1,6 +1,7 @@
 import { type Address, type PublicClient, zeroAddress } from "viem";
 
-import { beraChefAbi } from "~/abi/pol/beraChef";
+import { beraChefAbi } from "@berachain/abis/pol/rewards/beraChef";
+
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 
 export type ValidatorRewardAllocatorAddress = Address;

package/src/actions/validators/utils/__tests__/validatorUtils.integration.test.ts

@@ -22,15 +22,14 @@ describe("getValidatorBoostApy", async () => {
     throw new Error("BGT price not found");
   }
 
-  it.each(valRes?.validators.validators ?? [])(
-    "should return the correct boost apy for $pubkey",
-    (validator) => {
-      const returnPerBgt = getValidatorReturnPerBgt(validator);
-      expect(returnPerBgt).toBeDefined();
-      expect(returnPerBgt).not.toBeNaN();
-      const boostApy = getValidatorBoostApy({ validator, bgtPrice });
-      expect(boostApy).toBeDefined();
-      expect(boostApy).not.toBeNaN();
-    },
-  );
+  it.each(
+    valRes?.validators.validators ?? [],
+  )("should return the correct boost apy for $pubkey", (validator) => {
+    const returnPerBgt = getValidatorReturnPerBgt(validator);
+    expect(returnPerBgt).toBeDefined();
+    expect(returnPerBgt).not.toBeNaN();
+    const boostApy = getValidatorBoostApy({ validator, bgtPrice });
+    expect(boostApy).toBeDefined();
+    expect(boostApy).not.toBeNaN();
+  });
 });