Skip to content

fix(evm): L04 - Remove repeated function #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 9, 2025
Merged

fix(evm): L04 - Remove repeated function #829

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf1268d
WIP
chrismaree Jan 2, 2025
72d391b
Merge branch 'svm-dev' into chrismaree/l04
chrismaree Jan 3, 2025
18ce005
Merge branch 'svm-dev' into chrismaree/l04
chrismaree Jan 6, 2025
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
32 changes: 12 additions & 20 deletions contracts/erc7683/ERC7683OrderDepositor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

import { Output, GaslessCrossChainOrder, OnchainCrossChainOrder, ResolvedCrossChainOrder, IOriginSettler, FillInstruction } from "./ERC7683.sol";
import { AcrossOrderData, AcrossOriginFillerData, ERC7683Permit2Lib, ACROSS_ORDER_DATA_TYPE_HASH } from "./ERC7683Permit2Lib.sol";
import { AddressToBytes32 } from "../libraries/AddressConverters.sol";
import { AddressToBytes32, Bytes32ToAddress } from "../libraries/AddressConverters.sol";

/**
* @notice ERC7683OrderDepositor processes an external order type and translates it into an AcrossV3 deposit.
Expand All @@ -19,6 +19,7 @@ import { AddressToBytes32 } from "../libraries/AddressConverters.sol";
*/
abstract contract ERC7683OrderDepositor is IOriginSettler {
using SafeERC20 for IERC20;
using Bytes32ToAddress for bytes32;
using AddressToBytes32 for address;

error WrongSettlementContract();
Expand Down Expand Up @@ -66,7 +67,7 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {

_callDeposit(
order.user,
_toAddress(acrossOrderData.recipient),
acrossOrderData.recipient.toAddress(),
acrossOrderData.inputToken,
acrossOrderData.outputToken,
acrossOrderData.inputAmount,
Expand Down Expand Up @@ -97,7 +98,7 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {

_callDeposit(
msg.sender,
_toAddress(acrossOrderData.recipient),
acrossOrderData.recipient.toAddress(),
acrossOrderData.inputToken,
acrossOrderData.outputToken,
acrossOrderData.inputAmount,
Expand Down Expand Up @@ -208,7 +209,7 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {

Output[] memory maxSpent = new Output[](1);
maxSpent[0] = Output({
token: _toBytes32(acrossOrderData.outputToken),
token: acrossOrderData.outputToken.toBytes32(),
amount: acrossOrderData.outputAmount,
recipient: acrossOrderData.recipient,
chainId: acrossOrderData.destinationChainId
Expand All @@ -220,9 +221,9 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {
// repayment on.
Output[] memory minReceived = new Output[](1);
minReceived[0] = Output({
token: _toBytes32(acrossOrderData.inputToken),
token: acrossOrderData.inputToken.toBytes32(),
amount: acrossOrderData.inputAmount,
recipient: _toBytes32(acrossOriginFillerData.exclusiveRelayer),
recipient: acrossOriginFillerData.exclusiveRelayer.toBytes32(),
chainId: block.chainid
});

Expand All @@ -242,7 +243,7 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {
relayData.message = acrossOrderData.message;
fillInstructions[0] = FillInstruction({
destinationChainId: SafeCast.toUint64(acrossOrderData.destinationChainId),
destinationSettler: _toBytes32(_destinationSettler(acrossOrderData.destinationChainId)),
destinationSettler: _destinationSettler(acrossOrderData.destinationChainId).toBytes32(),
originData: abi.encode(relayData)
});

Expand Down Expand Up @@ -272,7 +273,7 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {

Output[] memory maxSpent = new Output[](1);
maxSpent[0] = Output({
token: _toBytes32(acrossOrderData.outputToken),
token: acrossOrderData.outputToken.toBytes32(),
amount: acrossOrderData.outputAmount,
recipient: acrossOrderData.recipient,
chainId: acrossOrderData.destinationChainId
Expand All @@ -284,9 +285,9 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {
// repayment on.
Output[] memory minReceived = new Output[](1);
minReceived[0] = Output({
token: _toBytes32(acrossOrderData.inputToken),
token: acrossOrderData.inputToken.toBytes32(),
amount: acrossOrderData.inputAmount,
recipient: _toBytes32(acrossOrderData.exclusiveRelayer),
recipient: acrossOrderData.exclusiveRelayer.toBytes32(),
chainId: block.chainid
});

Expand All @@ -306,7 +307,7 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {
relayData.message = acrossOrderData.message;
fillInstructions[0] = FillInstruction({
destinationChainId: SafeCast.toUint64(acrossOrderData.destinationChainId),
destinationSettler: _toBytes32(_destinationSettler(acrossOrderData.destinationChainId)),
destinationSettler: _destinationSettler(acrossOrderData.destinationChainId).toBytes32(),
originData: abi.encode(relayData)
});

Expand Down Expand Up @@ -352,15 +353,6 @@ abstract contract ERC7683OrderDepositor is IOriginSettler {
);
}

function _toBytes32(address input) internal pure returns (bytes32) {
return bytes32(uint256(uint160(input)));
}

function _toAddress(bytes32 _bytes32) internal pure returns (address) {
require(uint256(_bytes32) >> 160 == 0, "Invalid bytes32: highest 12 bytes must be 0");
return address(uint160(uint256(_bytes32)));
}

function _callDeposit(
address depositor,
address recipient,
Expand Down
Loading