feat: taking bundler and paymaster as user provided parameters

src/gasless-provider.ts

@@ -20,7 +20,6 @@ export class GaslessProvider extends ProviderWrapper {
     protected readonly _signerPk: `0x${string}`,
     protected readonly _wrappedProvider: EIP1193Provider,
     public readonly chain: string,
-    protected readonly _pimlicoApiKey: string,
     protected readonly bundlerClient: PimlicoBundlerClient,
     protected readonly paymasterClient: PimlicoPaymasterClient,
     protected readonly publicClient: ReturnType<typeof createPublicClient>,
@@ -38,7 +37,6 @@ export class GaslessProvider extends ProviderWrapper {
     _signerPk: `0x${string}`,
     _wrappedProvider: EIP1193Provider,
     chain: string,
-    _pimlicoApiKey: string,
     bundlerClient: PimlicoBundlerClient,
     paymasterClient: PimlicoPaymasterClient,
     publicClient: ReturnType<typeof createPublicClient>,
@@ -76,7 +74,6 @@ export class GaslessProvider extends ProviderWrapper {
       _signerPk,
       _wrappedProvider,
       chain,
-      _pimlicoApiKey,
       bundlerClient,
       paymasterClient,
       publicClient,
@@ -104,8 +101,8 @@ export class GaslessProvider extends ProviderWrapper {
     // Parse the transaction
     const parsedTxn = ethers.utils.parseTransaction(tx);
 
-    // Get gas prices from pimlico
-    const gasPrices = await this.bundlerClient.getUserOperationGasPrice();
+    // Get gas prices
+    const { maxFeePerGas, maxPriorityFeePerGas } = await this.publicClient.estimateFeesPerGas();
 
     // Generate calldata
     // This calldata is hardcoded as it is calldata for pimlico to execute
@@ -132,8 +129,8 @@ export class GaslessProvider extends ProviderWrapper {
       nonce: this._nonce,
       initCode: this._nonce === 0n ? this._initCode : '0x',
       callData,
-      maxFeePerGas: gasPrices.fast.maxFeePerGas,
-      maxPriorityFeePerGas: gasPrices.fast.maxPriorityFeePerGas,
+      maxFeePerGas: maxFeePerGas as bigint,
+      maxPriorityFeePerGas: maxPriorityFeePerGas as bigint,
       // dummy signature, needs to be there so the SimpleAccount doesn't immediately revert because of invalid signature length
       signature: constants.dummySignature as Hex,
     };

src/index.ts

@@ -28,9 +28,9 @@ extendProvider(async (provider, config, networkName) => {
     return provider;
   }
 
-  const pimlicoApiKey = netConfig.pimlicoApiKey;
-  if (pimlicoApiKey === undefined) {
-    log(`No pimlico api key, skipping`);
+  const sponsoredTransaction = netConfig.sponsoredTransaction;
+  if (sponsoredTransaction === undefined) {
+    log(`No configuration for sponsored transactions set, skipping`);
     return provider;
   }
 
@@ -39,20 +39,12 @@ extendProvider(async (provider, config, networkName) => {
   });
 
   const bundlerClient = createPimlicoBundlerClient({
-    transport: http(`https://api.pimlico.io/v1/${networkName}/rpc?apikey=${pimlicoApiKey}`),
+    transport: http(sponsoredTransaction.bundlerUrl),
   });
 
   const paymasterClient = createPimlicoPaymasterClient({
-    transport: http(`https://api.pimlico.io/v2/${networkName}/rpc?apikey=${pimlicoApiKey}`),
+    transport: http(sponsoredTransaction.paymasterUrl),
   });
 
-  return await GaslessProvider.create(
-    signer,
-    provider,
-    networkName,
-    pimlicoApiKey,
-    bundlerClient,
-    paymasterClient,
-    publicClient,
-  );
+  return await GaslessProvider.create(signer, provider, networkName, bundlerClient, paymasterClient, publicClient);
 });

src/type-extensions.ts

@@ -3,10 +3,16 @@ import 'hardhat/types/runtime';
 
 declare module 'hardhat/types/config' {
   export interface HttpNetworkUserConfig {
-    pimlicoApiKey?: string;
+    sponsoredTransaction?: {
+      bundlerUrl: string;
+      paymasterUrl: string;
+    };
   }
 
   export interface HttpNetworkConfig {
-    pimlicoApiKey?: string;
+    sponsoredTransaction?: {
+      bundlerUrl: string;
+      paymasterUrl: string;
+    };
   }
 }

test/fixture-projects/hardhat-project/hardhat.config.ts

@@ -8,7 +8,10 @@ const config: HardhatUserConfig = {
   defaultNetwork: 'hardhat',
   networks: {
     localhost: {
-      pimlicoApiKey: 'foo',
+      sponsoredTransaction: {
+        bundlerUrl: 'http://localhost:3000',
+        paymasterUrl: 'http://localhost:3001',
+      },
     },
   },
 };

test/project.test.ts

@@ -6,8 +6,12 @@ describe('Integration tests examples', function () {
   describe('HardhatConfig extension', function () {
     useEnvironment('hardhat-project');
 
-    it('Should add the pimlicoApiKey to the config', function () {
-      assert.equal(this.hre.config.networks.localhost.pimlicoApiKey, 'foo');
+    it('Should add the bundlerUrl to the config', function () {
+      assert.equal(this.hre.config.networks.localhost.sponsoredTransaction?.bundlerUrl, 'http://localhost:3000');
+    });
+
+    it('Should add the paymasterUrl to the config', function () {
+      assert.equal(this.hre.config.networks.localhost.sponsoredTransaction?.paymasterUrl, 'http://localhost:3001');
     });
   });
 });