Merge a586868 into 9540b68

pooltogether · Mar 11, 2022 · 9284840 · 9284840
2 parents 9540b68 + a586868
commit 9284840
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 17 deletions.
diff --git a/abis/TWABDelegator.json b/abis/TWABDelegator.json
@@ -728,11 +728,6 @@
   },
   {
     "inputs": [
-      {
-        "internalType": "address",
-        "name": "_from",
-        "type": "address"
-      },
       {
         "internalType": "uint256",
         "name": "_amount",

diff --git a/abis/TWABDelegatorHarness.json b/abis/TWABDelegatorHarness.json
@@ -752,11 +752,6 @@
   },
   {
     "inputs": [
-      {
-        "internalType": "address",
-        "name": "_from",
-        "type": "address"
-      },
       {
         "internalType": "uint256",
         "name": "_amount",

diff --git a/contracts/PermitAndMulticall.sol b/contracts/PermitAndMulticall.sol
@@ -42,20 +42,18 @@ contract PermitAndMulticall {
   /**
    * @notice Allow a user to approve an ERC20 token and run various calls in one transaction.
    * @param _permitToken Address of the ERC20 token
-   * @param _from Address of the sender
    * @param _amount Amount of tickets to approve
    * @param _permitSignature Permit signature
    * @param _data Datas to call with `functionDelegateCall`
    */
   function _permitAndMulticall(
     IERC20Permit _permitToken,
-    address _from,
     uint256 _amount,
     Signature calldata _permitSignature,
     bytes[] calldata _data
   ) internal {
     _permitToken.permit(
-      _from,
+      msg.sender,
       address(this),
       _amount,
       _permitSignature.deadline,

diff --git a/contracts/TWABDelegator.sol b/contracts/TWABDelegator.sol
@@ -432,18 +432,16 @@ contract TWABDelegator is ERC20, LowLevelDelegator, PermitAndMulticall {
 
   /**
    * @notice Alow a user to approve ticket and run various calls in one transaction.
-   * @param _from Address of the sender
    * @param _amount Amount of tickets to approve
    * @param _permitSignature Permit signature
    * @param _data Datas to call with `functionDelegateCall`
    */
   function permitAndMulticall(
-    address _from,
     uint256 _amount,
     Signature calldata _permitSignature,
     bytes[] calldata _data
   ) external {
-    _permitAndMulticall(IERC20Permit(address(ticket)), _from, _amount, _permitSignature, _data);
+    _permitAndMulticall(IERC20Permit(address(ticket)), _amount, _permitSignature, _data);
   }
 
   /**

diff --git a/test/TWABDelegator.test.ts b/test/TWABDelegator.test.ts
@@ -815,7 +815,6 @@ describe('Test Set Name', () => {
       );
 
       await twabDelegator.permitAndMulticall(
-        owner.address,
         amount,
         { v: signature.v, r: signature.r, s: signature.s, deadline: signature.deadline },
         [stakeTx.data, createDelegationTx.data],