deployment config and update hardhat etherscan

hardhat.config.ts

@@ -90,6 +90,15 @@ const config: HardhatUserConfig = {
           ? [process.env.PRIVATE_KEY]
           : walletUtils.makeKeyList(),
     },
+    polygon_amoy: {
+      url:
+        process.env.POLYGON_AMOY_URL || "https://rpc-amoy.polygon.technology/",
+      chainId: 80002,
+      accounts:
+        process.env.PRIVATE_KEY !== undefined
+          ? [process.env.PRIVATE_KEY]
+          : walletUtils.makeKeyList(),
+    },
     bnb_mainnet: {
       url: "https://bsc-dataseed2.binance.org",
       chainId: 56,
@@ -109,6 +118,11 @@ const config: HardhatUserConfig = {
           : walletUtils.makeKeyList(),
       gasPrice: 50e9,
     },
+    blastMainnet: {
+      url: process.env.BLAST_MAINNET_URL || "",
+      accounts: hardhatAccounts,
+      chainId: 81457,
+    },
     baseGoerli: {
       url:
         process.env.BASE_TESTNET_URL ||
@@ -220,6 +234,15 @@ const config: HardhatUserConfig = {
       gasPrice: 10e9,
       chainId: 420,
     },
+    optimismSepolia: {
+      url: `https://sepolia.optimism.io/`,
+      accounts:
+        process.env.PRIVATE_KEY !== undefined
+          ? [process.env.PRIVATE_KEY]
+          : walletUtils.makeKeyList(),
+      gasPrice: 1e9,
+      chainId: 11155420,
+    },
     optimismMainnet: {
       url: `https://mainnet.optimism.io`,
       accounts:
@@ -318,6 +341,7 @@ const config: HardhatUserConfig = {
       arbitrumTestnet: process.env.ARBITRUM_API_KEY || "",
       arbitrumOne: process.env.ARBITRUM_API_KEY || "",
       optimisticGoerli: process.env.OPTIMISTIC_API_KEY || "",
+      optimismSepolia: process.env.OPTIMISTIC_API_KEY || "",
       optimisticEthereum: process.env.OPTIMISTIC_API_KEY || "",
       "base-goerli": "PLACEHOLDER_STRING",
       "linea-goerli": "PLACEHOLDER_STRING",
@@ -445,6 +469,14 @@ const config: HardhatUserConfig = {
           browserURL: "https://testnet-zkevm.polygonscan.com",
         },
       },
+      {
+        network: "optimismSepolia",
+        chainId: 11155420,
+        urls: {
+          apiURL: "https://api-sepolia-optimism.etherscan.io/api",
+          browserURL: "https://sepolia-optimism.etherscan.io/",
+        },
+      },
     ],
   },
 };

package.json

@@ -49,7 +49,7 @@
     "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
     "@nomicfoundation/hardhat-toolbox": "^2.0.2",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
-    "@nomiclabs/hardhat-etherscan": "^3.1.7",
+    "@nomiclabs/hardhat-etherscan": "^3.1.8",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@typechain/ethers-v5": "^10.2.0",
     "@typechain/hardhat": "^6.1.5",
@@ -94,6 +94,7 @@
     "@ethersproject/abstract-signer": "^5.6.2",
     "@ethersproject/constants": "^5.6.1",
     "@mean-finance/uniswap-v3-oracle": "^1.0.3",
+    "@nomicfoundation/hardhat-verify": "^2.0.5",
     "@openzeppelin/contracts": "4.8.1",
     "@openzeppelin/contracts-upgradeable": "4.8.1",
     "@pimlico/erc20-paymaster": "^0.0.1",
@@ -112,4 +113,4 @@
     "solidity-bytes-utils": "^0.8.0",
     "source-map-support": "^0.5.19"
   }
-}
+}

scripts/utils/index.ts

