Merge branch 'develop' into features/SMA-314-fix-ci

.github/workflows/check_branch_name.yml

@@ -0,0 +1,18 @@
+name: Check Branch Name
+on:
+  create:
+
+jobs:
+  check-branch-name:
+    runs-on: ubuntu-latest
+    if: github.event.ref_type == 'branch' && !contains(github.ref, 'refs/heads/main') && !contains(github.ref, 'refs/heads/develop')
+    steps:
+      - name: Check Branch Name
+        run: |
+          BRANCH_PREFIX_REGEX="^(features/|fixes/|releases/).+"
+          BRANCH_NAME=${GITHUB_REF#refs/heads/}
+          if [[ ! $BRANCH_NAME =~ $BRANCH_PREFIX_REGEX ]]; then
+            echo "Invalid branch name: $BRANCH_NAME"
+            echo "Branch name must start with 'features/', 'fixes/', or 'releases/'."
+            exit 1
+          fi

.gitignore

@@ -11,6 +11,7 @@ forge-cache/
 typechain-types
 typechain
 typings
+yarn-error.log
 
 #Hardhat files
 cache

contracts/BasePaymaster.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.17;
+pragma solidity ^0.8.20;
 
 /* solhint-disable reason-string */
 

contracts/common/Errors.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity 0.8.17;
+pragma solidity ^0.8.20;
 
 contract BasePaymasterErrors {
     /**
@@ -20,6 +20,11 @@ contract VerifyingPaymasterErrors {
      */
     error VerifyingSignerCannotBeZero();
 
+    /**
+     * @notice Throws when the fee collector address provided is address(0)
+     */
+    error FeeCollectorCannotBeZero();
+
     /**
      * @notice Throws when the paymaster address provided is address(0)
      */

contracts/deployer/Create3.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Unlicense
-pragma solidity 0.8.17;
+pragma solidity ^0.8.20;
 
 /**
   @title A library for deploying contracts EIP-3171 style.

contracts/deployer/Deployer.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Unlicense
-pragma solidity 0.8.17;
+pragma solidity ^0.8.20;
 
 import "./Create3.sol";
 

contracts/interfaces/IWETH9.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity 0.8.17;
+pragma solidity ^0.8.20;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

contracts/interfaces/paymasters/IVerifyingSingletonPaymaster.sol

@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+interface IVerifyingSingletonPaymaster {
+    event EPGasOverheadChanged(
+        uint256 indexed _oldValue,
+        uint256 indexed _newValue
+    );
+
+    event FixedPriceMarkupChanged(
+        uint32 indexed _oldValue,
+        uint32 indexed _newValue
+    );
+
+    event VerifyingSignerChanged(
+        address indexed _oldSigner,
+        address indexed _newSigner,
+        address indexed _actor
+    );
+
+    event FeeCollectorChanged(
+        address indexed _oldFeeCollector,
+        address indexed _newFeeCollector,
+        address indexed _actor
+    );
+    event GasDeposited(address indexed _paymasterId, uint256 indexed _value);
+    event GasWithdrawn(
+        address indexed _paymasterId,
+        address indexed _to,
+        uint256 indexed _value
+    );
+    event GasBalanceDeducted(
+        address indexed _paymasterId,
+        uint256 indexed _charge
+    );
+    event PremiumCollected(
+        address indexed _paymasterId,
+        uint256 indexed _premium
+    );
+
+    /**
+     * @dev Returns the current balance of the paymasterId(aka fundingId)
+     * @param paymasterId The address of the paymasterId
+     */
+    function getBalance(
+        address paymasterId
+    ) external view returns (uint256 balance);
+
+    /**
+     * @dev updates the verifyingSigner address
+     * @param _newVerifyingSigner The new verifyingSigner address
+     */
+    function setSigner(address _newVerifyingSigner) external payable;
+
+    /**
+     * @dev updates the postOp + unacocunted gas overhead
+     * @param value The new value
+     */
+    function setUnaccountedEPGasOverhead(uint256 value) external payable;
+}

contracts/libs/MathLib.sol

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity ^0.8.20;
+
+library MathLib {
+    function minuint256(
+        uint256 a,
+        uint256 b
+    ) internal pure returns (uint256 result) {
+        assembly {
+            result := xor(b, mul(xor(b, a), gt(a, b)))
+        }
+    }
+
+    function maxuint256(
+        uint256 a,
+        uint256 b
+    ) internal pure returns (uint256 result) {
+        assembly {
+            result := xor(a, mul(xor(a, b), gt(b, a)))
+        }
+    }
+
+    function minuint32(
+        uint32 a,
+        uint32 b
+    ) internal pure returns (uint32 result) {
+        assembly {
+            result := xor(b, mul(xor(b, a), gt(a, b)))
+        }
+    }
+
+    function maxuint32(
+        uint32 a,
+        uint32 b
+    ) internal pure returns (uint32 result) {
+        assembly {
+            result := xor(a, mul(xor(a, b), gt(b, a)))
+        }
+    }
+}

contracts/references/AdvancedVerifyingPaymaster.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.20;
 
 import {IEntryPoint} from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
 import {UserOperation} from "@account-abstraction/contracts/interfaces/UserOperation.sol";

contracts/references/infinitism/OracleHelper.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.17;
+pragma solidity ^0.8.20;
 
 /* solhint-disable not-rely-on-time */
 

contracts/references/infinitism/SampleTokenPaymaster.sol

@@ -13,6 +13,8 @@ import "./OracleHelper.sol";
 
 // OG GSN same correlation https://github.com/opengsn/gsn/blob/master/packages/paymasters/contracts/TokenPaymaster.sol
 
+// TODO: Update with latest contract changes and make required modifications / variations
+
 // TODO: note https://github.com/pimlicolabs/erc20-paymaster-contracts/issues/10
 // TODO: set a hard limit on how much gas a single user op may cost (postOp to fix the price)
 /// @title Sample ERC-20 Token Paymaster for ERC-4337

contracts/references/infinitism/UniswapHelper.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.17;
+pragma solidity ^0.8.20;
 
 /* solhint-disable not-rely-on-time */
 

contracts/references/pimlico/IOracle.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.20;
 
 interface IOracle {
     function decimals() external view returns (uint8);

contracts/references/pimlico/PimlicoERC20Paymaster.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.17;
+pragma solidity ^0.8.20;
 
 // Import the required libraries and contracts
 import "@account-abstraction/contracts/core/BasePaymaster.sol";

contracts/references/soul/IPriceOracle.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.20;
 
 interface IPriceOracle {
     function exchangePrice(

contracts/references/soul/ITokenPaymaster.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.20;
 
 import "@account-abstraction/contracts/interfaces/IPaymaster.sol";
 import "@openzeppelin/contracts/utils/introspection/ERC165.sol";

contracts/references/soul/PriceOracle.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.20;
 
 import "./IPriceOracle.sol";
 import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";

contracts/references/soul/TokenPaymaster.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.20;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "./ITokenPaymaster.sol";