Index first parameter of match and claim events in Voucher contract

CHANGELOG.md

@@ -1,9 +1,9 @@
 # Changelog
 
 ## vNEXT
+- Index first parameter of match an claim events in `Voucher` contract. (#61, #72)
 - Add upgrade workflow. (#64)
 - Add Halborn "Poco v5.5 & Voucher v1.0" audit report ( #70)
-- Add `dealId` to `TaskClaimedWithVoucher` event. (#61)
 - Add type-checking script (#53)
 - Run partial upgrade tests on fork.
     - Should maintain consistent voucher addresses (#61)

contracts/beacon/IVoucher.sol

@@ -11,7 +11,7 @@ interface IVoucher {
     event AccountUnauthorized(address indexed account);
     event OrdersMatchedWithVoucher(bytes32 indexed dealId);
     event OrdersBoostMatchedWithVoucher(bytes32 indexed dealId);
-    event TaskClaimedWithVoucher(bytes32 indexed taskId, bytes32 indexed dealId);
+    event TaskClaimedWithVoucher(bytes32 indexed taskId);
 
     function setExpiration(uint256 expiration) external;
     function authorizeAccount(address account) external;

contracts/beacon/Voucher.sol

@@ -40,13 +40,13 @@
     }
 
     modifier onlyOwner() {
         require(msg.sender == owner(), "Voucher: sender is not owner");
         _;
     }
 
     modifier onlyAuthorized() {
         VoucherStorage storage $ = _getVoucherStorage();
         require(
             msg.sender == owner() || $._authorizedAccounts[msg.sender],
             "Voucher: sender is not authorized"
         );
@@ -55,17 +55,17 @@
 
     modifier onlyVoucherHub() {
         VoucherStorage storage $ = _getVoucherStorage();
         require(msg.sender == $._voucherHub, "Voucher: sender is not VoucherHub");
         _;
     }
 
     modifier onlyNotExpired() {
         require(block.timestamp < getExpiration(), "Voucher: voucher is expired");
         _;
     }
 
     modifier onlyExpired() {
         require(getExpiration() <= block.timestamp, "Voucher: voucher is not expired");
         _;
     }
 
@@ -214,8 +214,7 @@
         if (task.status != IexecLibCore_v5.TaskStatusEnum.FAILED) {
             IexecPoco2(iexecPoco).claim(taskId);
         }
-        bytes32 dealId = task.dealid;
-        IexecLibCore_v5.Deal memory deal = IexecPocoAccessors(iexecPoco).viewDeal(dealId);
+        IexecLibCore_v5.Deal memory deal = IexecPocoAccessors(iexecPoco).viewDeal(task.dealid);
         // If the deal was matched by the voucher, then the voucher should be refunded.
         // If the deal was partially or not sponsored by the voucher, then the requester
         // should be refunded.
@@ -230,7 +229,7 @@
                 deal.requester
             );
         }
-        emit TaskClaimedWithVoucher(taskId, dealId);
+        emit TaskClaimedWithVoucher(taskId);
     }
 
     /**
@@ -263,7 +262,7 @@
                 deal.requester
             );
         }
-        emit TaskClaimedWithVoucher(taskId, dealId);
+        emit TaskClaimedWithVoucher(taskId);
     }
 
     /**
@@ -277,7 +276,7 @@
         //
         // msg.sender is the VoucherHub. No need to read the address from storage.
         if (!IERC20(IVoucherHub(msg.sender).getIexecPoco()).transfer(msg.sender, amount)) {
             revert("Voucher: drain failed");
         }
     }
 
@@ -357,7 +356,7 @@
      * @param isAuthorized Whether to authorize or unauthorize the account.
      */
     function _setAccountAuthorization(address account, bool isAuthorized) private {
         require(account != owner(), "Voucher: owner is already authorized.");
         VoucherStorage storage $ = _getVoucherStorage();
         $._authorizedAccounts[account] = isAuthorized;
     }

docs/IVoucher.md

@@ -35,7 +35,7 @@ event OrdersBoostMatchedWithVoucher(bytes32 dealId)
 ### TaskClaimedWithVoucher
 
 ```solidity
-event TaskClaimedWithVoucher(bytes32 taskId, bytes32 dealId)
+event TaskClaimedWithVoucher(bytes32 taskId)
 ```
 
 ### setExpiration

package.json

@@ -35,11 +35,8 @@
     "lint": "solhint 'contracts/**/*.sol' --fix && eslint . --fix"
   },
   "lint-staged": {
-    "*.ts": [
-      "npm run lint:ts"
-    ],
-    "*.sol": [
-      "npm run lint:sol"
+    "*.{ts,sol}": [
+      "npm run lint"
     ]
   },
   "devDependencies": {

scripts/voucherHubUtils.ts

@@ -89,6 +89,6 @@ export async function getExpectedVoucherProxyCodeHash(voucherBeaconAddress: stri
          *
          * Also see test/NextVersionUpgrade.test.ts to double check behavior.
          */
-        return '0x31a4f4707138270dd34b040129096c67e1039fb242deebb8a0d0f8ed9da82232';
+        return '0x1904181fa3fbe85a0796789e46d9ee31e5585fbdbabce28931332862d68c9313';
     }
 }

test/beacon/Voucher.test.ts

@@ -769,7 +769,7 @@ describe('Voucher', function () {
                     .to.emit(voucherHub, 'VoucherRefunded')
                     .withArgs(voucherAddress, taskSponsoredAmount)
                     .to.emit(voucherAsOwner, 'TaskClaimedWithVoucher')
-                    .withArgs(taskId, dealId);
+                    .withArgs(taskId);
                 const {
                     voucherCreditBalance: voucherCreditBalancePostClaim,
                     voucherSrlcBalance: voucherSrlcBalancePostClaim,