* add LibERC721Order.sol * Add ERC721 interface to vendor/ * Add ERC721OrdersFeature interface * Storage lib for ERC721 orders feature * Implement basic functionality for ERC721 orders (buy, sell, cancel, etc) * Add isValidERC721OrderSignature to interface * implement onERC721Received * Implement batchBuyERC721s * left/right orders -> sell/buy orders * Add missing @return comments * Implement matching functions * Use SafeMath where necessary * add rich errors for ERC721OrdersFeature * Add comments * Add presign support for ERC721 orders * Cancel using just the order nonce * Add IERC721OrdersFeature to IZeroEx * Add taker callback * Assembly optimizations in LibERC721Order * Add ERC721Orders TS class * create zero-ex/contracts/test/integration/ and tokens/ directories * TestMintableERC721Token * tmp * address feedback from original PR (#391) * address feedback from original PR * Update contracts/zero-ex/contracts/src/features/ERC721OrdersFeature.sol Co-authored-by: Kim Persson <kimpers@users.noreply.github.com> * address review feedback and improve order parameter naming * Add batchCancel function * Emit order fields in preSign * Fix tests Co-authored-by: Lawrence Forman <me@merklejerk.com> Co-authored-by: Kim Persson <kimpers@users.noreply.github.com> Co-authored-by: Michael Zhu <mchl.zhu.96@gmail.com> * Remove revertIfIncomplete from batchMatch * Sanity check maker address in preSign * ERC1155OrdersFeature contracts * Commence refactor, abstract base contract * ERC721OrdersFeature inherits from NFTOrders * Refactor ERC1155OrdersFeature to inherit from NFTOrders * Fix order hashing * Fix ERC721OrdersFeature tests * Typos * Remove maker address from preSigned mapping * disable dex sampler tests * Refactor TS tooling * Address PR feedback * Rearrange event fields to better align with struct fields * Update comments * update AbiEncoder.create params * Add ERC1155Order to protocol-utils * Add ERC1155OrdersFeeature tests * Bump package versions and regenerate contract wrappers * Add ERC165Feature * NFT orders: address audit findings (#417) * CVF-1: use pragma solidity ^0.6 instead of ^0.6.5 * CVF-11: fix inaccurate comment * CVF-16: Enable taker callbacks for batchBuyERC1155s * CVF-17: use internal call if revertIfIncomplete is true * CVF-21: avoid duplicate SLOAD * CVF-23: merge if statements * CVF-24: Reorder status checks to be consistent with ERC721OrdersFeature * CVF-25: Update unclear comment (canonical hash -> EIP-712 hash) * CVF-31: Document keys of orderState mapping * CVF-45: DRY up fees/properties hashing * CVF-47, CVF-50, CVF-57: calculate properties.length once; hash propertyStructHashArray in-place using assembly * CVF-56: More descriptive names for assembly variables * CVF-71: Update confusing comment about rounding in _payFees * CVF-72: Move ETH assertions outside of loop in _payFees * CVF-74: Move property validation loop to else branch * CVF-82: Update inaccurate comment * CVF-86: Enable taker callbacks for batchBuyERC721s * CVF-87: use internal call if revertIfIncomplete is true * CVF-89: Perform token mismatch checks before stateful operations * CVF-90, CVF-91: Defer ERC20 token mismatch check * CVF-93: Add inline comments for _payFees parameters in matchERC721Orders * CVF-94: Fix comment (Step 7 -> Step 5) * CVF-98: Use binary & operator instead of mod * CVF-99: Update unclear comment (canonical hash -> EIP-712 hash) * CVF-65, CVF-66, CVF-67: Copy params.ethAvailable into local variable; check that ethSpent does not exceed ethAvailable; remove ethAvailable < erc20FillAmount check * CVF-52, CVF-55, CVF-59: calculate fees.length once; hash feeStructHashArray in-place using assembly * CVF-14, CVF-32: OrderState struct; separate storage mapping for 1155 cancellations so orders can be cancelled by nonce * Update changelogs, IZeroEx artifact/wrapper Co-authored-by: Lawrence Forman <lawrence@0xproject.com> Co-authored-by: Lawrence Forman <me@merklejerk.com> Co-authored-by: Kim Persson <kimpers@users.noreply.github.com>
101 lines
3.0 KiB
Solidity
101 lines
3.0 KiB
Solidity
// SPDX-License-Identifier: Apache-2.0
|
|
/*
|
|
|
|
Copyright 2021 ZeroEx Intl.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
|
|
*/
|
|
|
|
pragma solidity ^0.6.5;
|
|
pragma experimental ABIEncoderV2;
|
|
|
|
import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
|
|
import "../tokens/TestMintableERC20Token.sol";
|
|
|
|
contract TestCurve {
|
|
|
|
event CurveCalled(
|
|
uint256 value,
|
|
bytes4 selector,
|
|
int128 fromCoinIdx,
|
|
int128 toCoinIdx,
|
|
uint256 sellAmount,
|
|
uint256 minBuyAmount
|
|
);
|
|
|
|
// The lower 16 bits of the selector are reserved for flags.
|
|
bytes4 public constant BASE_SWAP_SELECTOR = 0x12340000;
|
|
bytes4 public constant RETURN_BOUGHT_AMOUNT_SELECTOR_FLAG = 0x00000001;
|
|
|
|
int128 public constant SELL_TOKEN_COIN_IDX = 0;
|
|
int128 public constant BUY_TOKEN_COIN_IDX = 1;
|
|
int128 public constant ETH_COIN_IDX = 2;
|
|
|
|
uint256 public buyAmount;
|
|
IERC20TokenV06 public sellToken;
|
|
TestMintableERC20Token public buyToken;
|
|
|
|
constructor(
|
|
IERC20TokenV06 sellToken_,
|
|
TestMintableERC20Token buyToken_,
|
|
uint256 buyAmount_
|
|
)
|
|
public
|
|
payable
|
|
{
|
|
sellToken = sellToken_;
|
|
buyToken = buyToken_;
|
|
buyAmount = buyAmount_;
|
|
}
|
|
|
|
receive() external payable {}
|
|
|
|
fallback() external payable {
|
|
bytes4 selector = abi.decode(msg.data, (bytes4));
|
|
bool shouldReturnBoughtAmount =
|
|
(selector & RETURN_BOUGHT_AMOUNT_SELECTOR_FLAG) != 0x0;
|
|
bytes4 baseSelector = selector & 0xffff0000;
|
|
require(baseSelector == BASE_SWAP_SELECTOR, "TestCurve/REVERT");
|
|
(
|
|
int128 fromCoinIdx,
|
|
int128 toCoinIdx,
|
|
uint256 sellAmount,
|
|
uint256 minBuyAmount
|
|
) = abi.decode(msg.data[4:], (int128, int128, uint256, uint256));
|
|
if (fromCoinIdx == SELL_TOKEN_COIN_IDX) {
|
|
sellToken.transferFrom(msg.sender, address(this), sellAmount);
|
|
}
|
|
if (toCoinIdx == BUY_TOKEN_COIN_IDX) {
|
|
buyToken.mint(msg.sender, buyAmount);
|
|
} else if (toCoinIdx == ETH_COIN_IDX) {
|
|
msg.sender.transfer(buyAmount);
|
|
}
|
|
emit CurveCalled(
|
|
msg.value,
|
|
selector,
|
|
fromCoinIdx,
|
|
toCoinIdx,
|
|
sellAmount,
|
|
minBuyAmount
|
|
);
|
|
if (shouldReturnBoughtAmount) {
|
|
assembly {
|
|
mstore(0, sload(buyAmount_slot))
|
|
return(0, 32)
|
|
}
|
|
}
|
|
assembly { return(0, 0) }
|
|
}
|
|
}
|