Use OZ safeTransfer in genericTransfer (#9025)

* Use OZ safeTransfer in genericTransfer * Add unit test for safeTransfer revert
celo-org · Nov 30, 2021 · 2538345 · 2538345
1 parent d196b00
commit 2538345
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/packages/protocol/contracts/governance/ReleaseGold.sol b/packages/protocol/contracts/governance/ReleaseGold.sol
@@ -2,6 +2,7 @@ pragma solidity ^0.5.13;
 
 import "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
+import "openzeppelin-solidity/contracts/token/ERC20/SafeERC20.sol";
 import "openzeppelin-solidity/contracts/utils/Address.sol";
 
 import "./interfaces/IReleaseGold.sol";
@@ -191,7 +192,7 @@ contract ReleaseGold is UsingRegistry, ReentrancyGuard, IReleaseGold, Initializa
       erc20 != registry.getAddressForOrDie(GOLD_TOKEN_REGISTRY_ID),
       "Transfer must not target celo balance"
     );
-    IERC20(erc20).transfer(to, value);
+    SafeERC20.safeTransfer(IERC20(erc20), to, value);
   }
 
   /**

diff --git a/packages/protocol/test/governance/voting/release_gold.ts b/packages/protocol/test/governance/voting/release_gold.ts
@@ -324,6 +324,21 @@ contract('ReleaseGold', (accounts: string[]) => {
       assertEqualBN(endBalanceTo, startBalanceTo.plus(transferAmount))
     })
 
+    it('should emit safeTransfer logs on erc20 revert', async () => {
+      const startBalanceFrom = await mockStableToken.balanceOf(releaseGoldInstance.address)
+      await assertRevert(
+        releaseGoldInstance.genericTransfer(
+          mockStableToken.address,
+          receiver,
+          startBalanceFrom.plus(1),
+          {
+            from: beneficiary,
+          }
+        ),
+        'SafeERC20: ERC20 operation did not succeed'
+      )
+    })
+
     it('should revert when attempting transfer of goldtoken from the release gold instance', async () => {
       await assertRevert(
         releaseGoldInstance.genericTransfer(goldTokenInstance.address, receiver, transferAmount, {