feat: fusion (#16)

* feat: fusion
* resolved BIC-411

Author: joepegler

.env.example

@@ -9,4 +9,5 @@ PIMLICO_API_KEY=
 TENDERLY_API_KEY=
 TENDERLY_ACCOUNT_SLUG=
 TENDERLY_PROJECT_SLUG=
-RUN_PAID_TESTS=false
+RUN_PAID_TESTS=false
+ALCHEMY_API_KEY=

.github/workflows/funded-tests.yml

@@ -25,6 +25,7 @@ jobs:
         run: bun run fund:nexus
         env:
           PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
           TESTNET_CHAIN_ID: 84532
           MAINNET_CHAIN_ID: 10
 
@@ -35,6 +36,7 @@ jobs:
           PIMLICO_API_KEY: ${{ secrets.PIMLICO_API_KEY }}
           PAYMASTER_URL: ${{ secrets.PAYMASTER_URL }}
           BUNDLER_URL: ${{ secrets.BUNDLER_URL }}
+          ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
           TESTNET_CHAIN_ID: 84532
           MAINNET_CHAIN_ID: 10
           RUN_PAID_TESTS: true

.github/workflows/unit-tests.yml

@@ -25,6 +25,7 @@ jobs:
         run: bun run fund:nexus
         env:
           PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
           TESTNET_CHAIN_ID: 84532
           MAINNET_CHAIN_ID: 10
 
@@ -35,6 +36,7 @@ jobs:
           PIMLICO_API_KEY: ${{ secrets.PIMLICO_API_KEY }}
           PAYMASTER_URL: ${{ secrets.PAYMASTER_URL }}
           BUNDLER_URL: ${{ secrets.BUNDLER_URL }}
+          ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
           TESTNET_CHAIN_ID: 84532
           MAINNET_CHAIN_ID: 10
           CI: true 

CHANGELOG.md

@@ -1,5 +1,11 @@
 # @biconomy/abstractjs
 
+## 0.0.38
+
+### Patch Changes
+
+- Fusion support
+
 ## 0.0.37
 
 ### Patch Changes

README.md

@@ -12,10 +12,8 @@ The Biconomy SDK is your all-in-one toolkit for building decentralized applicati
 
   - [📚 Table of Contents](#-table-of-contents)
   - [🛠️ Quickstart](#-quickstart)
-
     - [Prerequisites](#prerequisites)
     - [Installation](#installation)
-
   - [📄 Documentation and Resources](#-documentation-and-resources)
   - [💼 Examples](#-examples)
   - [License](#license)
@@ -35,10 +33,11 @@ bun add @biconomy/abstractjs viem @rhinestone/module-sdk
 import { toMultichainNexusAccount, mcUSDC } from "@biconomy/abstractjs";
 import { base, optimism } from "viem/chains";
 import { privateKeyToAccount } from "viem/accounts";
-
+import { http } from "viem";
 const eoaAccount = privateKeyToAccount(`0x${process.env.PRIVATE_KEY}`)
 const mcNexus = await toMultichainNexusAccount({
   chains: [base, optimism],
+  transports: [http(), http()],
   signer: eoaAccount
 })
 const meeClient = await createMeeClient({ account: mcNexus })
@@ -75,7 +74,7 @@ bun install --frozen-lockfile
 **Funding test accounts:**
 
 ```bash
-# Fund test PRIVATE_KEY account with native tokens and USDC
+# Fund test nexus accounts with native tokens and USDC, using a funded PRIVATE_KEY master account
 bun run fund:nexus
 ```
 
@@ -86,7 +85,6 @@ bun run test
 
 # Run tests for a specific subset of tests (by test description)
 bun run test -t=mee
-
 ```
 
 For detailed information about the testing framework, network configurations, and debugging guidelines, please refer to our [Testing Documentation](./src/test/README.md).
@@ -97,7 +95,7 @@ For a comprehensive understanding of our project and to contribute effectively,
 
 - [**Biconomy Documentation**](https://docs.biconomy.io)
 - [**Biconomy Dashboard**](https://dashboard.biconomy.io)
-- [**API Documentation**](https://bcnmy.github.io/sdk)
+- [**API Documentation**](https://bcnmy.github.io/abstractjs)
 - [**Contributing Guidelines**](./CONTRIBUTING.md): Learn how to contribute to our project, from code contributions to documentation improvements.
 - [**Code of Conduct**](./CODE_OF_CONDUCT.md): Our commitment to fostering an open and welcoming environment.
 - [**Security Policy**](./SECURITY.md): Guidelines for reporting security vulnerabilities.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biconomy/abstractjs",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "author": "Biconomy",
   "repository": "github:bcnmy/abstractjs",
   "main": "./dist/_cjs/index.js",

scripts/fund:nexus.ts

@@ -4,10 +4,10 @@ import {
   type Address,
   type Chain,
   type Hex,
+  type Transport,
   createPublicClient,
   createWalletClient,
   encodeFunctionData,
-  erc20Abi,
   formatEther,
   formatUnits,
   parseEther,
@@ -18,6 +18,7 @@ import { privateKeyToAccount } from "viem/accounts"
 import { base, optimism } from "viem/chains"
 import { toMultichainNexusAccount, toNexusAccount } from "../src/sdk/account"
 import { getChain } from "../src/sdk/account/utils/getChain"
+import { TokenWithPermitAbi } from "../src/sdk/constants"
 import { mcUSDC, testnetMcUSDC } from "../src/sdk/constants/tokens"
 
 dotenv.config()
@@ -27,7 +28,6 @@ type EnvVars = {
   PRIVATE_KEY: Hex
   TESTNET_CHAIN_ID: number
 }
-const MAINNET_CHAINS_FOR_TESTING = [optimism, base]
 const NATIVE_TOKEN_AMOUNT = parseEther("0.001")
 const USDC_TOKEN_AMOUNT = parseUnits("1", 6)
 const index = 0n
@@ -59,20 +59,22 @@ async function main() {
   }
 
   console.log("\n=== MEE Nexus Account ===")
-  const chains = getTestChains(chain)
-  const [paymentChain, targetChain] = chains
+  const chains = [optimism, base]
+  const transports: Transport[] = [http(), http()]
+
   const mcNexus = await toMultichainNexusAccount({
     signer: account,
     chains,
+    transports,
     index
   })
 
   const mcNexusAddress = await mcNexus
-    .deploymentOn(paymentChain.id, true)
+    .deploymentOn(optimism.id, true)
     .getAddress()
 
   console.log(`Address: ${mcNexusAddress}`)
-  console.log(`Network: ${paymentChain.name}`)
+  console.log(`Network: ${optimism.name}`)
 
   const [meeNexusNativeBalance, usdcNexusBalance] = await getBalances(
     { chainId: MAINNET_CHAIN_ID, tokenAddress: mainnetUsdc },
@@ -85,7 +87,7 @@ async function main() {
   const masterClient = createWalletClient({
     account,
     transport: http(),
-    chain: paymentChain
+    chain: optimism
   }).extend(publicActions)
 
   if (meeNexusNativeBalance >= NATIVE_TOKEN_AMOUNT) {
@@ -99,8 +101,7 @@ async function main() {
     })
 
     const nativeTxReceipt = await masterClient.waitForTransactionReceipt({
-      hash: nativeTx,
-      confirmations: 1
+      hash: nativeTx
     })
     console.log("Native Transaction:", nativeTxReceipt.transactionHash)
   }
@@ -111,15 +112,14 @@ async function main() {
     const usdcTx = await masterClient.sendTransaction({
       to: mainnetUsdc,
       data: encodeFunctionData({
-        abi: erc20Abi,
+        abi: TokenWithPermitAbi,
         functionName: "transfer",
         args: [mcNexusAddress, USDC_TOKEN_AMOUNT]
       })
     })
 
     const usdcTxReceipt = await masterClient.waitForTransactionReceipt({
-      hash: usdcTx,
-      confirmations: 1
+      hash: usdcTx
     })
     console.log("USDC Transaction:", usdcTxReceipt.transactionHash)
   }
@@ -176,8 +176,7 @@ async function main() {
     })
     const vanillaNexusUsdcTxReceipt =
       await testnetClient.waitForTransactionReceipt({
-        hash: nativeTx,
-        confirmations: 1
+        hash: nativeTx
       })
     console.log(
       `Vanilla Nexus USDC Transaction on testnet chain ${testnetChain.name}:`,
@@ -193,15 +192,14 @@ async function main() {
     const vanillaNexusUsdcTx = await testnetClient.sendTransaction({
       to: testnetUsdc,
       data: encodeFunctionData({
-        abi: erc20Abi,
+        abi: TokenWithPermitAbi,
         functionName: "transfer",
         args: [vanillaNexusAddress, USDC_TOKEN_AMOUNT]
       })
     })
     const vanillaNexusUsdcTxReceipt =
       await testnetClient.waitForTransactionReceipt({
-        hash: vanillaNexusUsdcTx,
-        confirmations: 1
+        hash: vanillaNexusUsdcTx
       })
     console.log(
       "Vanilla Nexus USDC Transaction:",
@@ -225,7 +223,7 @@ const getBalances = async (
     }),
     publicClient.readContract({
       address: envVars.tokenAddress,
-      abi: erc20Abi,
+      abi: TokenWithPermitAbi,
       functionName: "balanceOf",
       args: [address]
     })
@@ -248,18 +246,6 @@ const getEnvVars = (): EnvVars => {
   }
 }
 
-const getTestChains = (chain: Chain) => {
-  const defaultChainsIncludePaymentChain = MAINNET_CHAINS_FOR_TESTING.some(
-    ({ id }) => Number(id) === chain.id
-  )
-  if (defaultChainsIncludePaymentChain) {
-    return MAINNET_CHAINS_FOR_TESTING.sort((a, b) =>
-      a.id === chain.id ? -1 : 1
-    )
-  }
-  throw new Error("Unsupported chain")
-}
-
 main()
   .then(() => process.exit(0))
   .catch((error) => {

src/sdk/account/decorators/build.test.ts

@@ -1,6 +1,6 @@
-import type { Chain, LocalAccount } from "viem"
+import type { Chain, LocalAccount, Transport } from "viem"
 import { beforeAll, describe, expect, it } from "vitest"
-import { getTestChains, toNetwork } from "../../../test/testSetup"
+import { getTestChainConfig, toNetwork } from "../../../test/testSetup"
 import type { NetworkConfig } from "../../../test/testUtils"
 import { type MeeClient, createMeeClient } from "../../clients/createMeeClient"
 import { mcUSDC } from "../../constants/tokens"
@@ -10,24 +10,26 @@ import {
 } from "../toMultiChainNexusAccount"
 import { build } from "./build"
 
-describe("mee:build", () => {
+describe("mee.build", () => {
   let network: NetworkConfig
   let eoaAccount: LocalAccount
 
   let mcNexus: MultichainSmartAccount
   let meeClient: MeeClient
 
-  let targetChain: Chain
   let paymentChain: Chain
+  let targetChain: Chain
+  let transports: Transport[]
 
   beforeAll(async () => {
     network = await toNetwork("MAINNET_FROM_ENV_VARS")
-    ;[paymentChain, targetChain] = getTestChains(network)
+    ;[[paymentChain, targetChain], transports] = getTestChainConfig(network)
 
     eoaAccount = network.account!
 
     mcNexus = await toMultichainNexusAccount({
       chains: [paymentChain, targetChain],
+      transports,
       signer: eoaAccount
     })
 
@@ -75,7 +77,7 @@ describe("mee:build", () => {
       {
         type: "intent",
         data: {
-          amount: BigInt(1000),
+          amount: 1n,
           mcToken: mcUSDC,
           toChain: targetChain
         }