setup for the token paymaster

.gitmodules

@@ -4,3 +4,9 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/v3-periphery"]
+	path = lib/v3-periphery
+	url = https://github.com/Uniswap/v3-periphery
+[submodule "lib/v3-core"]
+	path = lib/v3-core
+	url = https://github.com/Uniswap/v3-core

contracts/common/BiconomyTokenPaymasterErrors.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: LGPL-3.0-only
+pragma solidity ^0.8.26;
+
+contract BiconomyTokenPaymasterErrors {
+
+}

contracts/interfaces/IBiconomyTokenPaymaster.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity ^0.8.26;
+
+interface IBiconomyTokenPaymaster {
+
+}

contracts/mocks/Imports.sol

@@ -3,8 +3,5 @@ pragma solidity ^0.8.26;
 
 /* solhint-disable reason-string */
 
-import "account-abstraction/contracts/core/EntryPoint.sol";
-import "account-abstraction/contracts/core/EntryPointSimulations.sol";
-
-import "@biconomy-devx/erc7579-msa/contracts/SmartAccount.sol";
-import "@biconomy-devx/erc7579-msa/contracts/factory/AccountFactory.sol";
+import "@account-abstraction/contracts/core/EntryPoint.sol";
+import "@account-abstraction/contracts/core/EntryPointSimulations.sol";

contracts/sponsorship/BiconomySponsorshipPaymaster.sol

@@ -8,7 +8,7 @@ import "@account-abstraction/contracts/core/UserOperationLib.sol";
 import "@account-abstraction/contracts/core/Helpers.sol";
 import { SignatureCheckerLib } from "@solady/src/utils/SignatureCheckerLib.sol";
 import { ECDSA as ECDSA_solady } from "@solady/src/utils/ECDSA.sol";
-import { BiconomySponsorshipPaymasterErrors } from "../common/Errors.sol";
+import { BiconomySponsorshipPaymasterErrors } from "../common/BiconomySponsorshipPaymasterErrors.sol";
 import { ReentrancyGuard } from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { SafeTransferLib } from "@solady/src/utils/SafeTransferLib.sol";

contracts/token/BiconomyTokenPaymaster.sol

@@ -1,17 +1,67 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.26;
 
-import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import { ECDSA as ECDSA_solady } from "@solady/src/utils/ECDSA.sol";
 import { ReentrancyGuard } from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
-import {IEntryPoint} from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
-import {UserOperationLib} from "@account-abstraction/contracts/core/UserOperationLib.sol";
-import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-import {BasePaymaster} from "../base/BasePaymaster.sol";
-import "@account-abstraction/contracts/core/Helpers.sol" as Helpers;
-import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
-import "@openzeppelin/contracts/utils/Address.sol";
+import { IEntryPoint } from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
+import { SignatureCheckerLib } from "@solady/src/utils/SignatureCheckerLib.sol";
+import { PackedUserOperation, UserOperationLib } from "@account-abstraction/contracts/core/UserOperationLib.sol";
+import { BasePaymaster } from "../base/BasePaymaster.sol";
+import { BiconomyTokenPaymasterErrors } from "../common/BiconomyTokenPaymasterErrors.sol";
+import { IBiconomyTokenPaymaster } from "../interfaces/IBiconomyTokenPaymaster.sol";
 
+contract BiconomyTokenPaymaster is
+    BasePaymaster,
+    ReentrancyGuard,
+    BiconomyTokenPaymasterErrors,
+    IBiconomyTokenPaymaster
+{
+    using UserOperationLib for PackedUserOperation;
+    using SignatureCheckerLib for address;
 
-contract BiconomyTokenPaymaster {
-
-}
+    constructor(
+        address _owner,
+        IEntryPoint _entryPoint
+    )
+        BasePaymaster(_owner, _entryPoint)
+    { }
+
+    /**
+     * @dev Validate a user operation.
+     * This method is abstract in BasePaymaster and must be implemented in derived contracts.
+     * @param userOp The user operation.
+     * @param userOpHash The hash of the user operation.
+     * @param maxCost The maximum cost of the user operation.
+     */
+    function _validatePaymasterUserOp(
+        PackedUserOperation calldata userOp,
+        bytes32 userOpHash,
+        uint256 maxCost
+    )
+        internal
+        override
+        returns (bytes memory context, uint256 validationData)
+    {
+        // Implementation of user operation validation logic
+    }
+
+    /**
+     * @dev Post-operation handler.
+     * This method is abstract in BasePaymaster and must be implemented in derived contracts.
+     * @param mode The mode of the post operation (opSucceeded, opReverted, or postOpReverted).
+     * @param context The context value returned by validatePaymasterUserOp.
+     * @param actualGasCost Actual gas used so far (excluding this postOp call).
+     * @param actualUserOpFeePerGas The gas price this UserOp pays.
+     */
+    function _postOp(
+        PostOpMode mode,
+        bytes calldata context,
+        uint256 actualGasCost,
+        uint256 actualUserOpFeePerGas
+    )
+        internal
+        override
+    {
+        // Implementation of post-operation logic
+    }
+}

contracts/utils/SoladyOwnable.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.26;
 
-import { Ownable } from "solady/src/auth/Ownable.sol";
+import { Ownable } from "@solady/src/auth/Ownable.sol";
 
 contract SoladyOwnable is Ownable {
     constructor(address _owner) Ownable() {

remappings.txt

@@ -2,6 +2,8 @@
 @prb/test/=node_modules/@prb/test/
 @nexus/=lib/nexus/
 @forge-std/=lib/forge-std/
+@uniswap/v3-periphery/=lib/v3-periphery
+@uniswap/v3-core/=lib/v3-core
 @account-abstraction=node_modules/account-abstraction/
 @modulekit/=node_modules/modulekit/src/
 @sentinellist/=node_modules/sentinellist/

test/foundry/base/BaseEventsAndErrors.sol → test/base/BaseEventsAndErrors.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.26;
 
 import { EventsAndErrors } from "nexus/test/foundry/utils/EventsAndErrors.sol";
-import { BiconomySponsorshipPaymasterErrors } from "./../../../contracts/common/Errors.sol";
+import { BiconomySponsorshipPaymasterErrors } from "./../../../contracts/common/BiconomySponsorshipPaymasterErrors.sol";
 
 contract BaseEventsAndErrors is EventsAndErrors, BiconomySponsorshipPaymasterErrors {
     // ==========================

test/foundry/base/TestBase.sol → test/base/TestBase.sol

@@ -528,6 +528,7 @@ abstract contract TestBase is CheatCodes, BaseEventsAndErrors {
         uint32 dynamicAdjustment
     )
         internal
+        view
     {
         (uint256 expectedDynamicAdjustment, uint256 actualDynamicAdjustment) = getDynamicAdjustments(
             bicoPaymaster, initialDappPaymasterBalance, initialFeeCollectorBalance, dynamicAdjustment