Merge remote-tracking branch 'origin/develop' into pack-gas-fees

eth-infinitism · Jan 30, 2024 · ab583ea · ab583ea
2 parents 04dae1f + a4ecd20
commit ab583ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/contracts/samples/TokenPaymaster.sol b/contracts/samples/TokenPaymaster.sol
@@ -209,6 +209,7 @@ contract TokenPaymaster is BasePaymaster, UniswapHelper, OracleHelper {
  }
 
  function withdrawEth(address payable recipient, uint256 amount) external onlyOwner {
- recipient.call{value: amount}("");
+ (bool success,) = recipient.call{value: amount}("");
+ require(success, "withdraw failed");
  }
 }
diff --git a/reports/gas-checker.txt b/reports/gas-checker.txt
@@ -44,12 +44,12 @@
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ paymaster+postOp with diff │ 11 │ │ 42693 │ 13714 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ token paymaster │ 1 │ 128286 │ │ ║
+║ token paymaster │ 1 │ 128274 │ │ ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ token paymaster with diff │ 2 │ │ 65895 │ 36916 ║
+║ token paymaster with diff │ 2 │ │ 65883 │ 36904 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ token paymaster │ 10 │ 721594 │ │ ║
+║ token paymaster │ 10 │ 721582 │ │ ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ token paymaster with diff │ 11 │ │ 65915 │ 36936 ║
+║ token paymaster with diff │ 11 │ │ 65951 │ 36972 ║
 ╚════════════════════════════════╧═══════╧═══════════════╧════════════════╧═════════════════════╝
 
diff --git a/test/samples/TokenPaymaster.test.ts b/test/samples/TokenPaymaster.test.ts
@@ -145,8 +145,12 @@ describe('TokenPaymaster', function () {
  const impersonatedSigner = await ethers.getImpersonatedSigner('0x1234567890123456789012345678901234567890')
  const paymasterDifferentSigner = TokenPaymaster__factory.connect(paymasterAddress, impersonatedSigner)
 
+ // should revert for non owner
  await expect(paymasterDifferentSigner.withdrawEth(paymasterOwner, amount)).to.be.revertedWith('OwnableUnauthorizedAccount')
 
+ // should revert if the transfer fails
+ await expect(paymaster.withdrawEth(recipient, BigNumber.from(amount).mul(2))).to.be.revertedWith('withdraw failed')
+
  const recipientBalanceBefore = await ethers.provider.getBalance(recipient)
  await paymaster.withdrawEth(recipient, balanceAfter)
  const recipientBalanceAfter = await ethers.provider.getBalance(recipient)