PRO-2136 - Bundler Api Key

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## [1.4.3] - 2024-01-30
+### New
+- Added `GenericBundler` and `EtherspotBundler` as bundlerProviders and removed bundlerUrl params from SdkOptions
+
 ## [1.4.2] - 2024-01-26
 ### Breaking changes
 - Refactored `estimate` method

examples/01-get-address.ts

@@ -1,12 +1,12 @@
-import { PrimeSdk } from '../src';
+import { EtherspotBundler, PrimeSdk } from '../src';
 import * as dotenv from 'dotenv';
 
 dotenv.config();
 
 
 async function main() {
   // initializating sdk...
-  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key' })
+  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID), '') }) // Testnets dont need apiKey on bundlerProvider
 
   // get EtherspotWallet address...
   const address: string = await primeSdk.getCounterFactualAddress();

examples/02-transfer-funds.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import { PrimeSdk } from '../src';
+import { EtherspotBundler, PrimeSdk } from '../src';
 import { printOp } from '../src/sdk/common/OperationUtils';
 import * as dotenv from 'dotenv';
 import { sleep } from '../src/sdk/common';
@@ -11,7 +11,7 @@ const value = '0.00001'; // transfer value
 
 async function main() {
   // initializating sdk...
-  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key' })
+  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID)) })
 
   console.log('address: ', primeSdk.state.EOAAddress)
 

examples/03-transfer-erc20.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import { PrimeSdk } from '../src';
+import { EtherspotBundler, PrimeSdk } from '../src';
 import { printOp } from '../src/sdk/common/OperationUtils';
 import { ERC20_ABI } from '../src/sdk/helpers/abi/ERC20_ABI';
 import * as dotenv from 'dotenv';
@@ -14,7 +14,7 @@ const tokenAddress = '0x326C977E6efc84E512bB9C30f76E30c160eD06FB';
 
 async function main() {
   // initializating sdk...
-  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key' })
+  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID)) })
 
   console.log('address: ', primeSdk.state.EOAAddress)
 

examples/04-transfer-nft.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import { PrimeSdk } from '../src';
+import { EtherspotBundler, PrimeSdk } from '../src';
 import { printOp } from '../src/sdk/common/OperationUtils';
 import * as dotenv from 'dotenv';
 import { sleep } from '../src/sdk/common';
@@ -13,7 +13,7 @@ const tokenId = 4;
 
 async function main() {
   // initializating sdk...
-  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key' })
+  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID)) })
 
   console.log('address: ', primeSdk.state.EOAAddress)
 

examples/12-add-guardians.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import { PrimeSdk } from '../src';
+import { EtherspotBundler, PrimeSdk } from '../src';
 import { printOp } from '../src/sdk/common/OperationUtils';
 import * as dotenv from 'dotenv';
 import { sleep } from '../src/sdk/common';
@@ -10,7 +10,7 @@ async function main() {
   // initializating sdk...
   const primeSdk = new PrimeSdk(
     { privateKey: process.env.WALLET_PRIVATE_KEY },
-    { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key' },
+    { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID)) },
   );
 
   console.log('address: ', primeSdk.state.EOAAddress);

examples/13-paymaster.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import { PrimeSdk } from '../src';
+import { EtherspotBundler, PrimeSdk } from '../src';
 import { printOp } from '../src/sdk/common/OperationUtils';
 import * as dotenv from 'dotenv';
 import { sleep } from '../src/sdk/common';
@@ -14,6 +14,7 @@ async function main() {
   // initializating sdk...
   const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, {
     chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key',
+    bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID))
   })
 
   console.log('address: ', primeSdk.state.EOAAddress)

examples/14-zeroDev-address.ts

@@ -1,12 +1,14 @@
-import { Factory, PrimeSdk } from '../src';
+import { EtherspotBundler, Factory, PrimeSdk } from '../src';
 import * as dotenv from 'dotenv';
 
 dotenv.config();
 
 
 async function main() {
   // initializating sdk...
-  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', factoryWallet: Factory.ZERO_DEV })
+  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', factoryWallet: Factory.ZERO_DEV, 
+    bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID)) 
+  })
 
   // get ZeroDev address...
   const address: string = await primeSdk.getCounterFactualAddress();

examples/15-simpleAccount-address.ts

