Skip to content
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

replacing signature checker #1218

Merged
merged 2 commits into from
Oct 9, 2023
Merged

replacing signature checker #1218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00c2116
replacing signature checker
felipeasf Oct 9, 2023
1728b8b
format
felipeasf Oct 9, 2023
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
22 changes: 6 additions & 16 deletions packages/marketplace/contracts/exchange/OrderValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ pragma solidity 0.8.21;

import {LibOrder} from "../lib-order/LibOrder.sol";
import {LibAsset} from "../lib-asset/LibAsset.sol";
import {IERC1271Upgradeable} from "@openzeppelin/contracts-upgradeable/interfaces/IERC1271Upgradeable.sol";
import {ECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/ECDSAUpgradeable.sol";
import {SignatureCheckerUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/SignatureCheckerUpgradeable.sol";
import {AddressUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
import {EIP712Upgradeable, Initializable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol";
import {IOrderValidator} from "../interfaces/IOrderValidator.sol";
Expand All @@ -14,10 +13,8 @@ import {WhiteList} from "./WhiteList.sol";
/// @title contract for order validation
/// @notice validate orders and contains a white list of tokens
contract OrderValidator is IOrderValidator, Initializable, EIP712Upgradeable, WhiteList {
using ECDSAUpgradeable for bytes32;
using AddressUpgradeable for address;

bytes4 internal constant MAGICVALUE = 0x1626ba7e;
using SignatureCheckerUpgradeable for address;

/// @dev this protects the implementation contract from being initialized.
/// @custom:oz-upgrades-unsafe-allow constructor
Expand Down Expand Up @@ -67,18 +64,11 @@ contract OrderValidator is IOrderValidator, Initializable, EIP712Upgradeable, Wh
}

bytes32 hash = LibOrder.hash(order);
// if maker is contract checking ERC1271 signature
if (order.maker.isContract()) {
require(
IERC1271Upgradeable(order.maker).isValidSignature(_hashTypedDataV4(hash), signature) == MAGICVALUE,
"contract order signature verification error"
);
return;
}

// if maker is not contract then checking ECDSA signature
address recovered = _hashTypedDataV4(hash).recover(signature);
require(recovered == order.maker, "order signature verification error");
require(
order.maker.isValidSignatureNow(_hashTypedDataV4(hash), signature),
"order signature verification error"
);
}

/// @notice if ERC20 token is accepted
Expand Down
Loading