@swapkit/toolboxes 1.0.0-beta.3 → 1.0.0-beta.30

package/src/evm/toolbox/baseEVMToolbox.ts

@@ -8,6 +8,7 @@ import {
   FeeOption,
   SwapKitError,
   SwapKitNumber,
+  applyFeeMultiplierToBigInt,
   isGasAsset,
 } from "@swapkit/helpers";
 import { erc20ABI } from "@swapkit/helpers/contracts";
@@ -208,7 +209,7 @@ export function getEstimateGasPrices({
       try {
         const { gasPrice } = await provider.getFeeData();
 
-        if (!gasPrice) throw new Error("No fee data available");
+        if (!gasPrice) throw new SwapKitError("toolbox_evm_no_fee_data");
 
         return {
           [FeeOption.Average]: { gasPrice },
@@ -216,9 +217,9 @@ export function getEstimateGasPrices({
           [FeeOption.Fastest]: { gasPrice },
         };
       } catch (error) {
-        throw new Error(
-          `Failed to estimate gas price: ${(error as any).msg ?? (error as any).toString()}`,
-        );
+        throw new SwapKitError("toolbox_evm_gas_estimation_error", {
+          error: (error as any).msg ?? (error as any).toString(),
+        });
       }
     };
   }
@@ -231,7 +232,7 @@ export function getEstimateGasPrices({
         const price = gasPrice as bigint;
 
         if (!(maxFeePerGas && maxPriorityFeePerGas)) {
-          throw new Error("No fee data available");
+          throw new SwapKitError("toolbox_evm_no_fee_data");
         }
 
         return {
@@ -242,22 +243,25 @@ export function getEstimateGasPrices({
             maxPriorityFeePerGas,
           },
           [FeeOption.Fast]: {
-            l1GasPrice: ((l1GasPrice || 0n) * 15n) / 10n,
-            gasPrice: (price * 15n) / 10n,
+            l1GasPrice: applyFeeMultiplierToBigInt(l1GasPrice || 0n, FeeOption.Fast),
+            gasPrice: applyFeeMultiplierToBigInt(price, FeeOption.Fast),
             maxFeePerGas,
-            maxPriorityFeePerGas: (maxPriorityFeePerGas * 15n) / 10n,
+            maxPriorityFeePerGas: applyFeeMultiplierToBigInt(maxPriorityFeePerGas, FeeOption.Fast),
           },
           [FeeOption.Fastest]: {
-            l1GasPrice: (l1GasPrice || 0n) * 2n,
-            gasPrice: price * 2n,
+            l1GasPrice: applyFeeMultiplierToBigInt(l1GasPrice || 0n, FeeOption.Fastest),
+            gasPrice: applyFeeMultiplierToBigInt(price, FeeOption.Fastest),
             maxFeePerGas,
-            maxPriorityFeePerGas: maxPriorityFeePerGas * 2n,
+            maxPriorityFeePerGas: applyFeeMultiplierToBigInt(
+              maxPriorityFeePerGas,
+              FeeOption.Fastest,
+            ),
           },
         };
       } catch (error) {
-        throw new Error(
-          `Failed to estimate gas price: ${(error as any).msg ?? (error as any).toString()}`,
-        );
+        throw new SwapKitError("toolbox_evm_gas_estimation_error", {
+          error: (error as any).msg ?? (error as any).toString(),
+        });
       }
     };
   }
@@ -273,12 +277,15 @@ export function getEstimateGasPrices({
         return {
           [FeeOption.Average]: { maxFeePerGas, maxPriorityFeePerGas },
           [FeeOption.Fast]: {
-            maxFeePerGas: (maxFeePerGas * 15n) / 10n,
-            maxPriorityFeePerGas: (maxPriorityFeePerGas * 15n) / 10n,
+            maxFeePerGas: applyFeeMultiplierToBigInt(maxFeePerGas, FeeOption.Fast),
+            maxPriorityFeePerGas: applyFeeMultiplierToBigInt(maxPriorityFeePerGas, FeeOption.Fast),
           },
           [FeeOption.Fastest]: {
-            maxFeePerGas: maxFeePerGas * 2n,
-            maxPriorityFeePerGas: maxPriorityFeePerGas * 2n,
+            maxFeePerGas: applyFeeMultiplierToBigInt(maxFeePerGas, FeeOption.Fastest),
+            maxPriorityFeePerGas: applyFeeMultiplierToBigInt(
+              maxPriorityFeePerGas,
+              FeeOption.Fastest,
+            ),
           },
         };
       }
@@ -286,13 +293,13 @@ export function getEstimateGasPrices({
 
       return {
         [FeeOption.Average]: { gasPrice },
-        [FeeOption.Fast]: { gasPrice: (gasPrice * 15n) / 10n },
-        [FeeOption.Fastest]: { gasPrice: gasPrice * 2n },
+        [FeeOption.Fast]: { gasPrice: applyFeeMultiplierToBigInt(gasPrice, FeeOption.Fast) },
+        [FeeOption.Fastest]: { gasPrice: applyFeeMultiplierToBigInt(gasPrice, FeeOption.Fastest) },
       };
     } catch (error) {
-      throw new Error(
-        `Failed to estimate gas price: ${(error as any).msg ?? (error as any).toString()}`,
-      );
+      throw new SwapKitError("toolbox_evm_gas_estimation_error", {
+        error: (error as any).msg ?? (error as any).toString(),
+      });
     }
   };
 }
@@ -314,7 +321,10 @@ function getCall({ provider, isEIP1559Compatible, signer, chain }: ToolboxWrapPa
     feeOption = FeeOption.Fast,
   }: CallParams): Promise<T> {
     const contractProvider = callProvider || provider;
-    if (!contractAddress) throw new Error("contractAddress must be provided");
+    if (!contractAddress)
+      throw new SwapKitError("toolbox_evm_invalid_params", {
+        error: "contractAddress must be provided",
+      });
 
     const isStateChanging = isStateChangingCall({ abi, funcName });
 
@@ -538,6 +548,7 @@ function getEstimateGasLimit({ provider, signer }: ToolboxWrapParams) {
     assetValue,
     recipient,
     memo,
+    data,
     sender,
     funcName,
     funcParams,
@@ -547,6 +558,7 @@ function getEstimateGasLimit({ provider, signer }: ToolboxWrapParams) {
     funcName?: string;
     funcParams?: unknown[];
     txOverrides?: EVMTxParams;
+    data?: string;
   }) {
     // const value = assetValue.getBaseValue("bigint");
     const value = assetValue.bigIntValue;
@@ -573,7 +585,7 @@ function getEstimateGasLimit({ provider, signer }: ToolboxWrapParams) {
       from: sender,
       to: recipient,
       value,
-      data: memo ? hexlify(toUtf8Bytes(memo)) : undefined,
+      data: data ? data : memo ? hexlify(toUtf8Bytes(memo)) : undefined,
     });
   };
 }