@@ -271,8 +271,8 @@ export const deployContract = async (
   // TODO
   // Review gas price
   const { hash, wait } = await deployerInstance.deploy(salt, contractByteCode, {
-    maxFeePerGas: 3e9,
-    maxPriorityFeePerGas: 2e9,
+    maxFeePerGas: 1e9,
+    maxPriorityFeePerGas: 1e6,
   });
 
   console.log(`Submitted transaction ${hash} for deployment`);

test/bundler-integration/token-paymaster/oracle-aggregator-specs.ts

@@ -14,13 +14,9 @@ import {
   BiconomyTokenPaymaster__factory,
   ChainlinkOracleAggregator,
   ChainlinkOracleAggregator__factory,
-  MockChainlinkOracleAggregator__factory,
-  MockPriceFeed,
   MockStalePriceFeed__factory,
-  MockStalePriceFeed,
   MockPriceFeed__factory,
   MockToken,
-  MockChainlinkOracleAggregator,
 } from "../../../typechain-types";
 import {
   EcdsaOwnershipRegistryModule,
@@ -97,7 +93,6 @@ describe("Biconomy Token Paymaster (With Bundler)", function () {
 
   let sampleTokenPaymaster: BiconomyTokenPaymaster;
   let oracleAggregator: ChainlinkOracleAggregator;
-  let staleOracleAggregator: MockChainlinkOracleAggregator;
 
   // Could also use published package or added submodule (for Account Implementation and Factory)
   let smartWalletImp: BiconomyAccountImplementation;
@@ -130,9 +125,6 @@ describe("Biconomy Token Paymaster (With Bundler)", function () {
     oracleAggregator = await new ChainlinkOracleAggregator__factory(
       deployer
     ).deploy(walletOwnerAddress);
-    staleOracleAggregator = await new MockChainlinkOracleAggregator__factory(
-      deployer
-    ).deploy(walletOwnerAddress);
 
     ecdsaModule = await new EcdsaOwnershipRegistryModule__factory(
       deployer
@@ -174,14 +166,6 @@ describe("Biconomy Token Paymaster (With Bundler)", function () {
     const priceFeedTxStale: any =
       await priceFeedStale.populateTransaction.getThePrice();
 
-    await staleOracleAggregator.setTokenOracle(
-      token.address,
-      stalePriceFeedMock.address,
-      18,
-      priceFeedTxStale.data,
-      true
-    );
-
     const priceResult = await oracleAggregator.getTokenValueOfOneNativeToken(
       token.address
     );
@@ -250,125 +234,6 @@ describe("Biconomy Token Paymaster (With Bundler)", function () {
   });
 
   describe("Token Paymaster with good and bad oracle aggregator", () => {
-    it("succeed with fallback exchange rate in case price feed reverts", async () => {
-      const userSCW: any = BiconomyAccountImplementation__factory.connect(
-        walletAddress,
-        deployer
-      );
-
-      await token
-        .connect(deployer)
-        .transfer(walletAddress, ethers.utils.parseEther("100"));
-
-      const owner = await walletOwner.getAddress();
-      const AccountFactory = await ethers.getContractFactory(
-        "SmartAccountFactory"
-      );
-      const ecdsaOwnershipSetupData = ecdsaModule.interface.encodeFunctionData(
-        "initForSmartAccount",
-        [owner]
-      );
-
-      const smartAccountDeploymentIndex = 0;
-
-      const deploymentData = AccountFactory.interface.encodeFunctionData(
-        "deployCounterFactualAccount",
-        [
-          ecdsaModule.address,
-          ecdsaOwnershipSetupData,
-          smartAccountDeploymentIndex,
-        ]
-      );
-
-      const userOp1 = await fillAndSign(
-        {
-          sender: walletAddress,
-          verificationGasLimit: 200000,
-          preVerificationGas: 50000,
-          callData: encodeERC20Approval(
-            userSCW,
-            token,
-            paymasterAddress,
-            ethers.constants.MaxUint256
-          ),
-        },
-        walletOwner,
-        entryPoint,
-        "nonce"
-      );
-
-      const hash = await sampleTokenPaymaster.getHash(
-        userOp1,
-        ethers.utils.hexlify(1).slice(2, 4),
-        MOCK_VALID_UNTIL,
-        MOCK_VALID_AFTER,
-        token.address,
-        staleOracleAggregator.address,
-        MOCK_FX,
-        DEFAULT_FEE_MARKUP
-      );
-      const sig = await offchainSigner.signMessage(arrayify(hash));
-      const userOp = await fillAndSign(
-        {
-          ...userOp1,
-          paymasterAndData: ethers.utils.hexConcat([
-            paymasterAddress,
-            ethers.utils.hexlify(1).slice(0, 4),
-            encodePaymasterData(
-              token.address,
-              staleOracleAggregator.address,
-              MOCK_FX,
-              DEFAULT_FEE_MARKUP
-            ),
-            sig,
-          ]),
-        },
-        walletOwner,
-        entryPoint,
-        "nonce"
-      );
-
-      const signatureWithModuleAddress = ethers.utils.defaultAbiCoder.encode(
-        ["bytes", "address"],
-        [userOp.signature, ecdsaModule.address]
-      );
-
-      userOp.signature = signatureWithModuleAddress;
-
-      const { result: userOpHash } = await environment.sendUserOperation(
-        userOp,
-        entryPoint.address
-      );
-
-      const {
-        result: {
-          receipt: { transactionHash },
-        },
-      } = await environment.getUserOperationReceipt(userOpHash);
-      const receipt = await ethers.provider.getTransactionReceipt(
-        transactionHash
-      );
-
-      const ev = await getUserOpEvent(entryPoint);
-      expect(ev.args.success).to.be.true;
-
-      const BiconomyTokenPaymaster = await ethers.getContractFactory(
-        "BiconomyTokenPaymaster"
-      );
-
-      const eventLogs = BiconomyTokenPaymaster.interface.decodeEventLog(
-        "TokenPaymasterOperation",
-        receipt.logs[3].data
-      );
-
-      // Confirming that it's using backup (external) exchange rate in case oracle aggregator / price feed is stale / anything goes wrong
-      expect(eventLogs.exchangeRate.toString()).to.be.equal(MOCK_FX);
-
-      await expect(
-        entryPoint.handleOps([userOp], await offchainSigner.getAddress())
-      ).to.be.reverted;
-    });
-
     it("succeed with exchange rate based on prcie feed in case everything goes well", async () => {
       const userSCW: any = BiconomyAccountImplementation__factory.connect(
         walletAddress,