crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@0x/contracts-asset-proxy: Set allowance every time.

Browse Source
This commit is contained in:
Lawrence Forman 2019-10-01 18:35:24 -07:00
parent 1356237ec9
commit 4098238019
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/asset-proxy/contracts/src/bridges/Eth2DaiBridge.sol
View File

@ -33,9 +33,6 @@ contract Eth2DaiBridge is
/* Mainnet addresses */ /* Mainnet addresses */
address constant public ETH2DAI_ADDRESS = 0x39755357759cE0d7f32dC8dC45414CCa409AE24e; address constant public ETH2DAI_ADDRESS = 0x39755357759cE0d7f32dC8dC45414CCa409AE24e;
/// @dev Whether we've granted an allowance to a spender for a token.
mapping (address => mapping (address => bool)) private _hasAllowance;
/// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of /// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of
/// `toTokenAddress` tokens by selling the entirety of the opposing asset /// `toTokenAddress` tokens by selling the entirety of the opposing asset
/// (DAI or WETH) to the Eth2Dai contract, then transfers the bought /// (DAI or WETH) to the Eth2Dai contract, then transfers the bought
@ -98,8 +95,7 @@ contract Eth2DaiBridge is
return IEth2Dai(ETH2DAI_ADDRESS); return IEth2Dai(ETH2DAI_ADDRESS);
} }
/// @dev Grants an unlimited allowance to `spender` for `tokenAddress` token, /// @dev Grants an unlimited allowance to `spender` for `tokenAddress` token.
/// if we haven't done so already.
/// @param spender The spender address. /// @param spender The spender address.
/// @param tokenAddress The token address. /// @param tokenAddress The token address.
function _grantAllowanceForToken( function _grantAllowanceForToken(
@ -108,11 +104,7 @@ contract Eth2DaiBridge is
) )
private private
{ {
mapping (address => bool) storage spenderHasAllowance = _hasAllowance[spender]; IERC20Token(tokenAddress).approve(spender, uint256(-1));
if (!spenderHasAllowance[tokenAddress]) {
spenderHasAllowance[tokenAddress] = true;
IERC20Token(tokenAddress).approve(spender, uint256(-1));
}
} }
/// @dev Permissively transfers an ERC20 token that may not adhere to /// @dev Permissively transfers an ERC20 token that may not adhere to

10
contracts/asset-proxy/test/eth2dai_bridge.ts
View File

@ -154,16 +154,6 @@ blockchainTests.resets('Eth2DaiBridge unit tests', env => {
expect(approvals[0].allowance).to.bignumber.eq(constants.MAX_UINT256); expect(approvals[0].allowance).to.bignumber.eq(constants.MAX_UINT256);
}); });
it('does not set an unlimited allowance on the `fromTokenAddress` token if already set', async () => {
const { opts } = await withdrawToAsync();
const { logs } = await withdrawToAsync({ fromTokenAddress: opts.fromTokenAddress });
const approvals = filterLogsToArguments<TestEth2DaiBridgeTokenApproveEventArgs>(
logs,
TestEth2DaiBridgeEvents.TokenApprove,
);
expect(approvals.length).to.eq(0);
});
it('transfers filled amount to `to`', async () => { it('transfers filled amount to `to`', async () => {
const { opts, logs } = await withdrawToAsync(); const { opts, logs } = await withdrawToAsync();
const transfers = filterLogsToArguments<TestEth2DaiBridgeTokenTransferEventArgs>( const transfers = filterLogsToArguments<TestEth2DaiBridgeTokenTransferEventArgs>(