@berachain/berajs 0.2.4 → 0.2.6-patch.1

package/package.json

@@ -1,37 +1,50 @@
 {
   "name": "@berachain/berajs",
-  "version": "0.2.4",
+  "version": "0.2.6-patch.1",
   "sideEffects": false,
   "files": [
     "dist",
-    "src",
-    ".claude/skills"
+    "src"
   ],
   "author": "Berachain",
   "license": "MIT",
   "type": "module",
+  "scripts": {
+    "build": "tsup",
+    "prebuild": "pnpm contracts:update",
+    "prepublishOnly": "pnpm build -- --prepublish --sourcemap",
+    "test": "vitest",
+    "clean": "git clean -xdf dist .turbo node_modules",
+    "check-types": "tsup --dtsOnly",
+    "precheck-types": "pnpm prebuild",
+    "dev": "tsup --watch",
+    "lint": "biome lint",
+    "lint:fix": "pnpm lint --fix",
+    "errors:update": "node .scripts/updateUnkownSignatures.js && biome format src/abi/utils --write",
+    "contracts:update": "node .scripts/getContractNames.js && biome format src/data/contracts.ts --write"
+  },
   "dependencies": {
     "@apollo/client": "4.1.6",
     "@berachain-foundation/berancer-sdk": "1.1.3",
     "@berachain/abis": "0.1.0",
-    "@berachain/graphql": "0.4.4",
+    "@berachain/config": "0.1.0",
+    "@berachain/graphql": "0.4.8",
     "@ensofinance/sdk": "2.0.12",
     "@pythnetwork/hermes-client": "2.0.0",
     "@wagmi/core": "2.22.1",
     "gray-matter": "4.0.3",
-    "swr": "2.4.1",
-    "@berachain/config": "0.1.0"
+    "swr": "2.4.1"
   },
   "devDependencies": {
+    "@berachain/utils": "0.1.0",
+    "@berachain/wagmi": "0.4.0",
     "@types/react-dom": "19.1.6",
     "@types/react": "19.1.8",
     "@typescript/analyze-trace": "0.10.1",
     "tsup": "8.4.0",
     "typescript": "5.5.4",
     "viem": "2.45.0",
-    "vitest": "3.2.4",
-    "@berachain/utils": "0.1.0",
-    "@berachain/wagmi": "0.4.0"
+    "vitest": "3.2.4"
   },
   "exports": {
     "./*": {
@@ -49,22 +62,9 @@
     }
   },
   "peerDependencies": {
+    "@berachain/wagmi": "^0.4.0",
     "react": "^19.1",
     "react-dom": "^19.1",
-    "viem": "^2.41.2",
-    "@berachain/wagmi": "0.4.0"
-  },
-  "scripts": {
-    "build": "tsup",
-    "prebuild": "pnpm contracts:update",
-    "test": "vitest",
-    "clean": "git clean -xdf dist .turbo node_modules",
-    "check-types": "tsup --dtsOnly",
-    "precheck-types": "pnpm prebuild",
-    "dev": "tsup --watch",
-    "lint": "biome lint",
-    "lint:fix": "pnpm lint --fix",
-    "errors:update": "node .scripts/updateUnkownSignatures.js && biome format src/abi/utils --write",
-    "contracts:update": "node .scripts/getContractNames.js && biome format src/data/contracts.ts --write"
+    "viem": "^2.41.2"
   }
-}
+}

package/src/abi/enso/ensoWalletV2Factory.ts

@@ -0,0 +1,9 @@
+export const ensoWalletV2FactoryAbi = [
+  {
+    inputs: [{ internalType: "address", name: "user", type: "address" }],
+    name: "getAddress",
+    outputs: [{ internalType: "address", name: "", type: "address" }],
+    stateMutability: "view",
+    type: "function",
+  },
+] as const;

package/src/abi/exports.ts

@@ -3,6 +3,7 @@ export * from "./bend/generalAdapter";
 export * from "./bend/morphoVault";
 export * from "./bend/publicAllocator";
 export * from "./enso/ensoRouterAbi";
+export * from "./enso/ensoWalletV2Factory";
 export * from "./pyth/pyth";
 export * from "./pyth/pythErrors";
 export * from "./utils/EIP7702StatelessDelegator";

package/src/actions/clients/BeraApolloClient.ts