package/src/evm/toolbox/index.ts

@@ -1,4 +1,4 @@
-import { Chain, type EVMChain } from "@swapkit/helpers";
+import { Chain, type EVMChain, SwapKitError } from "@swapkit/helpers";
 
 import { getProvider } from "../helpers";
 import type { EVMToolboxParams } from "../types";
@@ -27,7 +27,7 @@ export async function getEvmToolbox<T extends EVMChain>(chain: T, params?: EVMTo
     case Chain.Ethereum:
       return ETHToolbox(toolboxParams);
     default:
-      throw new Error(`Chain ${chain} is not supported`);
+      throw new SwapKitError("toolbox_evm_not_supported", { chain });
   }
 }
 

package/src/evm/toolbox/op.ts

@@ -1,5 +1,18 @@
-import { BaseDecimal, Chain, ChainId, ChainToExplorerUrl, SKConfig } from "@swapkit/helpers";
-import type { BrowserProvider, JsonRpcProvider, Provider, TransactionRequest } from "ethers";
+import {
+  BaseDecimal,
+  Chain,
+  ChainId,
+  ChainToExplorerUrl,
+  SKConfig,
+  SwapKitError,
+} from "@swapkit/helpers";
+import type {
+  Authorization,
+  BrowserProvider,
+  JsonRpcProvider,
+  Provider,
+  TransactionRequest,
+} from "ethers";
 import { Contract, HDNodeWallet } from "ethers";
 
 import { P } from "ts-pattern";
@@ -32,14 +45,15 @@ function serializeTx<P extends JsonRpcProvider | BrowserProvider>(provider: P) {
   return async function serializeTx({ from, to, nonce, ...tx }: TransactionRequest) {
     const { Transaction } = await import("ethers");
 
-    if (!to) throw new Error("Missing to address");
-    const txParams = {
+    if (!to)
+      throw new SwapKitError("toolbox_evm_invalid_transaction", { error: "Missing to address" });
+
+    return Transaction.from({
       ...tx,
+      authorizationList: tx.authorizationList as Authorization[],
       to: to as string,
       nonce: nonce ? nonce : from ? await provider.getTransactionCount(from) : 0,
-    };
-
-    return Transaction.from(txParams).serialized;
+    }).serialized;
   };
 }
 

