bring deposit handler and token back to the same as v2.1.0

axelarnetwork · May 9, 2022 · e36becd · e36becd
1 parent 55d3555
commit e36becd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/DepositHandler.sol b/src/DepositHandler.sol
@@ -16,11 +16,7 @@ contract DepositHandler {
         _lockedStatus = IS_NOT_LOCKED;
     }
 
-    function execute(address callee, bytes calldata data)
-        external
-        noReenter
-        returns (bool success, bytes memory returnData)
-    {
+    function execute(address callee, bytes calldata data) external noReenter returns (bool success, bytes memory returnData) {
         (success, returnData) = callee.call(data);
     }
 

diff --git a/src/MintableCappedERC20.sol b/src/MintableCappedERC20.sol
@@ -2,13 +2,11 @@
 
 pragma solidity 0.8.9;
 
-import { IERC20BurnFrom } from './interfaces/IERC20BurnFrom.sol';
-
 import { ERC20 } from './ERC20.sol';
 import { ERC20Permit } from './ERC20Permit.sol';
 import { Ownable } from './Ownable.sol';
 
-contract MintableCappedERC20 is ERC20, ERC20Permit, Ownable, IERC20BurnFrom {
+contract MintableCappedERC20 is ERC20, ERC20Permit, Ownable {
     uint256 public cap;
 
     constructor(
@@ -28,7 +26,7 @@ contract MintableCappedERC20 is ERC20, ERC20Permit, Ownable, IERC20BurnFrom {
     }
 
     // TODO move burnFrom into a separate BurnableERC20 contract
-    function burnFrom(address account, uint256 amount) external onlyOwner {
+    function burnFrom(address account, uint256 amount) public onlyOwner {
         _approve(account, owner, allowance[account][owner] - amount);
         _burn(account, amount);
     }

diff --git a/waffle.json b/waffle.json
@@ -5,9 +5,12 @@
   "outputDirectory": "./build",
   "compilerOptions": {
     "evmVersion": "london",
+    "debug": {
+      "revertStrings": "strip"
+    },
     "optimizer": {
       "enabled": true,
-      "runs": 10000
+      "runs": 200
     }
   }
 }