@@ -8,9 +8,9 @@ import {
 
 import { appConfig } from "@berachain/config/internal";
 
-import { BeraError } from "~/errors/BeraError";
-import { BeraTracing } from "~/errors/BeraTracing";
-import { RequestError } from "~/errors/RequestError";
+import { BeraError } from "../../errors/BeraError";
+import { BeraTracing } from "../../errors/BeraTracing";
+import { RequestError } from "../../errors/RequestError";
 
 /**
  * This is a wrapper around the ApolloClient that throws a BeraError if the query returns an error or no data.

package/src/actions/clients/getApolloClient.ts

@@ -7,8 +7,8 @@ import { currentDapp } from "@berachain/config/internal";
 
 import apiResults from "@berachain/graphql/dex/api";
 
-import { BeraError } from "~/errors/BeraError";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { BeraError } from "../../errors/BeraError";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
 import { BeraApolloClient } from "./BeraApolloClient";
 
 /**
@@ -66,8 +66,8 @@ function getClient(
 type GraphqlClient =
   | "honey.subgraph"
   | "pol.subgraph"
+  | "pol.fees"
   | "governance.subgraph"
-  | "blocks.subgraph"
   | "bex.subgraph"
   | "api"
   | "bend.whisk";
@@ -99,10 +99,10 @@ export function getApolloClient(
       return getClient(config.honey.subgraph);
     case "pol.subgraph":
       return getClient(config.pol.subgraph);
+    case "pol.fees":
+      return getClient(config.pol.feesSubgraph);
     case "governance.subgraph":
       return getClient(config.governance.subgraph);
-    case "blocks.subgraph":
-      return getClient(config.blocksSubgraph);
     case "bex.subgraph":
       return getClient(config.bex.subgraph);
   }

package/src/actions/clients/getEnsoClient.ts

@@ -2,7 +2,7 @@ import { EnsoClient } from "@ensofinance/sdk";
 
 import { appConfig } from "@berachain/config/internal";
 
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
 
 const isProduction =
   process.env.NODE_ENV !== "development" && process.env.NODE_ENV !== "test";

package/src/actions/dex/__tests__/aggregators.unit.test.ts

@@ -2,9 +2,9 @@ import { beforeEach, describe, expect, test } from "vitest";
 
 import { ChainId } from "@berachain/config/internal";
 
-import { Aggregators } from "~/enum/dex";
-import { BeraError } from "~/errors/BeraError";
-import type { IAggregatorArgs, IRawAggregatorQuote } from "~/types/dex";
+import { Aggregators } from "../../../enum/dex";
+import { BeraError } from "../../../errors/BeraError";
+import type { IAggregatorArgs, IRawAggregatorQuote } from "../../../types/dex";
 import { BaseAggregator } from "../aggregators/base";
 
 // Test implementation of BaseAggregator to access protected methods

package/src/actions/dex/__tests__/getOnChainPool.unit.test.ts

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

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

@@ -4,14 +4,18 @@ import type { BeraConfig, ChainId } from "@berachain/config/internal";
 
 import BigNumber from "@berachain/utils/pkg/bignumber.js";
 
-import type { HoneyConfigContextReturn } from "~/contexts/HoneyConfigProvider";
-import type { Aggregators } from "~/enum/dex";
-import { BeraError } from "~/errors/BeraError";
-import { initBeraError } from "~/errors/initBeraError";
-import type { IAggregatorArgs, IRawAggregatorQuote, Token } from "~/types/dex";
-import { beraFetch } from "~/utils/beraFetch";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
-import { isToken } from "~/utils/tokens";
+import type { HoneyConfigContextReturn } from "../../../contexts/HoneyConfigProvider";
+import type { Aggregators } from "../../../enum/dex";
+import { BeraError } from "../../../errors/BeraError";
+import { initBeraError } from "../../../errors/initBeraError";
+import type {
+  IAggregatorArgs,
+  IRawAggregatorQuote,
+  Token,
+} from "../../../types/dex";
+import { beraFetch } from "../../../utils/beraFetch";
+import { parseBaseArgs } from "../../../utils/parseBaseArgs";
+import { isToken } from "../../../utils/tokens";
 
 export abstract class BaseAggregator {
   abstract name: Aggregators;

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

@@ -14,14 +14,14 @@ import { ChainId } from "@berachain/config/internal";
 
 import { vaultAbi as balancerVaultAbi } from "@berachain/abis/bex/vault";
 
-import { BalancerApi } from "~/actions/dex/b-sdk";
-import { Aggregators } from "~/enum/dex";
-import { assertPublicClient } from "~/errors/assert";
-import { BeraError } from "~/errors/BeraError";
-import { BeraMonitoring } from "~/errors/BeraMonitoring";
-import { RequestError } from "~/errors/RequestError";
-import type { IAggregatorArgs, IRawAggregatorQuote } from "~/types/dex";
-import { isToken } from "~/utils/tokens";
+import { Aggregators } from "../../../enum/dex";
+import { assertPublicClient } from "../../../errors/assert";
+import { BeraError } from "../../../errors/BeraError";
+import { BeraMonitoring } from "../../../errors/BeraMonitoring";
+import { RequestError } from "../../../errors/RequestError";
+import type { IAggregatorArgs, IRawAggregatorQuote } from "../../../types/dex";
+import { isToken } from "../../../utils/tokens";
+import { BalancerApi } from "../b-sdk";
 import { BaseAggregator } from "./base";
 
 // Constants

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

@@ -1,13 +1,13 @@
 import { ChainId } from "@berachain/config/internal";
 
-import { Aggregators } from "~/enum/dex";
-import { InvalidArgumentError } from "~/errors/InvalidArgumentError";
+import { Aggregators } from "../../../enum/dex";
+import { InvalidArgumentError } from "../../../errors/InvalidArgumentError";
 import type {
   IAggregatorArgs,
   IRawAggregatorQuote,
   MinimalERC20,
-} from "~/types/dex";
-import { beraToken, isToken } from "~/utils/tokens";
+} from "../../../types/dex";
+import { beraToken, isToken } from "../../../utils/tokens";
 import { BaseAggregator } from "./base";
 
 class RedeemBgtAggregator extends BaseAggregator {

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

@@ -2,10 +2,14 @@ import { zeroAddress } from "viem";
 
 import { ChainId } from "@berachain/config/internal";
 
-import { metaAggregatorAbi as aggregatorsRouterAbi } from "@berachain/abis/meta-aggregator/metaAggregator";
-
-import { Aggregators } from "~/enum/dex";
-import type { IAggregatorArgs, IRawAggregatorQuote } from "~/types/dex";
+import aggregatorsRouterAbi from "@berachain/abis/meta-aggregator/metaAggregatorV2";
+
+import { Aggregators } from "../../../../enum/dex";
+import type {
+  IAggregatorArgs,
+  IRawAggregatorQuote,
+} from "../../../../types/dex";
+import type { IContractWrite } from "../../../../types/global";
 import { BaseAggregator } from "../base";
 
 class EnsoAggregator extends BaseAggregator {
@@ -95,22 +99,26 @@ class EnsoAggregator extends BaseAggregator {
       }),
       name: this.name,
       swapFeeBps: aggregatorsFeeBps!,
-      getCalldata: () => ({
-        params: [
-          inputData,
-          outputData,
-          aggregatorData,
-          {
-            rewardVault: rewardVault ?? zeroAddress,
-            isSwapAndStake: !!rewardVault,
-          },
-        ],
-        functionName: "swap",
-        abi: aggregatorsRouterAbi,
-        // send full amount to router first, which will deduct the swap fee before executing trade
-        value: isTokenInNative ? BigInt(amount) : BigInt("0"),
-        address: this.config.bex.aggregatorsRouter,
-      }),
+      getCalldata: () =>
+        ({
+          params: [
+            inputData,
+            outputData,
+            aggregatorData,
+            {
+              rewardVault: rewardVault ?? zeroAddress,
+              isSwapAndStake: !!rewardVault,
+            },
+          ],
+          functionName: "swap",
+          abi: aggregatorsRouterAbi,
+          // send full amount to router first, which will deduct the swap fee before executing trade
+          value: isTokenInNative ? BigInt(amount) : BigInt("0"),
+          address: this.config.bex.aggregatorsRouter,
+        }) satisfies Omit<
+          IContractWrite<typeof aggregatorsRouterAbi, "swap">,
+          "message" | "actionType"
+        >,
     };
   }
 }

package/src/actions/dex/aggregators/enso/ensoErc4626.debug.test.ts

@@ -3,7 +3,7 @@ import { describe, expect, it } from "vitest";
 
 import { mainnet } from "@berachain/config/mainnet";
 
-import { beraToken, getHoneyToken } from "~/utils/tokens";
+import { beraToken, getHoneyToken } from "../../../../utils/tokens";
 import { ensoErc4626 } from "./ensoErc4626";
 
 describe("ensoErc4626", () => {

package/src/actions/dex/aggregators/enso/ensoErc4626.ts

@@ -1,10 +1,13 @@
 import type { BundleAction } from "@ensofinance/sdk";
 import { type Address, ethAddress, type Hex, zeroAddress } from "viem";
 
-import { getEnsoClient } from "~/actions/clients/getEnsoClient";
-import { Aggregators } from "~/enum/dex";
-import { assertAddress } from "~/errors/assert";
-import type { IAggregatorArgs, IRawAggregatorQuote } from "~/types/dex";
+import { Aggregators } from "../../../../enum/dex";
+import { assertAddress } from "../../../../errors/assert";
+import type {
+  IAggregatorArgs,
+  IRawAggregatorQuote,
+} from "../../../../types/dex";
+import { getEnsoClient } from "../../../clients/getEnsoClient";
 import { BaseAggregator } from "../base";
 
 class EnsoErc4626Aggregator extends BaseAggregator {

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

@@ -2,12 +2,16 @@ import { erc4626Abi, formatUnits } from "viem";
 
 import { wberaStakerVaultAbi as stakeBeraVaultAbi } from "@berachain/abis/pol/wberaStakerVault";
 
-import { ContractName } from "~/enum/contracts";
-import { Aggregators } from "~/enum/dex";
-import { assertDefined, assertPublicClient } from "~/errors/assert";
-import type { IAggregatorArgs, IRawAggregatorQuote, Token } from "~/types/dex";
-import type { IContractWrite } from "~/types/global";
-import { isToken } from "~/utils/tokens";
+import { ContractName } from "../../../enum/contracts";
+import { Aggregators } from "../../../enum/dex";
+import { assertDefined, assertPublicClient } from "../../../errors/assert";
+import type {
+  IAggregatorArgs,
+  IRawAggregatorQuote,
+  Token,
+} from "../../../types/dex";
+import type { IContractWrite } from "../../../types/global";
+import { isToken } from "../../../utils/tokens";
 import { BaseAggregator } from "./base";
 
 /**

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

@@ -2,11 +2,12 @@ import { type Address, type Hex, zeroAddress } from "viem";
 
 import { ChainId } from "@berachain/config/internal";
 
-import { metaAggregatorAbi as aggregatorsRouterAbi } from "@berachain/abis/meta-aggregator/metaAggregator";
+import aggregatorsRouterAbi from "@berachain/abis/meta-aggregator/metaAggregatorV2";
 
-import { Aggregators } from "~/enum/dex";
-import type { IAggregatorArgs, IRawAggregatorQuote } from "~/types/dex";
-import { isToken } from "~/utils/tokens";
+import { Aggregators } from "../../../enum/dex";
+import type { IAggregatorArgs, IRawAggregatorQuote } from "../../../types/dex";
+import type { IContractWrite } from "../../../types/global";
+import { isToken } from "../../../utils/tokens";
 import { BaseAggregator } from "./base";
 
 const BASE_URL = "https://api.fly.trade/aggregator";
@@ -134,7 +135,10 @@ class FlyAggregator extends BaseAggregator {
           // send full amount to router first, which will deduct the swap fee before executing trade
           value: isToken(tokenIn, "BERA") ? BigInt(amount) : BigInt("0"),
           address: this.config.bex.aggregatorsRouter,
-        };
+        } satisfies Omit<
+          IContractWrite<typeof aggregatorsRouterAbi, "swap">,
+          "message" | "actionType"
+        >;
       },
     };
   }

package/src/actions/dex/aggregators/haiku.integration.test.ts

@@ -2,9 +2,9 @@ import { describe, expect, it } from "vitest";
 
 import { ChainId, defaultChainId } from "@berachain/config/internal";
 
-import { assertAddress } from "~/errors/assert";
-import { getServerSidePublicClient } from "~/utils/getServerSideClient";
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
+import { assertAddress } from "../../../errors/assert";
+import { getServerSidePublicClient } from "../../../utils/getServerSideClient";
+import { parseBaseArgs } from "../../../utils/parseBaseArgs";
 
 describe.runIf(defaultChainId === ChainId.MAINNET)("haiku", () => {
   const { config } = parseBaseArgs({ chainId: defaultChainId });

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

@@ -2,11 +2,12 @@ import { formatUnits, parseUnits, zeroAddress } from "viem";
 
 import { ChainId } from "@berachain/config/internal";
 
-import { metaAggregatorAbi as aggregatorsRouterAbi } from "@berachain/abis/meta-aggregator/metaAggregator";
+import aggregatorsRouterAbi from "@berachain/abis/meta-aggregator/metaAggregatorV2";
 
-import { Aggregators, SwapReferrer } from "~/enum/dex";
-import { BeraError } from "~/errors/BeraError";
-import type { IAggregatorArgs, IRawAggregatorQuote } from "~/types/dex";
+import { Aggregators, SwapReferrer } from "../../../enum/dex";
+import { BeraError } from "../../../errors/BeraError";
+import type { IAggregatorArgs, IRawAggregatorQuote } from "../../../types/dex";
+import type { IContractWrite } from "../../../types/global";
 import { BaseAggregator } from "./base";
 
 class HaikuAggregator extends BaseAggregator {
@@ -161,7 +162,10 @@ class HaikuAggregator extends BaseAggregator {
           // send full amount to router first, which will deduct the swap fee before executing trade
           value: isTokenInNative ? BigInt(amount) : BigInt("0"),
           address: this.config.bex.aggregatorsRouter,
-        };
+        } satisfies Omit<
+          IContractWrite<typeof aggregatorsRouterAbi, "swap">,
+          "message" | "actionType"
+        >;
       },
     };
   }

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

@@ -4,26 +4,26 @@ import { ChainId } from "@berachain/config/internal";
 
 import BigNumber from "@berachain/utils/pkg/bignumber.js";
 
-import {
-  getHoneyPreview,
-  type HoneyPreviewArgs,
-  HoneyPreviewMethod,
-} from "~/actions/honey/getHoneyPreview";
-import { getHoneyVaultsBalance } from "~/actions/honey/getHoneyVaultsBalance";
-import { getSwapPayload } from "~/actions/honey/getSwapPayload";
-import { isBasketModeEnabled } from "~/actions/honey/isBasketModeEnabled";
-import type { HoneyConfigContextReturn } from "~/contexts/HoneyConfigProvider";
-import { Aggregators } from "~/enum/dex";
-import { assertPublicClient } from "~/errors/assert";
-import { BeraError } from "~/errors/BeraError";
-import { InvalidArgumentError } from "~/errors/InvalidArgumentError";
+import type { HoneyConfigContextReturn } from "../../../contexts/HoneyConfigProvider";
+import { Aggregators } from "../../../enum/dex";
+import { assertPublicClient } from "../../../errors/assert";
+import { BeraError } from "../../../errors/BeraError";
+import { InvalidArgumentError } from "../../../errors/InvalidArgumentError";
 import type {
   IAggregatorArgs,
   IRawAggregatorQuote,
   Token,
   TokenWithMetadata,
-} from "~/types/dex";
-import { getHoneyToken, isToken } from "~/utils/tokens";
+} from "../../../types/dex";
+import { getHoneyToken, isToken } from "../../../utils/tokens";
+import {
+  getHoneyPreview,
+  type HoneyPreviewArgs,
+  HoneyPreviewMethod,
+} from "../../honey/getHoneyPreview";
+import { getHoneyVaultsBalance } from "../../honey/getHoneyVaultsBalance";
+import { getSwapPayload } from "../../honey/getSwapPayload";
+import { isBasketModeEnabled } from "../../honey/isBasketModeEnabled";
 import { BaseAggregator } from "./base";
 
 interface IHoneyNativeArgs

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

@@ -2,10 +2,11 @@ import { zeroAddress } from "viem";
 
 import { ChainId } from "@berachain/config/internal";
 
-import { metaAggregatorAbi as aggregatorsRouterAbi } from "@berachain/abis/meta-aggregator/metaAggregator";
+import aggregatorsRouterAbi from "@berachain/abis/meta-aggregator/metaAggregatorV2";
 
-import { Aggregators } from "~/enum/dex";
-import type { IAggregatorArgs, IRawAggregatorQuote } from "~/types/dex";
+import { Aggregators } from "../../../enum/dex";
+import type { IAggregatorArgs, IRawAggregatorQuote } from "../../../types/dex";
+import type { IContractWrite } from "../../../types/global";
 import { BaseAggregator } from "./base";
 
 class KyberSwapAggregator extends BaseAggregator {
@@ -135,7 +136,10 @@ class KyberSwapAggregator extends BaseAggregator {
           // send full amount to router first, which will deduct the swap fee before executing trade
           value: isTokenInNative ? BigInt(amount) : BigInt("0"),
           address: this.config.bex.aggregatorsRouter,
-        };
+        } satisfies Omit<
+          IContractWrite<typeof aggregatorsRouterAbi, "swap">,
+          "message" | "actionType"
+        >;
       },
     };
   }

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

@@ -2,10 +2,11 @@ import { zeroAddress } from "viem";
 
 import { ChainId } from "@berachain/config/internal";
 
-import { metaAggregatorAbi as aggregatorsRouterAbi } from "@berachain/abis/meta-aggregator/metaAggregator";
+import aggregatorsRouterAbi from "@berachain/abis/meta-aggregator/metaAggregatorV2";
 
-import { Aggregators } from "~/enum/dex";
-import type { IAggregatorArgs, IRawAggregatorQuote } from "~/types/dex";
+import { Aggregators } from "../../../enum/dex";
+import type { IAggregatorArgs, IRawAggregatorQuote } from "../../../types/dex";
+import type { IContractWrite } from "../../../types/global";
 import { BaseAggregator } from "./base";
 
 class OogaboogaAggregator extends BaseAggregator {
@@ -103,7 +104,10 @@ class OogaboogaAggregator extends BaseAggregator {
           // send full amount to router first, which will deduct the swap fee before executing trade
           value: isTokenInNative ? BigInt(amount) : BigInt("0"),
           address: this.config.bex.aggregatorsRouter,
-        };
+        } satisfies Omit<
+          IContractWrite<typeof aggregatorsRouterAbi, "swap">,
+          "message" | "actionType"
+        >;
       },
     };
   }

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

@@ -2,13 +2,14 @@ import { zeroAddress } from "viem";
 
 import { ChainId } from "@berachain/config/internal";
 
-import { metaAggregatorAbi as aggregatorsRouterAbi } from "@berachain/abis/meta-aggregator/metaAggregator";
-
-import { Aggregators } from "~/enum/dex";
-import { assertPublicClient } from "~/errors/assert";
-import { InvalidArgumentError } from "~/errors/InvalidArgumentError";
-import { RequestError } from "~/errors/RequestError";
-import type { IAggregatorArgs, IRawAggregatorQuote } from "~/types/dex";
+import aggregatorsRouterAbi from "@berachain/abis/meta-aggregator/metaAggregatorV2";
+
+import { Aggregators } from "../../../enum/dex";
+import { assertPublicClient } from "../../../errors/assert";
+import { InvalidArgumentError } from "../../../errors/InvalidArgumentError";
+import { RequestError } from "../../../errors/RequestError";
+import type { IAggregatorArgs, IRawAggregatorQuote } from "../../../types/dex";
+import type { IContractWrite } from "../../../types/global";
 import { BaseAggregator } from "./base";
 
 class OpenOceanAggregator extends BaseAggregator {
@@ -139,7 +140,10 @@ class OpenOceanAggregator extends BaseAggregator {
           // send full amount to router first, which will deduct the swap fee before executing trade
           value: isTokenInNative ? BigInt(amount) : BigInt("0"),
           address: this.config.bex.aggregatorsRouter,
-        };
+        } satisfies Omit<
+          IContractWrite<typeof aggregatorsRouterAbi, "swap">,
+          "message" | "actionType"
+        >;
       },
     };
   }

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

@@ -2,10 +2,14 @@ import { ChainId } from "@berachain/config/internal";
 
 import { wberaAbi } from "@berachain/abis/wbera";
 
-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 { 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";
 
 class WBeraAggregator extends BaseAggregator {

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

@@ -15,8 +15,8 @@ import { berachain, berachainBepolia } from "viem/chains";
 
 import { type ChainId, chainConfigs } from "@berachain/config/internal";
 
-import { parseBaseArgs } from "~/utils/parseBaseArgs";
-import { beraToken } from "~/utils/tokens";
+import { parseBaseArgs } from "../../utils/parseBaseArgs";
+import { beraToken } from "../../utils/tokens";
 
 for (const chain of Object.keys(chainConfigs)) {
   const { config, chainId } = parseBaseArgs({

package/src/actions/dex/getAllPools.ts

@@ -11,8 +11,8 @@ import {
   GqlPoolOrderDirection,
 } 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 getAllPools({
   textSearch,