Merge 2ebe0bf into 4d2163e

pooltogether · Mar 2, 2022 · 089c1d2 · 089c1d2
2 parents 4d2163e + 2ebe0bf
commit 089c1d2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 20 deletions.
diff --git a/abis/Delegation.json b/abis/Delegation.json
@@ -8,11 +8,6 @@
             "name": "to",
             "type": "address"
           },
-          {
-            "internalType": "uint256",
-            "name": "value",
-            "type": "uint256"
-          },
           {
             "internalType": "bytes",
             "name": "data",

diff --git a/contracts/Delegation.sol b/contracts/Delegation.sol
@@ -9,10 +9,13 @@ pragma solidity 0.8.6;
  * @dev This contract will hold tickets that will be delegated to a chosen delegatee.
  */
 contract Delegation {
-  /// @notice A structure to define arbitrary contract calls.
+  /**
+   * @notice A structure to define arbitrary contract calls.
+   * @param to The address to call
+   * @param data The call data
+   */
   struct Call {
     address to;
-    uint256 value;
     bytes data;
   }
 
@@ -44,7 +47,7 @@ contract Delegation {
 
     for (uint256 i; i < _callsLength; i++) {
       call = calls[i];
-      response[i] = _executeCall(call.to, call.value, call.data);
+      response[i] = _executeCall(call.to, call.data);
     }
 
     return response;
@@ -61,16 +64,11 @@ contract Delegation {
   /**
    * @notice Executes a call to another contract.
    * @param to The address to call
-   * @param value The Ether to pass along with the call
    * @param data The call data
    * @return The return data from the call
    */
-  function _executeCall(
-    address to,
-    uint256 value,
-    bytes memory data
-  ) internal returns (bytes memory) {
-    (bool succeeded, bytes memory returnValue) = to.call{ value: value }(data);
+  function _executeCall(address to, bytes memory data) internal returns (bytes memory) {
+    (bool succeeded, bytes memory returnValue) = to.call{ value: 0 }(data);
     require(succeeded, string(returnValue));
     return returnValue;
   }

diff --git a/contracts/TWABDelegator.sol b/contracts/TWABDelegator.sol
@@ -558,7 +558,7 @@ contract TWABDelegator is ERC20, LowLevelDelegator, PermitAndMulticall {
     returns (bytes[] memory)
   {
     Delegation.Call[] memory _calls = new Delegation.Call[](1);
-    _calls[0] = Delegation.Call({ to: address(ticket), value: 0, data: _data });
+    _calls[0] = Delegation.Call({ to: address(ticket), data: _data });
 
     return _delegation.executeCalls(_calls);
   }

diff --git a/contracts/test/TWABDelegatorHarness.sol b/contracts/test/TWABDelegatorHarness.sol
@@ -16,7 +16,7 @@ contract TWABDelegatorHarness is TWABDelegator {
     returns (bytes[] memory)
   {
     Delegation.Call[] memory _calls = new Delegation.Call[](1);
-    _calls[0] = Delegation.Call({ to: address(ticket), value: 0, data: _data });
+    _calls[0] = Delegation.Call({ to: address(ticket), data: _data });
 
     return _delegation.executeCalls(_calls);
   }

diff --git a/test/TWABDelegator.test.ts b/test/TWABDelegator.test.ts
@@ -745,9 +745,9 @@ describe('Test Set Name', () => {
     });
 
     it('should fail to transfer tickets from a delegation if recipient is the contract address', async () => {
-      await expect(twabDelegator.transferDelegationTo(0, amount, twabDelegator.address)).to.be.revertedWith(
-        'TWABDelegator/to-not-this-addr',
-      );
+      await expect(
+        twabDelegator.transferDelegationTo(0, amount, twabDelegator.address),
+      ).to.be.revertedWith('TWABDelegator/to-not-this-addr');
     });
 
     it('should fail to transfer tickets from an inexistent delegation', async () => {