Merge pull request #24 from bcnmy/fix/tests-accounting-stackdeep

Fix/tests accounting stackdeep
bcnmy · Oct 15, 2024 · 061b152 · 061b152
2 parents 4062a45 + c53a0ea
commit 061b152
Show file tree

Hide file tree

Showing 25 changed files with 553 additions and 421 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,13 +8,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
          node-version: '22' # Specify the Node.js version you want to use  
 
       - name: Install dependencies
-        run: yarn cache clean && yarn install
+        run: pnpm install --ignore-scripts
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
@@ -25,7 +30,8 @@ jobs:
         run: forge install
 
       - name: Lint sources
-        run: yarn lint:sol
+        run: pnpm lint:sol
+        continue-on-error: true
 
   unit_test:
     name: Unit tests
@@ -34,8 +40,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
       - name: Install dependencies
-        run: yarn cache clean && yarn install
+        run: pnpm install --ignore-scripts
 
       - name: Create a fake .secret file
         run: echo "primary twist rack vendor diagram image used route theme frown either will" > .secret
@@ -49,7 +60,7 @@ jobs:
         run: forge install
 
       - name: Build Typechain and Foundry
-        run: yarn build
+        run: pnpm build
 
       - name: Run Forge Tests
-        run: yarn test
+        run: pnpm test
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -7,6 +7,11 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
 
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
@@ -16,7 +21,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y lcov
 
       - name: Install JavaScript Dependencies
-        run: yarn cache clean && yarn install
+        run: pnpm install --ignore-scripts
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
@@ -27,7 +32,7 @@ jobs:
         run: forge install
 
       - name: Generate Foundry Coverage Report
-        run: yarn coverage:report
+        run: pnpm coverage:report
 
       - name: Upload Foundry Coverage Report to Codecov
         uses: codecov/codecov-action@v3

diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+node-linker=hoisted
diff --git a/contracts/base/BasePaymaster.sol b/contracts/base/BasePaymaster.sol
@@ -17,13 +17,13 @@ import "account-abstraction/core/UserOperationLib.sol";
 abstract contract BasePaymaster is IPaymaster, SoladyOwnable {
     IEntryPoint public immutable entryPoint;
 
-    uint256 internal constant PAYMASTER_VALIDATION_GAS_OFFSET = UserOperationLib.PAYMASTER_VALIDATION_GAS_OFFSET;
-    uint256 internal constant PAYMASTER_POSTOP_GAS_OFFSET = UserOperationLib.PAYMASTER_POSTOP_GAS_OFFSET;
-    uint256 internal constant PAYMASTER_DATA_OFFSET = UserOperationLib.PAYMASTER_DATA_OFFSET;
+    uint256 internal constant _PAYMASTER_VALIDATION_GAS_OFFSET = UserOperationLib.PAYMASTER_VALIDATION_GAS_OFFSET;
+    uint256 internal constant _PAYMASTER_POSTOP_GAS_OFFSET = UserOperationLib.PAYMASTER_POSTOP_GAS_OFFSET;
+    uint256 internal constant _PAYMASTER_DATA_OFFSET = UserOperationLib.PAYMASTER_DATA_OFFSET;
 
-    constructor(address _owner, IEntryPoint _entryPoint) SoladyOwnable(_owner) {
-        _validateEntryPointInterface(_entryPoint);
-        entryPoint = _entryPoint;
+    constructor(address owner, IEntryPoint entryPointArg) SoladyOwnable(owner) {
+        _validateEntryPointInterface(entryPointArg);
+        entryPoint = entryPointArg;
     }
 
     /**
@@ -105,9 +105,9 @@ abstract contract BasePaymaster is IPaymaster, SoladyOwnable {
 
     //sanity check: make sure this EntryPoint was compiled against the same
     // IEntryPoint of this paymaster
-    function _validateEntryPointInterface(IEntryPoint _entryPoint) internal virtual {
+    function _validateEntryPointInterface(IEntryPoint entryPointArg) internal virtual {
         require(
-            IERC165(address(_entryPoint)).supportsInterface(type(IEntryPoint).interfaceId),
+            IERC165(address(entryPointArg)).supportsInterface(type(IEntryPoint).interfaceId),
             "IEntryPoint interface mismatch"
         );
     }
@@ -166,10 +166,10 @@ abstract contract BasePaymaster is IPaymaster, SoladyOwnable {
     /**
      * Check if address is a contract
      */
-    function _isContract(address _addr) internal view returns (bool) {
+    function _isContract(address addr) internal view returns (bool) {
         uint256 size;
         assembly ("memory-safe") {
-            size := extcodesize(_addr)
+            size := extcodesize(addr)
         }
         return size > 0;
     }

diff --git a/contracts/common/BiconomySponsorshipPaymasterErrors.sol b/contracts/common/BiconomySponsorshipPaymasterErrors.sol
@@ -76,4 +76,9 @@ contract BiconomySponsorshipPaymasterErrors {
      * @notice Throws when trying unaccountedGas is too high
      */
     error UnaccountedGasTooHigh();
+
+    /**
+     * @notice Throws when postOp gas limit is too low
+     */
+    error PostOpGasLimitTooLow();
 }
diff --git a/contracts/interfaces/IBiconomySponsorshipPaymaster.sol b/contracts/interfaces/IBiconomySponsorshipPaymaster.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.27;
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { PackedUserOperation } from "account-abstraction/core/UserOperationLib.sol";
 
-interface IBiconomySponsorshipPaymaster{
+interface IBiconomySponsorshipPaymaster {
     event UnaccountedGasChanged(uint256 indexed oldValue, uint256 indexed newValue);
     event FixedPriceMarkupChanged(uint256 indexed oldValue, uint256 indexed newValue);
     event VerifyingSignerChanged(address indexed oldSigner, address indexed newSigner, address indexed actor);
@@ -18,9 +18,9 @@ interface IBiconomySponsorshipPaymaster{
 
     function depositFor(address paymasterId) external payable;
 
-    function setSigner(address _newVerifyingSigner) external payable;
+    function setSigner(address newVerifyingSigner) external payable;
 
-    function setFeeCollector(address _newFeeCollector) external payable;
+    function setFeeCollector(address newFeeCollector) external payable;
 
     function setUnaccountedGas(uint256 value) external payable;
 
@@ -41,7 +41,9 @@ interface IBiconomySponsorshipPaymaster{
         view
         returns (bytes32);
 
-    function parsePaymasterAndData(bytes calldata paymasterAndData)
+    function parsePaymasterAndData(
+        bytes calldata paymasterAndData
+    )
         external
         pure
         returns (

diff --git a/contracts/interfaces/IBiconomyTokenPaymaster.sol b/contracts/interfaces/IBiconomyTokenPaymaster.sol
@@ -38,15 +38,15 @@ interface IBiconomyTokenPaymaster {
     event UpdatedTokenDirectory(address indexed tokenAddress, IOracle indexed oracle, uint8 decimals);
     event UpdatedNativeAssetOracle(IOracle indexed oldOracle, IOracle indexed newOracle);
 
-    function setSigner(address _newVerifyingSigner) external payable;
+    function setSigner(address newVerifyingSigner) external payable;
 
     function setUnaccountedGas(uint256 value) external payable;
 
-    function setPriceMarkup(uint256 _newUnaccountedGas) external payable;
+    function setPriceMarkup(uint256 newUnaccountedGas) external payable;
 
-    function setPriceExpiryDuration(uint256 _newPriceExpiryDuration) external payable;
+    function setPriceExpiryDuration(uint256 newPriceExpiryDuration) external payable;
 
-    function setNativeAssetToUsdOracle(IOracle _oracle) external payable;
+    function setNativeAssetToUsdOracle(IOracle oracle) external payable;
 
-    function updateTokenDirectory(address _tokenAddress, IOracle _oracle) external payable;
+    function updateTokenDirectory(address tokenAddress, IOracle oracle) external payable;
 }
diff --git a/contracts/interfaces/oracles/IOracle.sol b/contracts/interfaces/oracles/IOracle.sol
@@ -7,4 +7,4 @@ interface IOracle {
         external
         view
         returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound);
-}
+}
diff --git a/contracts/libraries/TokenPaymasterParserLib.sol b/contracts/libraries/TokenPaymasterParserLib.sol
@@ -9,7 +9,9 @@ library TokenPaymasterParserLib {
     // Start offset of mode in PND
     uint256 private constant PAYMASTER_MODE_OFFSET = UserOperationLib.PAYMASTER_DATA_OFFSET;
 
-    function parsePaymasterAndData(bytes calldata paymasterAndData)
+    function parsePaymasterAndData(
+        bytes calldata paymasterAndData
+    )
         external
         pure
         returns (IBiconomyTokenPaymaster.PaymasterMode mode, bytes memory modeSpecificData)
@@ -20,7 +22,9 @@ library TokenPaymasterParserLib {
         }
     }
 
-    function parseExternalModeSpecificData(bytes calldata modeSpecificData)
+    function parseExternalModeSpecificData(
+        bytes calldata modeSpecificData
+    )
         external
         pure
         returns (
@@ -40,7 +44,9 @@ library TokenPaymasterParserLib {
         signature = modeSpecificData[52:];
     }
 
-    function parseIndependentModeSpecificData(bytes calldata modeSpecificData)
+    function parseIndependentModeSpecificData(
+        bytes calldata modeSpecificData
+    )
         external
         pure
         returns (address tokenAddress)
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ interface IOracle { @@
             external
             view
             returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound);
-    }
+    }