Payroll: Add reentracy guard to payment transfers

aragon · Apr 7, 2019 · 740d2e4 · 740d2e4
1 parent 77261c8
commit 740d2e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/future-apps/payroll/contracts/Payroll.sol b/future-apps/payroll/contracts/Payroll.sol
@@ -687,7 +687,7 @@ contract Payroll is EtherTokenConstant, IForwarder, IsContract, AragonApp {
      * @param _type Payment type to be performed
      * @return True if there was at least one token transfer
      */
-    function _transferTokensAmount(uint256 _employeeId, PaymentType _type, uint256 _totalAmount) internal returns (bool somethingPaid) {
+    function _transferTokensAmount(uint256 _employeeId, PaymentType _type, uint256 _totalAmount) internal nonReentrant returns (bool somethingPaid) {
         Employee storage employee = employees[_employeeId];
         string memory paymentReference = _paymentReferenceFor(_type);
         for (uint256 i = 0; i < allowedTokensArray.length; i++) {

diff --git a/future-apps/payroll/test/contracts/Payroll_gas_costs.test.js b/future-apps/payroll/test/contracts/Payroll_gas_costs.test.js
@@ -42,13 +42,13 @@ contract('Payroll gas costs', ([owner, employee, anotherEmployee]) => {
     })
 
     context('when there are not allowed tokens yet', function () {
-      it('expends ~314k gas for a single allowed token', async () => {
+      it('expends ~325k gas for a single allowed token', async () => {
         await payroll.addAllowedToken(denominationToken.address)
         await payroll.determineAllocation([denominationToken.address], [100], { from: employee })
 
         const { receipt: { cumulativeGasUsed } } = await payroll.payday(PAYROLL_PAYMENT_TYPE, 0, { from: employee })
 
-        assert.isBelow(cumulativeGasUsed, 317000, 'payout gas cost for a single allowed token should be ~314k')
+        assert.isBelow(cumulativeGasUsed, 325000, 'payout gas cost for a single allowed token should be ~325k')
       })
     })