package/src/index.ts

@@ -6,15 +6,18 @@ import {
   FeeOption,
   type GenericCreateTransactionParams,
   type SubstrateChain,
+  SwapKitError,
   type UTXOChain,
 } from "@swapkit/helpers";
 import type { getCosmosToolbox } from "@swapkit/toolboxes/cosmos";
 
 import type { ETHToolbox, EVMCreateTransactionParams, getEvmToolbox } from "@swapkit/toolboxes/evm";
+import type { getNearToolbox } from "@swapkit/toolboxes/near";
 import type { RadixToolbox } from "@swapkit/toolboxes/radix";
 import type { getRippleToolbox } from "@swapkit/toolboxes/ripple";
 import type { SolanaCreateTransactionParams, getSolanaToolbox } from "@swapkit/toolboxes/solana";
 import type { getSubstrateToolbox } from "@swapkit/toolboxes/substrate";
+import type { createTronToolbox } from "@swapkit/toolboxes/tron";
 import type { getUtxoToolbox } from "@swapkit/toolboxes/utxo";
 
 export async function getAddressValidator() {
@@ -24,11 +27,14 @@ export async function getAddressValidator() {
   const { substrateValidateAddress } = await import("@swapkit/toolboxes/substrate");
   const { getUTXOAddressValidator } = await import("@swapkit/toolboxes/utxo");
   const { getSolanaAddressValidator } = await import("@swapkit/toolboxes/solana");
+  const { validateNearAddress } = await import("@swapkit/toolboxes/near");
   const { rippleValidateAddress } = await import("@swapkit/toolboxes/ripple");
   const { radixValidateAddress } = await import("@swapkit/toolboxes/radix");
+  const { getTronAddressValidator } = await import("@swapkit/toolboxes/tron");
 
   const solanaValidateAddress = await getSolanaAddressValidator();
   const utxoValidateAddress = await getUTXOAddressValidator();
+  const tronValidateAddress = await getTronAddressValidator();
 
   return function validateAddress({ address, chain }: { address: string; chain: Chain }) {
     const isValid = match(chain)
@@ -52,68 +58,62 @@ export async function getAddressValidator() {
         substrateValidateAddress({ address, chain: chain as SubstrateChain }),
       )
       .with(Chain.Radix, () => radixValidateAddress(address))
+      .with(Chain.Near, () => validateNearAddress(address))
       .with(Chain.Ripple, () => rippleValidateAddress(address))
       .with(Chain.Solana, () => solanaValidateAddress(address))
+      .with(Chain.Tron, () => tronValidateAddress(address))
       .otherwise(() => false);
 
     return isValid;
   };
 }
 
-export async function getFeeEstimator<T extends keyof CreateTransactionParams>(chain: T) {
-  const toolbox = await getToolbox(chain);
-
+export function getFeeEstimator<T extends keyof CreateTransactionParams>(chain: T) {
   return async function estimateFee(params: CreateTransactionParams[T]) {
-    switch (chain) {
-      case Chain.Arbitrum:
-      case Chain.Avalanche:
-      case Chain.Optimism:
-      case Chain.BinanceSmartChain:
-      case Chain.Base:
-      case Chain.Polygon:
-      case Chain.Ethereum: {
-        const txObject = await (
-          toolbox as Awaited<ReturnType<typeof ETHToolbox>>
-        ).createTransaction(params as EVMCreateTransactionParams);
-        return (toolbox as Awaited<ReturnType<typeof ETHToolbox>>).estimateTransactionFee({
-          ...txObject,
-          feeOption: params.feeOptionKey || FeeOption.Fast,
-          chain,
-        });
-      }
-      case Chain.Bitcoin:
-      case Chain.BitcoinCash:
-      case Chain.Dogecoin:
-      case Chain.Dash:
-      case Chain.Litecoin: {
-        return (toolbox as Awaited<ReturnType<typeof getUtxoToolbox>>).estimateTransactionFee(
-          params as CreateTransactionParams[Chain.Bitcoin],
-        );
-      }
+    const { match } = await import("ts-pattern");
 
-      case Chain.THORChain:
-      case Chain.Maya:
-      case Chain.Kujira:
-      case Chain.Cosmos: {
+    return match(chain as Chain)
+      .returnType<Promise<AssetValue>>()
+      .with(
+        Chain.Arbitrum,
+        Chain.Avalanche,
+        Chain.Optimism,
+        Chain.BinanceSmartChain,
+        Chain.Base,
+        Chain.Polygon,
+        Chain.Ethereum,
+        async (chain) => {
+          const toolbox = await getToolbox(chain);
+          const txObject = await toolbox.createTransaction(params);
+
+          return (toolbox as Awaited<ReturnType<typeof ETHToolbox>>).estimateTransactionFee({
+            ...txObject,
+            feeOption: params.feeOptionKey || FeeOption.Fast,
+            chain,
+          });
+        },
+      )
+      .with(
+        Chain.Bitcoin,
+        Chain.BitcoinCash,
+        Chain.Dogecoin,
+        Chain.Dash,
+        Chain.Litecoin,
+        Chain.Polkadot,
+        Chain.Solana,
+        Chain.Ripple,
+        Chain.Tron,
+        Chain.Near,
+        async (chain) => {
+          const toolbox = await getToolbox(chain);
+          return toolbox.estimateTransactionFee(params) as Promise<AssetValue>;
+        },
+      )
+      .with(Chain.THORChain, Chain.Maya, Chain.Kujira, Chain.Cosmos, async () => {
         const { estimateTransactionFee } = await import("@swapkit/toolboxes/cosmos");
         return estimateTransactionFee(params);
-      }
-
-      case Chain.Polkadot: {
-        return (
-          toolbox as Awaited<ReturnType<typeof getSubstrateToolbox<Chain.Polkadot>>>
-        ).estimateTransactionFee(params);
-      }
-
-      case Chain.Solana: {
-        return (toolbox as Awaited<ReturnType<typeof getSolanaToolbox>>).estimateTransactionFee(
-          params as CreateTransactionParams[Chain.Solana],
-        );
-      }
-
-      default:
-        return AssetValue.from({ chain });
-    }
+      })
+      .otherwise(async () => AssetValue.from({ chain }));
   };
 }
 
@@ -127,8 +127,10 @@ type Toolboxes = {
   [key in SubstrateChain]: Awaited<ReturnType<typeof getSubstrateToolbox>>;
 } & {
   [Chain.Radix]: Awaited<ReturnType<typeof RadixToolbox>>;
+  [Chain.Near]: Awaited<ReturnType<typeof getNearToolbox>>;
   [Chain.Ripple]: Awaited<ReturnType<typeof getRippleToolbox>>;
   [Chain.Solana]: Awaited<ReturnType<typeof getSolanaToolbox>>;
+  [Chain.Tron]: Awaited<ReturnType<typeof createTronToolbox>>;
 };
 
 type ToolboxParams = { [key in EVMChain]: Parameters<typeof getEvmToolbox>[1] } & {
@@ -139,8 +141,10 @@ type ToolboxParams = { [key in EVMChain]: Parameters<typeof getEvmToolbox>[1] }
   [key in SubstrateChain]: Parameters<typeof getSubstrateToolbox>[1];
 } & {
   [Chain.Radix]: Parameters<typeof RadixToolbox>[0];
+  [Chain.Near]: Parameters<typeof getNearToolbox>[0];
   [Chain.Ripple]: Parameters<typeof getRippleToolbox>[0];
   [Chain.Solana]: Parameters<typeof getSolanaToolbox>[0];
+  [Chain.Tron]: Parameters<typeof createTronToolbox>[0];
 };
 
 type CreateTransactionParams = { [key in EVMChain]: EVMCreateTransactionParams } & {
@@ -151,85 +155,99 @@ type CreateTransactionParams = { [key in EVMChain]: EVMCreateTransactionParams }
   [key in SubstrateChain]: GenericCreateTransactionParams;
 } & {
   [Chain.Radix]: GenericCreateTransactionParams;
+  [Chain.Ripple]: GenericCreateTransactionParams;
+  [Chain.Near]: GenericCreateTransactionParams;
   [Chain.Solana]: SolanaCreateTransactionParams;
+  [Chain.Tron]: GenericCreateTransactionParams;
 };
 
 export async function getToolbox<T extends keyof Toolboxes>(
   chain: T,
   params?: ToolboxParams[T],
 ): Promise<Toolboxes[T]> {
-  switch (chain) {
-    case Chain.Arbitrum:
-    case Chain.Avalanche:
-    case Chain.Optimism:
-    case Chain.BinanceSmartChain:
-    case Chain.Base:
-    case Chain.Polygon:
-    case Chain.Ethereum: {
-      const { getEvmToolbox } = await import("@swapkit/toolboxes/evm");
-      const evmToolbox = await getEvmToolbox(chain, params as Parameters<typeof getEvmToolbox>[1]);
-      return evmToolbox as Toolboxes[T];
-    }
-
-    case Chain.Litecoin:
-    case Chain.Dash:
-    case Chain.Dogecoin:
-    case Chain.BitcoinCash:
-    case Chain.Bitcoin: {
-      const { getUtxoToolbox } = await import("@swapkit/toolboxes/utxo");
-      const utxoToolbox = await getUtxoToolbox(
-        chain,
-        params as Parameters<typeof getUtxoToolbox>[1],
-      );
-      return utxoToolbox as Toolboxes[T];
-    }
+  const { match } = await import("ts-pattern");
 
-    case Chain.Cosmos:
-    case Chain.Kujira:
-    case Chain.Maya:
-    case Chain.THORChain: {
+  return match(chain as Chain)
+    .returnType<Promise<Toolboxes[T]>>()
+    .with(
+      Chain.Arbitrum,
+      Chain.Avalanche,
+      Chain.Optimism,
+      Chain.BinanceSmartChain,
+      Chain.Base,
+      Chain.Polygon,
+      Chain.Ethereum,
+      async () => {
+        const { getEvmToolbox } = await import("@swapkit/toolboxes/evm");
+        const evmToolbox = await getEvmToolbox(
+          chain as EVMChain,
+          params as Parameters<typeof getEvmToolbox>[1],
+        );
+        return evmToolbox as Toolboxes[T];
+      },
+    )
+    .with(
+      Chain.Litecoin,
+      Chain.Dash,
+      Chain.Dogecoin,
+      Chain.BitcoinCash,
+      Chain.Bitcoin,
+      Chain.Zcash,
+      async () => {
+        const { getUtxoToolbox } = await import("@swapkit/toolboxes/utxo");
+        const utxoToolbox = await getUtxoToolbox(
+          chain as UTXOChain,
+          params as Parameters<typeof getUtxoToolbox>[1],
+        );
+        return utxoToolbox as Toolboxes[T];
+      },
+    )
+    .with(Chain.Cosmos, Chain.Kujira, Chain.Maya, Chain.THORChain, async () => {
       const { getCosmosToolbox } = await import("@swapkit/toolboxes/cosmos");
       const cosmosToolbox = await getCosmosToolbox(
-        chain,
+        chain as CosmosChain,
         params as Parameters<typeof getCosmosToolbox>[1],
       );
-
       return cosmosToolbox as Toolboxes[T];
-    }
-
-    case Chain.Chainflip:
-    case Chain.Polkadot: {
+    })
+    .with(Chain.Chainflip, Chain.Polkadot, async () => {
       const { getSubstrateToolbox } = await import("@swapkit/toolboxes/substrate");
       const substrateToolbox = await getSubstrateToolbox(
-        chain,
+        chain as SubstrateChain,
         params as Parameters<typeof getSubstrateToolbox>[1],
       );
       return substrateToolbox as Toolboxes[T];
-    }
-
-    case Chain.Radix: {
+    })
+    .with(Chain.Radix, async () => {
       const { RadixToolbox } = await import("@swapkit/toolboxes/radix");
       const radixToolbox = await RadixToolbox(params as Parameters<typeof RadixToolbox>[0]);
       return radixToolbox as Toolboxes[T];
-    }
-
-    case Chain.Ripple: {
+    })
+    .with(Chain.Ripple, async () => {
       const { getRippleToolbox } = await import("@swapkit/toolboxes/ripple");
       const rippleToolbox = await getRippleToolbox(
         params as Parameters<typeof getRippleToolbox>[0],
       );
       return rippleToolbox as Toolboxes[T];
-    }
-
-    case Chain.Solana: {
+    })
+    .with(Chain.Solana, async () => {
       const { getSolanaToolbox } = await import("@swapkit/toolboxes/solana");
       const solanaToolbox = await getSolanaToolbox(
         params as Parameters<typeof getSolanaToolbox>[0],
       );
       return solanaToolbox as Toolboxes[T];
-    }
-
-    default:
-      throw new Error(`Chain ${chain} is not supported`);
-  }
+    })
+    .with(Chain.Tron, async () => {
+      const { createTronToolbox } = await import("@swapkit/toolboxes/tron");
+      const tronToolbox = await createTronToolbox(params);
+      return tronToolbox as Toolboxes[T];
+    })
+    .with(Chain.Near, async () => {
+      const { getNearToolbox } = await import("@swapkit/toolboxes/near");
+      const nearToolbox = await getNearToolbox(params as Parameters<typeof getNearToolbox>[0]);
+      return nearToolbox as Toolboxes[T];
+    })
+    .otherwise(() => {
+      throw new SwapKitError("toolbox_not_supported", { chain });
+    });
 }

package/src/near/__tests__/core.test.ts

@@ -0,0 +1,80 @@
+import { beforeAll, beforeEach, describe, expect, test } from "bun:test";
+import { AssetValue, Chain, SKConfig } from "@swapkit/helpers";
+import { providers } from "near-api-js";
+import { getFullAccessPublicKey } from "../helpers/core";
+import { getNearToolbox } from "../toolbox";
+
+const accountId = "ea03292d08136cca439513a33c76af083e5204eceb4ce720320fff84071a447f";
+
+const context: {
+  provider: providers.JsonRpcProvider;
+  toolbox: Awaited<ReturnType<typeof getNearToolbox>>;
+} = {} as any;
+
+beforeAll(() => {
+  context.provider = new providers.JsonRpcProvider({
+    url: SKConfig.get("rpcUrls")[Chain.Near],
+  });
+});
+
+beforeEach(async () => {
+  context.toolbox = await getNearToolbox();
+});
+
+describe("NEAR createTransaction", () => {
+  test("should retrieve full access public key for valid account", async () => {
+    const toolbox = context.toolbox;
+
+    const transaction = await toolbox.createTransaction({
+      recipient: accountId, // Self transfer
+      assetValue: AssetValue.from({
+        chain: Chain.Near,
+        value: "0.001", // Small amount
+      }),
+      sender: accountId,
+      feeRate: 300000000000000, // 300 TGas
+    });
+
+    expect(transaction).toBeDefined();
+    expect(transaction.publicKey).toBeDefined();
+    expect(transaction.serialized).toBeDefined();
+  }, 30000);
+
+  test("should throw error for invalid account", async () => {
+    const provider = context.provider;
+    const invalidAccountId = "non-existent-account-12345.testnet";
+
+    await expect(async () => {
+      await getFullAccessPublicKey(provider, invalidAccountId);
+    }).toThrow();
+  }, 10000);
+
+  test("should handle network errors gracefully", async () => {
+    const invalidProvider = new providers.JsonRpcProvider({ url: "https://invalid-rpc-url.test" });
+
+    await expect(async () => {
+      await getFullAccessPublicKey(invalidProvider, "any-account.testnet");
+    }).toThrow();
+  }, 10000);
+
+  test("should work with contract function call transaction", async () => {
+    const toolbox = context.toolbox;
+    const provider = context.provider;
+
+    const contractTransaction = await toolbox.createContractFunctionCall({
+      sender: accountId,
+      contractId: "wrap.testnet", // Known testnet contract
+      methodName: "storage_deposit",
+      args: { account_id: accountId },
+      gas: "300000000000000", // 300 TGas
+      attachedDeposit: "1250000000000000000000", // 0.00125 NEAR for storage
+    });
+
+    expect(contractTransaction).toBeDefined();
+    expect(contractTransaction.publicKey).toBeDefined();
+
+    // Verify the public key can be retrieved directly
+    const { publicKey } = await getFullAccessPublicKey(provider, accountId);
+    expect(publicKey.toString()).toBe(contractTransaction.publicKey);
+  }, 30000);
+});

package/src/near/helpers/contractFactory.ts

@@ -0,0 +1,22 @@
+import type { Account, Contract } from "near-api-js";
+
+// Create a Near contract instance
+export async function createNearContract<T extends Contract>({
+  account,
+  contractId,
+  viewMethods,
+  changeMethods,
+}: {
+  account: Account;
+  contractId: string;
+  viewMethods: string[];
+  changeMethods: string[];
+}): Promise<T> {
+  const { Contract } = await import("near-api-js");
+
+  return new Contract(account, contractId, {
+    viewMethods,
+    changeMethods,
+    useLocalViewExecution: true, // Enable local view execution for efficiency
+  }) as T;
+}