Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions contracts/tokenbridge/ethereum/gateway/L1ArbitrumGateway.sol
Original file line number Diff line number Diff line change
Expand Up @@ -279,17 +279,27 @@ abstract contract L1ArbitrumGateway is
// unpack user encoded data
(_maxSubmissionCost, extraData, tokenTotalFeeAmount) = _parseUserEncodedData(extraData);

// the inboundEscrowAndCall functionality has been disabled, so no data is allowed
require(extraData.length == 0, "EXTRA_DATA_DISABLED");

require(_l1Token.isContract(), "L1_NOT_CONTRACT");
address l2Token = calculateL2TokenAddress(_l1Token);
require(l2Token != address(0), "NO_L2_TOKEN_SET");

_amount = outboundEscrowTransfer(_l1Token, _from, _amount);

if (extraData.length == 64) {
(uint256 zero, uint256 minimumReceived) = abi.decode(extraData, (uint256, uint256));
require(zero == 0, "INVALID_EXTRA_DATA");
require(
_amount >= minimumReceived,
"INSUFFICIENT_AMOUNT_RECEIVED"
);
}
else if (extraData.length != 0) {
revert("INVALID_EXTRA_DATA_LENGTH");
}

// we override the res field to save on the stack
res = getOutboundCalldata(_l1Token, _from, _to, _amount, extraData);
// we never pass extra data through to L2
res = getOutboundCalldata(_l1Token, _from, _to, _amount, "");

seqNum = _initiateDeposit(
_refundTo,
Expand Down
2 changes: 1 addition & 1 deletion contracts/tokenbridge/ethereum/gateway/L1GatewayRouter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ contract L1GatewayRouter is
* @param _amount Token Amount
* @param _maxGas Max gas deducted from user's L2 balance to cover L2 execution
* @param _gasPriceBid Gas price for L2 execution
* @param _data encoded data from router and user
* @param _data Optional minimum amount received on L2 encoded as abi.encode(uint256(0), uint256(minimumAmount))
* @return res abi encoded inbox sequence number
*/
function outboundTransferCustomRefund(
Expand Down
Loading