Commit 7b7a26c3 authored by mergify[bot]'s avatar mergify[bot] Committed by GitHub

Merge pull request #4952 from ethereum-optimism/jm/remove-duplicate-check

fix(ctb): Remove duplicate onlyOtherBridge check
parents 903052e7 04c12a88
This diff is collapsed.
This diff is collapsed.
...@@ -107,28 +107,6 @@ contract L1StandardBridge is StandardBridge, Semver { ...@@ -107,28 +107,6 @@ contract L1StandardBridge is StandardBridge, Semver {
_initiateETHDeposit(msg.sender, msg.sender, RECEIVE_DEFAULT_GAS_LIMIT, bytes("")); _initiateETHDeposit(msg.sender, msg.sender, RECEIVE_DEFAULT_GAS_LIMIT, bytes(""));
} }
/**
* @custom:legacy
* @notice Finalizes a withdrawal of ERC20 tokens from L2.
*
* @param _l1Token Address of the token on L1.
* @param _l2Token Address of the corresponding token on L2.
* @param _from Address of the withdrawer on L2.
* @param _to Address of the recipient on L1.
* @param _amount Amount of the ERC20 to withdraw.
* @param _extraData Optional data forwarded from L2.
*/
function finalizeERC20Withdrawal(
address _l1Token,
address _l2Token,
address _from,
address _to,
uint256 _amount,
bytes calldata _extraData
) external onlyOtherBridge {
finalizeBridgeERC20(_l1Token, _l2Token, _from, _to, _amount, _extraData);
}
/** /**
* @custom:legacy * @custom:legacy
* @notice Deposits some amount of ETH into the sender's account on L2. * @notice Deposits some amount of ETH into the sender's account on L2.
...@@ -240,10 +218,32 @@ contract L1StandardBridge is StandardBridge, Semver { ...@@ -240,10 +218,32 @@ contract L1StandardBridge is StandardBridge, Semver {
address _to, address _to,
uint256 _amount, uint256 _amount,
bytes calldata _extraData bytes calldata _extraData
) external payable onlyOtherBridge { ) external payable {
finalizeBridgeETH(_from, _to, _amount, _extraData); finalizeBridgeETH(_from, _to, _amount, _extraData);
} }
/**
* @custom:legacy
* @notice Finalizes a withdrawal of ERC20 tokens from L2.
*
* @param _l1Token Address of the token on L1.
* @param _l2Token Address of the corresponding token on L2.
* @param _from Address of the withdrawer on L2.
* @param _to Address of the recipient on L1.
* @param _amount Amount of the ERC20 to withdraw.
* @param _extraData Optional data forwarded from L2.
*/
function finalizeERC20Withdrawal(
address _l1Token,
address _l2Token,
address _from,
address _to,
uint256 _amount,
bytes calldata _extraData
) external {
finalizeBridgeERC20(_l1Token, _l2Token, _from, _to, _amount, _extraData);
}
/** /**
* @custom:legacy * @custom:legacy
* @notice Retrieves the access of the corresponding L2 bridge contract. * @notice Retrieves the access of the corresponding L2 bridge contract.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment