method to withdraw excess funds as discussed (plus extend test for 2n…

…d tx: temp)
bcnmy · Dec 11, 2023 · e383a65 · e383a65
1 parent ff71663
commit e383a65
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 1 deletion.
diff --git a/contracts/sponsorship/SponsorshipPaymaster.sol b/contracts/sponsorship/SponsorshipPaymaster.sol
@@ -51,6 +51,8 @@ contract SponsorshipPaymaster is
 
     address public feeCollector;
 
+    uint256 internal totalDeductables = 0;
+
     constructor(
         address _owner,
         IEntryPoint _entryPoint,
@@ -184,6 +186,14 @@ contract SponsorshipPaymaster is
         emit GasWithdrawn(msg.sender, withdrawAddress, amount);
     }
 
+    function withdrawExceessFunds(address payable withdrawAddress) public nonReentrant onlyOwner {
+        if (withdrawAddress == address(0)) revert CanNotWithdrawToZeroAddress();
+        uint256 excess = entryPoint.balanceOf(address(this)) - totalDeductables;
+        if (excess > 0) {
+            entryPoint.withdrawTo(withdrawAddress, excess);
+        }
+    }
+
     /**
      * @dev This method is called by the off-chain service, to sign the request.
      * It is called on-chain from the validatePaymasterUserOp, to validate the signature.
@@ -269,6 +279,8 @@ contract SponsorshipPaymaster is
             unaccountedEPGasOverhead *
             effectiveGasPrice;
 
+        totalDeductables += balToDeduct;
+
         uint256 costIncludingPremium = (balToDeduct * dynamicMarkup) /
             PRICE_DENOMINATOR;
 

diff --git a/test/sponsorship-paymaster/biconomy-sponsorship-paymaster-specs.ts b/test/sponsorship-paymaster/biconomy-sponsorship-paymaster-specs.ts
@@ -166,9 +166,10 @@ describe("EntryPoint with VerifyingPaymaster Singleton", function () {
     it("succeed with valid signature", async () => {
       const fundingId = await offchainSigner.getAddress();
 
+      // Review this is only ideal for first tx for a paymasterId
       await sponsorshipPaymaster
         .connect(deployer)
-        .setUnaccountedEPGasOverhead(35500);
+        .setUnaccountedEPGasOverhead(57735);
 
       await sponsorshipPaymaster.depositFor(fundingId, {
         value: ethers.utils.parseEther("1"),
@@ -291,6 +292,64 @@ describe("EntryPoint with VerifyingPaymaster Singleton", function () {
       expect(feeCollectorBalanceAfter).to.be.equal(
         paymasterIdBalanceDiff.mul(BigNumber.from(1)).div(BigNumber.from(11))
       );
+
+      // Second transaction same funding id
+      /* const userOp2 = await fillAndSign(
+        {
+          sender: walletAddress,
+          verificationGasLimit: 200000,
+        },
+        walletOwner,
+        entryPoint,
+        "nonce"
+      );
+
+      const hash2 = await sponsorshipPaymaster.getHash(
+        userOp2,
+        fundingId,
+        MOCK_VALID_UNTIL,
+        MOCK_VALID_AFTER,
+        dynamicMarkup
+      );
+      const sig2 = await offchainSigner.signMessage(arrayify(hash2));
+      const userOp3 = await fillAndSign(
+        {
+          ...userOp2,
+          paymasterAndData: hexConcat([
+            paymasterAddress,
+            ethers.utils.defaultAbiCoder.encode(
+              ["address", "uint48", "uint48", "uint32"],
+              [fundingId, MOCK_VALID_UNTIL, MOCK_VALID_AFTER, dynamicMarkup]
+            ),
+            sig2,
+          ]),
+        },
+        walletOwner,
+        entryPoint,
+        "nonce"
+      );
+
+      const signatureWithModuleAddress2 = ethers.utils.defaultAbiCoder.encode(
+        ["bytes", "address"],
+        [userOp3.signature, ecdsaModule.address]
+      );
+      userOp3.signature = signatureWithModuleAddress2;
+
+      const tx2 = await entryPoint.handleOps(
+        [userOp3],
+        await offchainSigner.getAddress(),
+        {
+          type: 2,
+          maxFeePerGas: userOp3.maxFeePerGas,
+          maxPriorityFeePerGas: userOp3.maxPriorityFeePerGas,
+        }
+      );
+      const receipt2 = await tx2.wait();
+      console.log(
+        "effective gas price ",
+        receipt2.effectiveGasPrice.toString()
+      );
+      console.log("gas used VPM V2 ", receipt2.gasUsed.toString()); */
     });
   });