clean applyHarness
This commit is contained in:
@ -236,25 +236,6 @@ diff -ruN mocks/SafeERC20Helper.sol mocks/SafeERC20Helper.sol
|
|||||||
|
|
||||||
contract SafeERC20Wrapper is Context {
|
contract SafeERC20Wrapper is Context {
|
||||||
using SafeERC20 for IERC20;
|
using SafeERC20 for IERC20;
|
||||||
@@ -172,18 +172,6 @@
|
|
||||||
_token.safeDecreaseAllowance(address(0), amount);
|
|
||||||
}
|
|
||||||
|
|
||||||
- function permit(
|
|
||||||
- address owner,
|
|
||||||
- address spender,
|
|
||||||
- uint256 value,
|
|
||||||
- uint256 deadline,
|
|
||||||
- uint8 v,
|
|
||||||
- bytes32 r,
|
|
||||||
- bytes32 s
|
|
||||||
- ) public {
|
|
||||||
- SafeERC20.safePermit(IERC20Permit(address(_token)), owner, spender, value, deadline, v, r, s);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
function setAllowance(uint256 allowance_) public {
|
|
||||||
ERC20ReturnTrueMock(address(_token)).setAllowance(allowance_);
|
|
||||||
}
|
|
||||||
diff -ruN proxy/utils/Initializable.sol proxy/utils/Initializable.sol
|
diff -ruN proxy/utils/Initializable.sol proxy/utils/Initializable.sol
|
||||||
--- proxy/utils/Initializable.sol 2022-09-20 11:16:48.456850883 +0200
|
--- proxy/utils/Initializable.sol 2022-09-20 11:16:48.456850883 +0200
|
||||||
+++ proxy/utils/Initializable.sol 2022-09-20 14:34:24.806582310 +0200
|
+++ proxy/utils/Initializable.sol 2022-09-20 14:34:24.806582310 +0200
|
||||||
@ -467,40 +448,6 @@ diff -ruN token/ERC20/extensions/ERC20Wrapper.sol token/ERC20/extensions/ERC20Wr
|
|||||||
uint256 value = underlying.balanceOf(address(this)) - totalSupply();
|
uint256 value = underlying.balanceOf(address(this)) - totalSupply();
|
||||||
_mint(account, value);
|
_mint(account, value);
|
||||||
return value;
|
return value;
|
||||||
diff -ruN token/ERC20/utils/SafeERC20.sol token/ERC20/utils/SafeERC20.sol
|
|
||||||
--- token/ERC20/utils/SafeERC20.sol 2022-09-09 10:15:55.893843970 +0200
|
|
||||||
+++ token/ERC20/utils/SafeERC20.sol 2022-09-20 14:34:28.259983206 +0200
|
|
||||||
@@ -4,7 +4,6 @@
|
|
||||||
pragma solidity ^0.8.0;
|
|
||||||
|
|
||||||
import "../IERC20.sol";
|
|
||||||
-import "../extensions/draft-IERC20Permit.sol";
|
|
||||||
import "../../../utils/Address.sol";
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -80,22 +79,6 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- function safePermit(
|
|
||||||
- IERC20Permit token,
|
|
||||||
- address owner,
|
|
||||||
- address spender,
|
|
||||||
- uint256 value,
|
|
||||||
- uint256 deadline,
|
|
||||||
- uint8 v,
|
|
||||||
- bytes32 r,
|
|
||||||
- bytes32 s
|
|
||||||
- ) internal {
|
|
||||||
- uint256 nonceBefore = token.nonces(owner);
|
|
||||||
- token.permit(owner, spender, value, deadline, v, r, s);
|
|
||||||
- uint256 nonceAfter = token.nonces(owner);
|
|
||||||
- require(nonceAfter == nonceBefore + 1, "SafeERC20: permit did not succeed");
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
/**
|
|
||||||
* @dev Imitates a Solidity high-level call (i.e. a regular function call to a contract), relaxing the requirement
|
|
||||||
* on the return value: the return value is optional (but if data is returned, it must not be false).
|
|
||||||
diff -ruN token/ERC721/extensions/draft-ERC721Votes.sol token/ERC721/extensions/draft-ERC721Votes.sol
|
diff -ruN token/ERC721/extensions/draft-ERC721Votes.sol token/ERC721/extensions/draft-ERC721Votes.sol
|
||||||
--- token/ERC721/extensions/draft-ERC721Votes.sol 2022-09-20 14:24:58.016740934 +0200
|
--- token/ERC721/extensions/draft-ERC721Votes.sol 2022-09-20 14:24:58.016740934 +0200
|
||||||
+++ token/ERC721/extensions/draft-ERC721Votes.sol 2022-09-20 14:34:28.259983206 +0200
|
+++ token/ERC721/extensions/draft-ERC721Votes.sol 2022-09-20 14:34:28.259983206 +0200
|
||||||
|
|||||||
Reference in New Issue
Block a user