@@ -1,12 +1,14 @@
-import { Factory, PrimeSdk } from '../src';
+import { EtherspotBundler, Factory, PrimeSdk } from '../src';
 import * as dotenv from 'dotenv';
 
 dotenv.config();
 
 
 async function main() {
   // initializating sdk...
-  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', factoryWallet: Factory.SIMPLE_ACCOUNT })
+  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', factoryWallet: Factory.SIMPLE_ACCOUNT, 
+    bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID)) 
+  })
 
   // get SimpleAccount address...
   const address: string = await primeSdk.getCounterFactualAddress();

examples/16-paymaster-arka.ts

@@ -1,5 +1,5 @@
 import { ethers, utils } from 'ethers';
-import { PrimeSdk } from '../src';
+import { EtherspotBundler, PrimeSdk } from '../src';
 import { printOp } from '../src/sdk/common/OperationUtils';
 import * as dotenv from 'dotenv';
 import { sleep } from '../src/sdk/common';
@@ -18,6 +18,7 @@ async function main() {
   // initializing sdk...
   const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, {
     chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key',
+    bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID))
   })
 
   console.log('address: ', primeSdk.state.EOAAddress)

examples/19-paymaster-validUntil-validAfter.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import { PrimeSdk } from '../src';
+import { EtherspotBundler, PrimeSdk } from '../src';
 import { printOp } from '../src/sdk/common/OperationUtils';
 import * as dotenv from 'dotenv';
 import { sleep } from '../src/sdk/common';
