Merge pull request #13 from bcnmy/fix/remap

Fix/remap
bcnmy · Oct 7, 2024 · 78646cb · 78646cb
2 parents acc0dca + c60ab42
commit 78646cb
Show file tree

Hide file tree

Showing 32 changed files with 150 additions and 93 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,18 +1,3 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/account-abstraction"]
-	path = lib/account-abstraction
-	url = https://github.com/eth-infinitism/account-abstraction
-[submodule "lib/nexus"]
-	path = lib/nexus
-	url = https://github.com/bcnmy/nexus
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/v3-core"]
-	path = lib/v3-core
-	url = https://github.com/Uniswap/v3-core
-[submodule "lib/v3-periphery"]
-	path = lib/v3-periphery
-	url = https://github.com/Uniswap/v3-periphery
diff --git a/.solhint.json b/.solhint.json
@@ -1,7 +1,7 @@
 {
   "extends": "solhint:recommended",
   "rules": {
-    "compiler-version": ["error", "^0.8.26"],
+    "compiler-version": ["error", "^0.8.27"],
     "func-visibility": ["warn", { "ignoreConstructors": true }],
     "reentrancy": "error",
     "state-visibility": "error",

diff --git a/contracts/base/BasePaymaster.sol b/contracts/base/BasePaymaster.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 /* solhint-disable reason-string */
 
 import { SoladyOwnable } from "../utils/SoladyOwnable.sol";
 import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import { IPaymaster } from "@account-abstraction/contracts/interfaces/IPaymaster.sol";
-import { IEntryPoint } from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
-import "@account-abstraction/contracts/core/UserOperationLib.sol";
+import { IPaymaster } from "account-abstraction/interfaces/IPaymaster.sol";
+import { IEntryPoint } from "account-abstraction/interfaces/IEntryPoint.sol";
+import "account-abstraction/core/UserOperationLib.sol";
 /**
  * Helper class for creating a paymaster.
  * provides helper methods for staking.

diff --git a/contracts/common/BiconomySponsorshipPaymasterErrors.sol b/contracts/common/BiconomySponsorshipPaymasterErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 contract BiconomySponsorshipPaymasterErrors {
     /**

diff --git a/contracts/common/BiconomyTokenPaymasterErrors.sol b/contracts/common/BiconomyTokenPaymasterErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 contract BiconomyTokenPaymasterErrors {
     /**

diff --git a/contracts/interfaces/IBiconomySponsorshipPaymaster.sol b/contracts/interfaces/IBiconomySponsorshipPaymaster.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { PackedUserOperation } from "@account-abstraction/contracts/core/UserOperationLib.sol";
+import { PackedUserOperation } from "account-abstraction/core/UserOperationLib.sol";
 
 interface IBiconomySponsorshipPaymaster{
     event UnaccountedGasChanged(uint256 indexed oldValue, uint256 indexed newValue);

diff --git a/contracts/interfaces/IBiconomyTokenPaymaster.sol b/contracts/interfaces/IBiconomyTokenPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 import { IOracle } from "./oracles/IOracle.sol";
 

diff --git a/contracts/libraries/TokenPaymasterParserLib.sol b/contracts/libraries/TokenPaymasterParserLib.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 import { IBiconomyTokenPaymaster } from "../interfaces/IBiconomyTokenPaymaster.sol";
-import "@account-abstraction/contracts/core/UserOperationLib.sol";
+import "account-abstraction/core/UserOperationLib.sol";
 
 // A helper library to parse paymaster and data
 library TokenPaymasterParserLib {

diff --git a/contracts/mocks/Imports.sol b/contracts/mocks/Imports.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 /* solhint-disable reason-string */
 
-import "@account-abstraction/contracts/core/EntryPoint.sol";
-import "@account-abstraction/contracts/core/EntryPointSimulations.sol";
+import "account-abstraction/core/EntryPoint.sol";
+import "account-abstraction/core/EntryPointSimulations.sol";
diff --git a/contracts/mocks/MockValidator.sol b/contracts/mocks/MockValidator.sol
@@ -1,3 +1,3 @@
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
-import "@biconomy-devx/erc7579-msa/test/foundry/mocks/MockValidator.sol";
+// import "nexus";
diff --git a/contracts/references/SampleTokenPaymaster.sol b/contracts/references/SampleTokenPaymaster.sol
@@ -6,11 +6,11 @@ import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 
-import "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
-import "@account-abstraction/contracts/core/BasePaymaster.sol";
-import "@account-abstraction/contracts/core/Helpers.sol";
-import "@account-abstraction/contracts/samples/utils/UniswapHelper.sol";
-import "@account-abstraction/contracts/samples/utils/OracleHelper.sol";
+import "account-abstraction/interfaces/IEntryPoint.sol";
+import "account-abstraction/core/BasePaymaster.sol";
+import "account-abstraction/core/Helpers.sol";
+import "account-abstraction/samples/utils/UniswapHelper.sol";
+import "account-abstraction/samples/utils/OracleHelper.sol";
 
 /// @title Sample ERC-20 Token Paymaster for ERC-4337
 /// This Paymaster covers gas fees in exchange for ERC20 tokens charged using allowance pre-issued by ERC-4337 accounts.

diff --git a/contracts/sponsorship/BiconomySponsorshipPaymaster.sol b/contracts/sponsorship/BiconomySponsorshipPaymaster.sol
@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 /* solhint-disable reason-string */
 
 import "../base/BasePaymaster.sol";
-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 "account-abstraction/core/UserOperationLib.sol";
+import "account-abstraction/core/Helpers.sol";
+import { SignatureCheckerLib } from "solady/utils/SignatureCheckerLib.sol";
+import { ECDSA as ECDSA_solady } from "solady/utils/ECDSA.sol";
 import { BiconomySponsorshipPaymasterErrors } from "../common/BiconomySponsorshipPaymasterErrors.sol";
 import { ReentrancyGuardTransient } from "@openzeppelin/contracts/utils/ReentrancyGuardTransient.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { SafeTransferLib } from "@solady/src/utils/SafeTransferLib.sol";
+import { SafeTransferLib } from "solady/utils/SafeTransferLib.sol";
 import { IBiconomySponsorshipPaymaster } from "../interfaces/IBiconomySponsorshipPaymaster.sol";
 
 /**

diff --git a/contracts/token/BiconomyTokenPaymaster.sol b/contracts/token/BiconomyTokenPaymaster.sol
@@ -1,20 +1,20 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 import { ReentrancyGuardTransient } from "@openzeppelin/contracts/utils/ReentrancyGuardTransient.sol";
-import { IEntryPoint } from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
-import { PackedUserOperation, UserOperationLib } from "@account-abstraction/contracts/core/UserOperationLib.sol";
+import { IEntryPoint } from "account-abstraction/interfaces/IEntryPoint.sol";
+import { PackedUserOperation, UserOperationLib } from "account-abstraction/core/UserOperationLib.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import { SafeTransferLib } from "@solady/src/utils/SafeTransferLib.sol";
+import { SafeTransferLib } from "solady/utils/SafeTransferLib.sol";
 import { BasePaymaster } from "../base/BasePaymaster.sol";
 import { BiconomyTokenPaymasterErrors } from "../common/BiconomyTokenPaymasterErrors.sol";
 import { IBiconomyTokenPaymaster } from "../interfaces/IBiconomyTokenPaymaster.sol";
 import { IOracle } from "../interfaces/oracles/IOracle.sol";
 import { TokenPaymasterParserLib } from "../libraries/TokenPaymasterParserLib.sol";
-import { SignatureCheckerLib } from "@solady/src/utils/SignatureCheckerLib.sol";
-import { ECDSA as ECDSA_solady } from "@solady/src/utils/ECDSA.sol";
-import "@account-abstraction/contracts/core/Helpers.sol";
+import { SignatureCheckerLib } from "solady/utils/SignatureCheckerLib.sol";
+import { ECDSA as ECDSA_solady } from "solady/utils/ECDSA.sol";
+import "account-abstraction/core/Helpers.sol";
 import "./swaps/Uniswapper.sol";
 
 /**
@@ -35,6 +35,9 @@ import "./swaps/Uniswapper.sol";
  * applied, and how
  * to manage the assets received by the paymaster.
  */
+
+// TODO: Review unnecessary overrides
+
 contract BiconomyTokenPaymaster is
     IBiconomyTokenPaymaster,
     BasePaymaster,
@@ -278,7 +281,7 @@ contract BiconomyTokenPaymaster is
      * @param _oracle The new native asset oracle
      * @notice only to be called by the owner of the contract.
      */
-    function setNativeAssetToUsdOracle(IOracle _oracle) external payable override onlyOwner {
+    function setNativeAssetToUsdOracle(IOracle _oracle) external payable onlyOwner {
         if (_oracle.decimals() != 8) {
             // Native -> USD will always have 8 decimals
             revert InvalidOracleDecimals();

diff --git a/contracts/token/oracles/TwapOracle.sol b/contracts/token/oracles/TwapOracle.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 import {IOracle} from "../../interfaces/oracles/IOracle.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {OracleLibrary} from "@uniswap/v3-periphery/contracts/libraries/OracleLibrary.sol";
-import {IUniswapV3PoolImmutables} from "@uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolImmutables.sol";
+import {OracleLibrary} from "@uniswap/v3-periphery/libraries/OracleLibrary.sol";
+import {IUniswapV3PoolImmutables} from "@uniswap/v3-core/interfaces/pool/IUniswapV3PoolImmutables.sol";
 
 
 contract TwapOracle is IOracle {

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

diff --git a/foundry.toml b/foundry.toml
@@ -10,7 +10,7 @@
   optimizer_runs = 1_000_000
   out = "out"
   script = "scripts"
-  solc = "0.8.26"
+  solc = "0.8.27"
   src = "contracts"
   test = "test"
   cache_path  = "cache_forge"

diff --git a/lib/account-abstraction b/lib/account-abstraction
diff --git a/lib/nexus b/lib/nexus
diff --git a/lib/nexus/contracts/mocks/MockValidator.sol b/lib/nexus/contracts/mocks/MockValidator.sol
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.27;
+
+import { IModule } from "../interfaces/modules/IModule.sol";
+import { IValidator } from "../interfaces/modules/IValidator.sol";
+import { IModuleManager } from "../interfaces/base/IModuleManager.sol";
+import { VALIDATION_SUCCESS, VALIDATION_FAILED, MODULE_TYPE_VALIDATOR, ERC1271_MAGICVALUE, ERC1271_INVALID } from "../types/Constants.sol";
+import { PackedUserOperation } from "account-abstraction/contracts/interfaces/PackedUserOperation.sol";
+import { ECDSA } from "solady/utils/ECDSA.sol";
+import { SignatureCheckerLib } from "solady/utils/SignatureCheckerLib.sol";
+import { MessageHashUtils } from "@openzeppelin/contracts/contracts/utils/cryptography/MessageHashUtils.sol";
+
+contract MockValidator is IValidator {
+    mapping(address => address) public smartAccountOwners;
+
+    function validateUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash) external view returns (uint256 validation) {
+        return
+            ECDSA.recover(MessageHashUtils.toEthSignedMessageHash(userOpHash), userOp.signature) == smartAccountOwners[msg.sender]
+                ? VALIDATION_SUCCESS
+                : VALIDATION_FAILED;
+    }
+
+    function isValidSignatureWithSender(address, bytes32 hash, bytes calldata signature) external view returns (bytes4) {
+        address owner = smartAccountOwners[msg.sender];
+        // MAYBE SHOULD PREPARE REPLAY RESISTANT HASH BY APPENDING MSG.SENDER
+        // SEE: https://github.com/bcnmy/scw-contracts/blob/3362262dab34fa0f57e2fbe0e57a4bdbd5318165/contracts/smart-account/modules/EcdsaOwnershipRegistryModule.sol#L122-L132
+        // OR USE EIP-712
+        if (SignatureCheckerLib.isValidSignatureNowCalldata(owner, hash, signature)) {
+            return ERC1271_MAGICVALUE;
+        }
+        if (SignatureCheckerLib.isValidSignatureNowCalldata(owner, MessageHashUtils.toEthSignedMessageHash(hash), signature)) {
+            return ERC1271_MAGICVALUE;
+        }
+        return ERC1271_INVALID;
+    }
+
+    function onInstall(bytes calldata data) external {
+        require(IModuleManager(msg.sender).isModuleInstalled(MODULE_TYPE_VALIDATOR, address(this), ""), "Validator is still installed");
+        smartAccountOwners[msg.sender] = address(bytes20(data));
+    }
+
+    function onUninstall(bytes calldata data) external {
+        data;
+        require(!IModuleManager(msg.sender).isModuleInstalled(MODULE_TYPE_VALIDATOR, address(this), ""), "Validator is still installed");
+        delete smartAccountOwners[msg.sender];
+    }
+
+    function isModuleType(uint256 moduleTypeId) external pure returns (bool) {
+        return moduleTypeId == MODULE_TYPE_VALIDATOR;
+    }
+
+    function isOwner(address account, address owner) external view returns (bool) {
+        return smartAccountOwners[account] == owner;
+    }
+
+    function isInitialized(address) external pure returns (bool) {
+        return false;
+    }
+
+    function getOwner(address account) external view returns (address) {
+        return smartAccountOwners[account];
+    }
+}
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/v3-core b/lib/v3-core
diff --git a/lib/v3-periphery b/lib/v3-periphery
diff --git a/package.json b/package.json
@@ -8,11 +8,16 @@
   },
   "dependencies": {
     "@biconomy-devx/erc7579-msa": "^0.0.4",
-    "@openzeppelin/contracts": "^5.0.1"
+    "@uniswap/v3-core": "https://github.com/Uniswap/v3-core#0.8",
+    "@uniswap/v3-periphery": "https://github.com/Uniswap/v3-periphery#0.8",
+    "accountabstraction": "https://github.com/eth-infinitism/account-abstraction#develop",
+    "excessively-safe-call": "github:nomad-xyz/ExcessivelySafeCall",
+    "nexus": "https://github.com/bcnmy/nexus#dev"
   },
   "devDependencies": {
     "@bonadocs/docgen": "^1.0.1-alpha.1",
     "@ethersproject/abstract-provider": "^5.7.0",
+    "@openzeppelin": "https://github.com/OpenZeppelin/openzeppelin-contracts/",
     "@prb/test": "^0.6.4",
     "@typechain/ethers-v6": "^0.5.1",
     "@types/chai": "^4.3.11",

diff --git a/remappings.txt b/remappings.txt
@@ -1,11 +1,17 @@
-@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
+@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
+@openzeppelin/contracts/contracts/=node_modules/@openzeppelin/contracts/
 @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=lib/account-abstraction/
-account-abstraction=lib/account-abstraction/
+@nexus/=node_modules/nexus/
+forge-std/=lib/forge-std/src/
+account-abstraction/=node_modules/account-abstraction/contracts/
 @modulekit/=node_modules/modulekit/src/
-@sentinellist/=node_modules/sentinellist/
-@solady/=node_modules/solady/
+sentinellist/=node_modules/sentinellist/src/
+solady/=node_modules/solady/src/
+@uniswap/v3-periphery/=node_modules/@uniswap/v3-periphery/contracts
+@uniswap/v3-core/=node_modules/@uniswap/v3-core/contracts/
+
+@uniswap/v3-periphery/contracts/=node_modules/@uniswap/v3-periphery/contracts
+@uniswap/v3-core/contracts/=node_modules/@uniswap/v3-core/contracts/
+
+solady/src/=node_modules/solady/src/
+excessively-safe-call/=node_modules/excessively-safe-call/src/
diff --git a/scripts/foundry/Base.s.sol b/scripts/foundry/Base.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.23 <0.9.0;
 
-import { Script } from "forge-std/src/Script.sol";
+import { Script } from "forge-std/Script.sol";
 
 abstract contract BaseScript is Script {
     /// @dev Included to enable compilation of the script without a $MNEMONIC environment variable.

diff --git a/test/base/BaseEventsAndErrors.sol b/test/base/BaseEventsAndErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicensed
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 import { EventsAndErrors } from "@nexus/test/foundry/utils/EventsAndErrors.sol";
 import { BiconomySponsorshipPaymasterErrors } from "../../contracts/common/BiconomySponsorshipPaymasterErrors.sol";

diff --git a/test/base/TestBase.sol b/test/base/TestBase.sol
@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
-import { Test } from "forge-std/src/Test.sol";
-import { Vm } from "forge-std/src/Vm.sol";
+import { Test } from "forge-std/Test.sol";
+import { Vm } from "forge-std/Vm.sol";
 
-import "@solady/src/utils/ECDSA.sol";
+import "solady/utils/ECDSA.sol";
 import "./TestHelper.sol";
 
-import { IAccount } from "@account-abstraction/contracts/interfaces/IAccount.sol";
-import { Exec } from "@account-abstraction/contracts/utils/Exec.sol";
-import { IPaymaster } from "@account-abstraction/contracts/interfaces/IPaymaster.sol";
+import { IAccount } from "account-abstraction/interfaces/IAccount.sol";
+import { Exec } from "account-abstraction/utils/Exec.sol";
+import { IPaymaster } from "account-abstraction/interfaces/IPaymaster.sol";
 
 import { Nexus } from "@nexus/contracts/Nexus.sol";
 import { CheatCodes } from "@nexus/test/foundry/utils/CheatCodes.sol";