fix(protocol): use safeTransferFrom (TKO-09) (#15567)

taikoxyz · Jan 26, 2024 · 30d771c · 30d771c
1 parent 8c4b48e
commit 30d771c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/packages/protocol/contracts/team/TimelockTokenPool.sol b/packages/protocol/contracts/team/TimelockTokenPool.sol
@@ -186,7 +186,7 @@ contract TimelockTokenPool is EssentialContract {
         totalCostPaid += costToWithdraw;
 
         IERC20(taikoToken).transferFrom(sharedVault, to, amountToWithdraw);
-        IERC20(costToken).transferFrom(recipient, sharedVault, costToWithdraw);
+        IERC20(costToken).safeTransferFrom(recipient, sharedVault, costToWithdraw);
 
         emit Withdrawn(recipient, to, amountToWithdraw, costToWithdraw);
     }

diff --git a/packages/protocol/contracts/team/airdrop/ERC20Airdrop.sol b/packages/protocol/contracts/team/airdrop/ERC20Airdrop.sol
@@ -14,7 +14,7 @@
 
 pragma solidity 0.8.20;
 
-import "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";
+import "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import "./MerkleClaimable.sol";
 
 /// @title ERC20Airdrop
@@ -43,6 +43,6 @@ contract ERC20Airdrop is MerkleClaimable {
 
     function _claimWithData(bytes calldata data) internal override {
         (address user, uint256 amount) = abi.decode(data, (address, uint256));
-        IERC20Upgradeable(token).transferFrom(vault, user, amount);
+        IERC20(token).transferFrom(vault, user, amount);
     }
 }
diff --git a/packages/protocol/contracts/team/airdrop/ERC20Airdrop2.sol b/packages/protocol/contracts/team/airdrop/ERC20Airdrop2.sol
@@ -14,7 +14,7 @@
 
 pragma solidity 0.8.20;
 
-import "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";
+import "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import "../../libs/LibMath.sol";
 import "./MerkleClaimable.sol";
 
@@ -71,7 +71,7 @@ contract ERC20Airdrop2 is MerkleClaimable {
     function withdraw(address user) external ongoingWithdrawals {
         (, uint256 amount) = getBalance(user);
         withdrawnAmount[user] += amount;
-        IERC20Upgradeable(token).transferFrom(vault, user, amount);
+        IERC20(token).transferFrom(vault, user, amount);
 
         emit Withdrawn(user, amount);
     }

diff --git a/packages/protocol/contracts/tokenvault/ERC721Vault.sol b/packages/protocol/contracts/tokenvault/ERC721Vault.sol
@@ -234,7 +234,7 @@ contract ERC721Vault is BaseNFTVault, IERC721ReceiverUpgradeable {
                 });
 
                 for (uint256 i; i < op.tokenIds.length; ++i) {
-                    t.transferFrom(user, address(this), op.tokenIds[i]);
+                    t.safeTransferFrom(user, address(this), op.tokenIds[i]);
                 }
             }
         }

diff --git a/packages/protocol/contracts/tokenvault/adaptors/USDCAdaptor.sol b/packages/protocol/contracts/tokenvault/adaptors/USDCAdaptor.sol
@@ -19,7 +19,7 @@ import "../BridgedERC20Base.sol";
 interface IUSDC {
     function burn(uint256 amount) external;
     function mint(address to, uint256 amount) external;
-    function transferFrom(address from, address to, uint256 amount) external;
+    function transferFrom(address from, address to, uint256 value) external returns (bool);
 }
 
 /// @title USDCAdaptor
-Original file line number
+Diff line change
@@ Expand Up @@
                     });
                     for (uint256 i; i < op.tokenIds.length; ++i) {
-                        t.transferFrom(user, address(this), op.tokenIds[i]);
+                        t.safeTransferFrom(user, address(this), op.tokenIds[i]);
                     }
                 }
             }
@@ Expand Down @@