@@ -16,7 +16,7 @@ const queryString = `?apiKey=${arka_api_key}&chainId=${Number(process.env.CHAIN_
 async function main() {
     // initializing sdk...
     const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, {
-        chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key',
+        chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID))
     })
 
     console.log('address: ', primeSdk.state.EOAAddress)

examples/20-callGasLimit.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import { PrimeSdk } from '../src';
+import { EtherspotBundler, PrimeSdk } from '../src';
 import { printOp } from '../src/sdk/common/OperationUtils';
 import * as dotenv from 'dotenv';
 import { sleep } from '../src/sdk/common';
@@ -11,7 +11,9 @@ const value = '0.0001'; // transfer value
 
 async function main() {
   // initializating sdk...
-  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key' })
+  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', 
+    bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID)) 
+  })
 
   console.log('address: ', primeSdk.state.EOAAddress)
 

examples/21-get-multiple-accounts.ts

@@ -1,4 +1,4 @@
-import { PrimeSdk } from '../src';
+import { EtherspotBundler, PrimeSdk } from '../src';
 import * as dotenv from 'dotenv';
 
 dotenv.config();
@@ -7,7 +7,7 @@ async function main() {
   // initializating sdk for index 0...
   const primeSdk = new PrimeSdk(
     { privateKey: process.env.WALLET_PRIVATE_KEY },
-    { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key' },
+    { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID)) },
   );
 
   // get EtherspotWallet address for index 0...
@@ -17,7 +17,7 @@ async function main() {
   // initializating sdk for index 1...
   const primeSdk1 = new PrimeSdk(
     { privateKey: process.env.WALLET_PRIVATE_KEY },
-    { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', index: 1 },
+    { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', index: 1, bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID)) },
   );
 
   // get EtherspotWallet address for index 1...

examples/22-concurrent-userops.ts

@@ -1,5 +1,5 @@
 import { ethers, providers } from 'ethers';
-import { PrimeSdk } from '../src';
+import { EtherspotBundler, PrimeSdk } from '../src';
 import { printOp } from '../src/sdk/common/OperationUtils';
 import * as dotenv from 'dotenv';
 import { sleep } from '../src/sdk/common';
@@ -12,7 +12,9 @@ const value = '0.000001'; // transfer value
 async function main() {
   const provider = new providers.JsonRpcProvider(process.env.RPC_PROVIDER_URL);
   // initializating sdk...
-  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key' })
+  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', 
+    bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID)) 
+  })
 
   console.log('address: ', primeSdk.state.EOAAddress)
 

examples/23-bundlerApiKey.ts

@@ -0,0 +1,21 @@
+import { EtherspotBundler, PrimeSdk } from '../src';
+import * as dotenv from 'dotenv';
+
+dotenv.config();
+
+
+async function main() {
+  const etherspotBundlerApiKey = '';
+  // initializating sdk...
+  const primeSdk = new PrimeSdk({ privateKey: process.env.WALLET_PRIVATE_KEY }, { chainId: Number(process.env.CHAIN_ID), projectKey: 'public-prime-testnet-key', 
+    bundlerProvider: new EtherspotBundler(Number(process.env.CHAIN_ID), etherspotBundlerApiKey) 
+  })
+
+  // get EtherspotWallet address...
+  const address: string = await primeSdk.getCounterFactualAddress();
+  console.log('\x1b[33m%s\x1b[0m', `EtherspotWallet address: ${address}`);
+}
+
+main()
+  .catch(console.error)
+  .finally(() => process.exit());

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherspot/prime-sdk",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Etherspot Prime (Account Abstraction) SDK",
   "keywords": [
     "ether",

src/sdk/base/BaseAccountAPI.ts

@@ -70,21 +70,19 @@ export abstract class BaseAccountAPI {
       throw new Exception('Invalid wallet provider');
     }
 
-    // const env = Env.prepare(optionsLike.env);
-
     const {
       chainId, //
       stateStorage,
       rpcProviderUrl,
-      bundlerRpcUrl,
       factoryWallet,
+      bundlerProvider,
     } = optionsLike;
 
     this.services = {
       networkService: new NetworkService(chainId),
       walletService: new WalletService(params.walletProvider, {
         provider: rpcProviderUrl,
-      }, bundlerRpcUrl, chainId),
+      }, bundlerProvider.url, chainId),
       stateService: new StateService({
         storage: stateStorage,
       }),

src/sdk/bundler/index.ts

@@ -0,0 +1,2 @@
+export * from './interface';
+export * from './providers';

src/sdk/bundler/interface.ts

@@ -0,0 +1,6 @@
+
+export interface BundlerProvider {
+  readonly url: string;
+}
+
+export type BundlerProviderLike = BundlerProvider;

src/sdk/bundler/providers/EtherspotBundler.ts

@@ -0,0 +1,18 @@
+import { getNetworkConfig } from "../../network/constants";
+import { BundlerProvider } from "../interface";
+
+export class EtherspotBundler implements BundlerProvider {
+  readonly url: string;
+  readonly apiKey: string;
+  readonly chainId: string;
+
+  constructor(chainId: number, apiKey?: string, bundlerUrl?: string) {
+    if (!bundlerUrl) {
+      const networkConfig = getNetworkConfig(chainId);
+      bundlerUrl = networkConfig.bundler;
+    }
+    if (apiKey) this.url = bundlerUrl + '?api-key=' + apiKey;
+    else this.url = bundlerUrl;
+    this.apiKey = apiKey;
+  }
+}

src/sdk/bundler/providers/GenericBundler.ts

@@ -0,0 +1,9 @@
+import { BundlerProvider } from "../interface";
+
+
+export class GenericBundler implements BundlerProvider {
+  readonly url: string;
+  constructor(bundlerUrl: string) {
+    this.url = bundlerUrl;
+  }
+}

src/sdk/bundler/providers/index.ts

@@ -0,0 +1,2 @@
+export * from './GenericBundler';
+export * from './EtherspotBundler';

src/sdk/index.ts

@@ -8,6 +8,7 @@ export * from './interfaces';
 export * from './network';
 export * from './state';
 export * from './wallet';
+export * from './bundler';
 
 export { PrimeSdk, DataUtils };
 export default PrimeSdk;

src/sdk/interfaces.ts

@@ -1,3 +1,4 @@
+import { BundlerProviderLike } from './bundler';
 import { StateStorage } from './state';
 
 export interface PaymasterApi {
@@ -13,11 +14,12 @@ export enum Factory {
 
 export interface SdkOptions {
   chainId: number;
+  projectKey: string;
+  bundlerProvider: BundlerProviderLike;
   stateStorage?: StateStorage;
-  bundlerRpcUrl?: string;
   rpcProviderUrl?: string;
   graphqlEndpoint?: string;
-  projectKey: string;
+  etherspotBundlerApiKey?: string;
   factoryWallet?: Factory;
   walletFactoryAddress?: string;
   entryPointAddress?: string;