chore: merge left behind mee work

.env.example

@@ -1,8 +1,8 @@
 PRIVATE_KEY=
 CHAIN_ID=84532
+ALT_CHAIN_ID=11155111
 RPC_URL=
 BUNDLER_URL=
 BICONOMY_SDK_DEBUG=false
-RUN_PLAYGROUND=false
 PAYMASTER_URL=
 PIMLICO_API_KEY=

.github/workflows/unit-tests.yml

@@ -29,4 +29,5 @@ jobs:
           PAYMASTER_URL: ${{ secrets.PAYMASTER_URL }}
           BUNDLER_URL: ${{ secrets.BUNDLER_URL }}
           CHAIN_ID: 84532
+          ALT_CHAIN_ID: 11155420
           CI: true 

README.md

@@ -32,10 +32,10 @@ bun add @biconomy/sdk viem @rhinestone/module-sdk
 
 2. **Basic Usage:**
 ```typescript
-import { createNexusClient } from "@biconomy/sdk";
+import { createSmartAccountClient } from "@biconomy/sdk";
 import { http } from "viem";
 
-const nexusClient = await createNexusClient({
+const nexusClient = await createSmartAccountClient({
   signer: account,
   chain,
   transport: http(),

package.json

@@ -126,8 +126,5 @@
   },
   "type": "module",
   "types": "./dist/_types/index.d.ts",
-  "typings": "./dist/_types/index.d.ts",
-  "dependencies": {
-    "@silencelaboratories/walletprovider-sdk": "^0.3.0"
-  }
+  "typings": "./dist/_types/index.d.ts"
 }

src/sdk/account/toNexusAccount.test.ts

@@ -40,8 +40,8 @@ import {
 import type { MasterClient, NetworkConfig } from "../../test/testUtils"
 import {
   type NexusClient,
-  createNexusClient
-} from "../clients/createNexusClient"
+  createSmartAccountClient
+} from "../clients/createSmartAccountClient"
 import {
   BICONOMY_ATTESTER_ADDRESS,
   MAINNET_ADDRESS_K1_VALIDATOR_FACTORY_ADDRESS,
@@ -90,7 +90,7 @@ describe("nexus.account", async () => {
       transport: http()
     })
 
-    nexusClient = await createNexusClient({
+    nexusClient = await createSmartAccountClient({
       signer: eoaAccount,
       chain,
       transport: http(),
@@ -106,7 +106,7 @@ describe("nexus.account", async () => {
   })
 
   test("should override account address", async () => {
-    const newNexusClient = await createNexusClient({
+    const newNexusClient = await createSmartAccountClient({
       chain,
       transport: http(),
       bundlerTransport: http(bundlerUrl),

src/sdk/account/utils/Types.ts

@@ -63,7 +63,6 @@ export type UserOpReceipt = {
   logs: Log[]
 }
 
-export type Service = "Bundler" | "Paymaster"
 export type BigNumberish = Hex | number | bigint
 export type BytesLike = Uint8Array | Hex | string
 

src/sdk/account/utils/Utils.ts

@@ -42,7 +42,7 @@ import type { AccountMetadata, EIP712DomainReturn } from "./Types"
  * @param value - The value to check
  * @returns True if the value is null or undefined
  */
-export const isNullOrUndefined = (value: any): value is undefined => {
+export const isNullOrUndefined = (value: AnyData): value is undefined => {
   return value === null || value === undefined
 }
 

src/sdk/account/utils/getChain.ts

@@ -65,7 +65,7 @@ type StringOrStrings = string | string[]
  *
  * @example
  *
- * import { getCustomChain, createNexusClient } from "@biconomy/sdk"
+ * import { getCustomChain, createSmartAccountClient } from "@biconomy/sdk"
  *
  * const customChain = getCustomChain(
  *   "My Custom Chain",
@@ -81,7 +81,7 @@ type StringOrStrings = string | string[]
  *   transport: http()
  * })
  *
- * const smartAccountCustomChain = await createNexusClient({
+ * const smartAccountCustomChain = await createSmartAccountClient({
  *   signer: walletClientWithCustomChain,
  *   bundlerUrl,
  *   customChain

src/sdk/account/utils/toSigner.test.ts

@@ -2,7 +2,7 @@ import { JsonRpcProvider, JsonRpcSigner, ethers } from "ethers"
 import { http, type Address, type Hex, createWalletClient } from "viem"
 import { privateKeyToAccount } from "viem/accounts"
 import { afterAll, beforeAll, describe, expect, it } from "vitest"
-import { toNetwork } from "../../../test/testSetup"
+import { toNetwork, toNetworks } from "../../../test/testSetup"
 import { type NetworkConfig, killNetwork, pKey } from "../../../test/testUtils"
 import { type EthersWallet, addressEquals } from "./Utils"
 import { toSigner } from "./toSigner"

src/sdk/account/utils/utils.test.ts

@@ -7,6 +7,7 @@ import { toSigner } from "./toSigner"
 
 describe("utils", async () => {
   const privKey = generatePrivateKey()
+
   test.concurrent(
     "should have consistent behaviour between ethers.AbiCoder.defaultAbiCoder() and viem.encodeAbiParameters()",
     async () => {

src/sdk/clients/createBicoBundlerClient.test.ts

@@ -45,6 +45,7 @@ describe("bico.bundler", async () => {
     nexusAccountAddress = await nexusAccount.getCounterFactualAddress()
     await topUp(testClient, nexusAccountAddress)
   })
+
   afterAll(async () => {
     await killNetwork([network?.rpcPort, network?.bundlerPort])
   })

src/sdk/clients/createBicoPaymasterClient.test.ts

@@ -9,20 +9,23 @@ import {
   createWalletClient
 } from "viem"
 import { afterAll, beforeAll, describe, expect, test } from "vitest"
-import { paymasterTruthy, toNetwork } from "../../test/testSetup"
+import { paymasterTruthy, toNetworks } from "../../test/testSetup"
 import { getTestParamsForTestnet, killNetwork } from "../../test/testUtils"
 import type { NetworkConfig, TestnetParams } from "../../test/testUtils"
 import { type NexusAccount, toNexusAccount } from "../account/toNexusAccount"
 import {
   type BicoPaymasterClient,
   createBicoPaymasterClient
 } from "./createBicoPaymasterClient"
-import { type NexusClient, createNexusClient } from "./createNexusClient"
+import {
+  type NexusClient,
+  createSmartAccountClient
+} from "./createSmartAccountClient"
 
 describe.runIf(paymasterTruthy())("bico.paymaster", async () => {
   let network: NetworkConfig
-  // Required for "PUBLIC_TESTNET" networks
-  let testParams: TestnetParams
+  // Required for "TESTNET_FROM_ENV_VARS" networks
+  let testnetParams: TestnetParams
 
   let chain: Chain
   let bundlerUrl: string
@@ -39,7 +42,7 @@ describe.runIf(paymasterTruthy())("bico.paymaster", async () => {
   let nexusClient: NexusClient
 
   beforeAll(async () => {
-    network = await toNetwork("PUBLIC_TESTNET")
+    ;[network] = await toNetworks("TESTNET_FROM_ENV_VARS")
 
     chain = network.chain
     bundlerUrl = network.bundlerUrl
@@ -59,7 +62,7 @@ describe.runIf(paymasterTruthy())("bico.paymaster", async () => {
       transport: http()
     })
 
-    testParams = getTestParamsForTestnet(publicClient)
+    testnetParams = getTestParamsForTestnet(publicClient)
 
     paymaster = createBicoPaymasterClient({
       transport: http(paymasterUrl)
@@ -69,18 +72,18 @@ describe.runIf(paymasterTruthy())("bico.paymaster", async () => {
       signer: account,
       chain,
       transport: http(),
-      ...testParams
+      ...testnetParams
     })
 
     nexusAccountAddress = await nexusAccount.getCounterFactualAddress()
 
-    nexusClient = await createNexusClient({
+    nexusClient = await createSmartAccountClient({
       signer: account,
       chain,
       transport: http(),
       bundlerTransport: http(bundlerUrl),
       paymaster,
-      ...testParams
+      ...testnetParams
     })
   })
   afterAll(async () => {

src/sdk/clients/createBundlerClient.test.ts

@@ -7,7 +7,7 @@ import { type NexusAccount, toNexusAccount } from "../account/toNexusAccount"
 import { safeMultiplier } from "../account/utils"
 import { MAINNET_ADDRESS_K1_VALIDATOR_ADDRESS } from "../constants"
 import { MAINNET_ADDRESS_K1_VALIDATOR_FACTORY_ADDRESS } from "../constants"
-import type { NexusClient } from "./createNexusClient"
+import type { NexusClient } from "./createSmartAccountClient"
 import { erc7579Actions } from "./decorators/erc7579"
 import { smartAccountActions } from "./decorators/smartAccount"
 

src/sdk/clients/createNexusClient.ts

@@ -176,18 +176,18 @@ export type NexusClientConfig<
  * @returns Nexus Client. {@link NexusClient}
  *
  * @example
- * import { createNexusClient } from '@biconomy/sdk'
+ * import { createSmartAccountClient } from '@biconomy/sdk'
  * import { http } from 'viem'
  * import { mainnet } from 'viem/chains'
  *
- * const nexusClient = await createNexusClient({
+ * const nexusClient = await createSmartAccountClient({
  *   chain: mainnet,
  *   transport: http('https://mainnet.infura.io/v3/YOUR-PROJECT-ID'),
  *   bundlerTransport: http('https://api.biconomy.io'),
  *   signer: '0x...',
  * })
  */
-export async function createNexusClient(
+export async function createSmartAccountClient(
   parameters: NexusClientConfig
 ): Promise<NexusClient> {
   const {

src/sdk/clients/createNexusSessionClient.test.ts

@@ -1,5 +1,5 @@
 import { SmartSessionMode } from "@rhinestone/module-sdk"
-import { http, type Address, type Chain, type Hex, toBytes, toHex } from "viem"
+import { http, type Address, type Chain, type Hex } from "viem"
 import type { LocalAccount, PublicClient } from "viem"
 import { encodeFunctionData } from "viem"
 import { afterAll, beforeAll, describe, expect, test } from "vitest"
@@ -29,8 +29,10 @@ import {
 } from "../modules/smartSessionsValidator/decorators"
 import { toSmartSessionsValidator } from "../modules/smartSessionsValidator/toSmartSessionsValidator"
 import type { Module } from "../modules/utils/Types"
-import { type NexusClient, createNexusClient } from "./createNexusClient"
-import { createNexusSessionClient } from "./createNexusSessionClient"
+import {
+  type NexusClient,
+  createSmartAccountClient
+} from "./createSmartAccountClient"
 
 describe("nexus.session.client", async () => {
   let network: NetworkConfig
@@ -49,7 +51,7 @@ describe("nexus.session.client", async () => {
   let sessionsModule: Module
 
   beforeAll(async () => {
-    network = await toNetwork("BASE_SEPOLIA_FORKED")
+    network = await toNetwork("BESPOKE_ANVIL_NETWORK_FORKING_BASE_SEPOLIA")
 
     chain = network.chain
     bundlerUrl = network.bundlerUrl
@@ -59,7 +61,7 @@ describe("nexus.session.client", async () => {
 
     testClient = toTestClient(chain, getTestAccount(5))
 
-    nexusClient = await createNexusClient({
+    nexusClient = await createSmartAccountClient({
       signer: eoaAccount,
       chain,
       transport: http(),
@@ -181,7 +183,7 @@ describe("nexus.session.client", async () => {
       functionName: "getNumber"
     })
 
-    const smartSessionNexusClient = await createNexusSessionClient({
+    const smartSessionNexusClient = await createSmartAccountClient({
       chain,
       accountAddress: nexusClient.account.address,
       signer: sessionKeyAccount,
@@ -238,7 +240,7 @@ describe("nexus.session.client", async () => {
       moduleData: sessionData.moduleData
     })
 
-    const smartSessionNexusClient = await createNexusSessionClient({
+    const smartSessionNexusClient = await createSmartAccountClient({
       chain,
       accountAddress: nexusClient.account.address,
       signer: sessionKeyAccount,