c1177416f5
* 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>
200 lines
13 KiB
TypeScript
200 lines
13 KiB
TypeScript
/*
|
|
* -----------------------------------------------------------------------------
|
|
* Warning: This file is auto-generated by contracts-gen. Don't edit manually.
|
|
* -----------------------------------------------------------------------------
|
|
*/
|
|
export * from '../test/generated-wrappers/affiliate_fee_transformer';
|
|
export * from '../test/generated-wrappers/batch_fill_native_orders_feature';
|
|
export * from '../test/generated-wrappers/bootstrap_feature';
|
|
export * from '../test/generated-wrappers/bridge_adapter';
|
|
export * from '../test/generated-wrappers/bridge_protocols';
|
|
export * from '../test/generated-wrappers/curve_liquidity_provider';
|
|
export * from '../test/generated-wrappers/erc1155_orders_feature';
|
|
export * from '../test/generated-wrappers/erc165_feature';
|
|
export * from '../test/generated-wrappers/erc721_orders_feature';
|
|
export * from '../test/generated-wrappers/fee_collector';
|
|
export * from '../test/generated-wrappers/fee_collector_controller';
|
|
export * from '../test/generated-wrappers/fill_quote_transformer';
|
|
export * from '../test/generated-wrappers/fixin_common';
|
|
export * from '../test/generated-wrappers/fixin_e_i_p712';
|
|
export * from '../test/generated-wrappers/fixin_erc1155_spender';
|
|
export * from '../test/generated-wrappers/fixin_erc721_spender';
|
|
export * from '../test/generated-wrappers/fixin_protocol_fees';
|
|
export * from '../test/generated-wrappers/fixin_reentrancy_guard';
|
|
export * from '../test/generated-wrappers/fixin_token_spender';
|
|
export * from '../test/generated-wrappers/flash_wallet';
|
|
export * from '../test/generated-wrappers/full_migration';
|
|
export * from '../test/generated-wrappers/fund_recovery_feature';
|
|
export * from '../test/generated-wrappers/i_batch_fill_native_orders_feature';
|
|
export * from '../test/generated-wrappers/i_bootstrap_feature';
|
|
export * from '../test/generated-wrappers/i_bridge_adapter';
|
|
export * from '../test/generated-wrappers/i_erc1155_orders_feature';
|
|
export * from '../test/generated-wrappers/i_erc1155_token';
|
|
export * from '../test/generated-wrappers/i_erc165_feature';
|
|
export * from '../test/generated-wrappers/i_erc20_bridge';
|
|
export * from '../test/generated-wrappers/i_erc20_transformer';
|
|
export * from '../test/generated-wrappers/i_erc721_orders_feature';
|
|
export * from '../test/generated-wrappers/i_erc721_token';
|
|
export * from '../test/generated-wrappers/i_feature';
|
|
export * from '../test/generated-wrappers/i_fee_recipient';
|
|
export * from '../test/generated-wrappers/i_flash_wallet';
|
|
export * from '../test/generated-wrappers/i_fund_recovery_feature';
|
|
export * from '../test/generated-wrappers/i_liquidity_provider';
|
|
export * from '../test/generated-wrappers/i_liquidity_provider_feature';
|
|
export * from '../test/generated-wrappers/i_liquidity_provider_sandbox';
|
|
export * from '../test/generated-wrappers/i_meta_transactions_feature';
|
|
export * from '../test/generated-wrappers/i_mooniswap_pool';
|
|
export * from '../test/generated-wrappers/i_multiplex_feature';
|
|
export * from '../test/generated-wrappers/i_native_orders_events';
|
|
export * from '../test/generated-wrappers/i_native_orders_feature';
|
|
export * from '../test/generated-wrappers/i_otc_orders_feature';
|
|
export * from '../test/generated-wrappers/i_ownable_feature';
|
|
export * from '../test/generated-wrappers/i_pancake_swap_feature';
|
|
export * from '../test/generated-wrappers/i_property_validator';
|
|
export * from '../test/generated-wrappers/i_simple_function_registry_feature';
|
|
export * from '../test/generated-wrappers/i_staking';
|
|
export * from '../test/generated-wrappers/i_taker_callback';
|
|
export * from '../test/generated-wrappers/i_test_simple_function_registry_feature';
|
|
export * from '../test/generated-wrappers/i_token_spender_feature';
|
|
export * from '../test/generated-wrappers/i_transform_erc20_feature';
|
|
export * from '../test/generated-wrappers/i_uniswap_feature';
|
|
export * from '../test/generated-wrappers/i_uniswap_v2_pair';
|
|
export * from '../test/generated-wrappers/i_uniswap_v3_feature';
|
|
export * from '../test/generated-wrappers/i_uniswap_v3_pool';
|
|
export * from '../test/generated-wrappers/i_zero_ex';
|
|
export * from '../test/generated-wrappers/initial_migration';
|
|
export * from '../test/generated-wrappers/lib_bootstrap';
|
|
export * from '../test/generated-wrappers/lib_common_rich_errors';
|
|
export * from '../test/generated-wrappers/lib_erc1155_orders_storage';
|
|
export * from '../test/generated-wrappers/lib_erc20_transformer';
|
|
export * from '../test/generated-wrappers/lib_erc721_orders_storage';
|
|
export * from '../test/generated-wrappers/lib_fee_collector';
|
|
export * from '../test/generated-wrappers/lib_liquidity_provider_rich_errors';
|
|
export * from '../test/generated-wrappers/lib_meta_transactions_rich_errors';
|
|
export * from '../test/generated-wrappers/lib_meta_transactions_storage';
|
|
export * from '../test/generated-wrappers/lib_migrate';
|
|
export * from '../test/generated-wrappers/lib_n_f_t_order';
|
|
export * from '../test/generated-wrappers/lib_n_f_t_orders_rich_errors';
|
|
export * from '../test/generated-wrappers/lib_native_order';
|
|
export * from '../test/generated-wrappers/lib_native_orders_rich_errors';
|
|
export * from '../test/generated-wrappers/lib_native_orders_storage';
|
|
export * from '../test/generated-wrappers/lib_otc_orders_storage';
|
|
export * from '../test/generated-wrappers/lib_ownable_rich_errors';
|
|
export * from '../test/generated-wrappers/lib_ownable_storage';
|
|
export * from '../test/generated-wrappers/lib_proxy_rich_errors';
|
|
export * from '../test/generated-wrappers/lib_proxy_storage';
|
|
export * from '../test/generated-wrappers/lib_reentrancy_guard_storage';
|
|
export * from '../test/generated-wrappers/lib_signature';
|
|
export * from '../test/generated-wrappers/lib_signature_rich_errors';
|
|
export * from '../test/generated-wrappers/lib_simple_function_registry_rich_errors';
|
|
export * from '../test/generated-wrappers/lib_simple_function_registry_storage';
|
|
export * from '../test/generated-wrappers/lib_storage';
|
|
export * from '../test/generated-wrappers/lib_transform_erc20_rich_errors';
|
|
export * from '../test/generated-wrappers/lib_transform_erc20_storage';
|
|
export * from '../test/generated-wrappers/lib_wallet_rich_errors';
|
|
export * from '../test/generated-wrappers/liquidity_provider_feature';
|
|
export * from '../test/generated-wrappers/liquidity_provider_sandbox';
|
|
export * from '../test/generated-wrappers/log_metadata_transformer';
|
|
export * from '../test/generated-wrappers/meta_transactions_feature';
|
|
export * from '../test/generated-wrappers/mixin_aave_v2';
|
|
export * from '../test/generated-wrappers/mixin_balancer';
|
|
export * from '../test/generated-wrappers/mixin_balancer_v2';
|
|
export * from '../test/generated-wrappers/mixin_bancor';
|
|
export * from '../test/generated-wrappers/mixin_co_fi_x';
|
|
export * from '../test/generated-wrappers/mixin_compound';
|
|
export * from '../test/generated-wrappers/mixin_crypto_com';
|
|
export * from '../test/generated-wrappers/mixin_curve';
|
|
export * from '../test/generated-wrappers/mixin_curve_v2';
|
|
export * from '../test/generated-wrappers/mixin_dodo';
|
|
export * from '../test/generated-wrappers/mixin_dodo_v2';
|
|
export * from '../test/generated-wrappers/mixin_kyber';
|
|
export * from '../test/generated-wrappers/mixin_kyber_dmm';
|
|
export * from '../test/generated-wrappers/mixin_lido';
|
|
export * from '../test/generated-wrappers/mixin_m_stable';
|
|
export * from '../test/generated-wrappers/mixin_maker_p_s_m';
|
|
export * from '../test/generated-wrappers/mixin_mooniswap';
|
|
export * from '../test/generated-wrappers/mixin_nerve';
|
|
export * from '../test/generated-wrappers/mixin_oasis';
|
|
export * from '../test/generated-wrappers/mixin_shell';
|
|
export * from '../test/generated-wrappers/mixin_uniswap';
|
|
export * from '../test/generated-wrappers/mixin_uniswap_v2';
|
|
export * from '../test/generated-wrappers/mixin_uniswap_v3';
|
|
export * from '../test/generated-wrappers/mixin_zero_ex_bridge';
|
|
export * from '../test/generated-wrappers/mooniswap_liquidity_provider';
|
|
export * from '../test/generated-wrappers/multiplex_feature';
|
|
export * from '../test/generated-wrappers/multiplex_liquidity_provider';
|
|
export * from '../test/generated-wrappers/multiplex_otc';
|
|
export * from '../test/generated-wrappers/multiplex_rfq';
|
|
export * from '../test/generated-wrappers/multiplex_transform_erc20';
|
|
export * from '../test/generated-wrappers/multiplex_uniswap_v2';
|
|
export * from '../test/generated-wrappers/multiplex_uniswap_v3';
|
|
export * from '../test/generated-wrappers/n_f_t_orders';
|
|
export * from '../test/generated-wrappers/native_orders_cancellation';
|
|
export * from '../test/generated-wrappers/native_orders_feature';
|
|
export * from '../test/generated-wrappers/native_orders_info';
|
|
export * from '../test/generated-wrappers/native_orders_protocol_fees';
|
|
export * from '../test/generated-wrappers/native_orders_settlement';
|
|
export * from '../test/generated-wrappers/otc_orders_feature';
|
|
export * from '../test/generated-wrappers/ownable_feature';
|
|
export * from '../test/generated-wrappers/pancake_swap_feature';
|
|
export * from '../test/generated-wrappers/pay_taker_transformer';
|
|
export * from '../test/generated-wrappers/permissionless_transformer_deployer';
|
|
export * from '../test/generated-wrappers/positive_slippage_fee_transformer';
|
|
export * from '../test/generated-wrappers/simple_function_registry_feature';
|
|
export * from '../test/generated-wrappers/test_bridge';
|
|
export * from '../test/generated-wrappers/test_call_target';
|
|
export * from '../test/generated-wrappers/test_curve';
|
|
export * from '../test/generated-wrappers/test_delegate_caller';
|
|
export * from '../test/generated-wrappers/test_fee_collector_controller';
|
|
export * from '../test/generated-wrappers/test_fee_recipient';
|
|
export * from '../test/generated-wrappers/test_fill_quote_transformer_bridge';
|
|
export * from '../test/generated-wrappers/test_fill_quote_transformer_exchange';
|
|
export * from '../test/generated-wrappers/test_fill_quote_transformer_host';
|
|
export * from '../test/generated-wrappers/test_fixin_protocol_fees';
|
|
export * from '../test/generated-wrappers/test_fixin_token_spender';
|
|
export * from '../test/generated-wrappers/test_full_migration';
|
|
export * from '../test/generated-wrappers/test_initial_migration';
|
|
export * from '../test/generated-wrappers/test_lib_native_order';
|
|
export * from '../test/generated-wrappers/test_lib_signature';
|
|
export * from '../test/generated-wrappers/test_liquidity_provider';
|
|
export * from '../test/generated-wrappers/test_meta_transactions_native_orders_feature';
|
|
export * from '../test/generated-wrappers/test_meta_transactions_transform_erc20_feature';
|
|
export * from '../test/generated-wrappers/test_migrator';
|
|
export * from '../test/generated-wrappers/test_mint_token_erc20_transformer';
|
|
export * from '../test/generated-wrappers/test_mintable_erc1155_token';
|
|
export * from '../test/generated-wrappers/test_mintable_erc20_token';
|
|
export * from '../test/generated-wrappers/test_mintable_erc721_token';
|
|
export * from '../test/generated-wrappers/test_mooniswap';
|
|
export * from '../test/generated-wrappers/test_n_f_t_order_presigner';
|
|
export * from '../test/generated-wrappers/test_native_orders_feature';
|
|
export * from '../test/generated-wrappers/test_no_eth_recipient';
|
|
export * from '../test/generated-wrappers/test_order_signer_registry_with_contract_wallet';
|
|
export * from '../test/generated-wrappers/test_permissionless_transformer_deployer_suicidal';
|
|
export * from '../test/generated-wrappers/test_permissionless_transformer_deployer_transformer';
|
|
export * from '../test/generated-wrappers/test_property_validator';
|
|
export * from '../test/generated-wrappers/test_rfq_origin_registration';
|
|
export * from '../test/generated-wrappers/test_simple_function_registry_feature_impl1';
|
|
export * from '../test/generated-wrappers/test_simple_function_registry_feature_impl2';
|
|
export * from '../test/generated-wrappers/test_staking';
|
|
export * from '../test/generated-wrappers/test_token_spender_erc20_token';
|
|
export * from '../test/generated-wrappers/test_transform_erc20';
|
|
export * from '../test/generated-wrappers/test_transformer_base';
|
|
export * from '../test/generated-wrappers/test_transformer_deployer_transformer';
|
|
export * from '../test/generated-wrappers/test_transformer_host';
|
|
export * from '../test/generated-wrappers/test_uniswap_v2_factory';
|
|
export * from '../test/generated-wrappers/test_uniswap_v2_pool';
|
|
export * from '../test/generated-wrappers/test_uniswap_v3_factory';
|
|
export * from '../test/generated-wrappers/test_uniswap_v3_feature';
|
|
export * from '../test/generated-wrappers/test_uniswap_v3_pool';
|
|
export * from '../test/generated-wrappers/test_weth';
|
|
export * from '../test/generated-wrappers/test_weth_transformer_host';
|
|
export * from '../test/generated-wrappers/test_zero_ex_feature';
|
|
export * from '../test/generated-wrappers/transform_erc20_feature';
|
|
export * from '../test/generated-wrappers/transformer';
|
|
export * from '../test/generated-wrappers/transformer_deployer';
|
|
export * from '../test/generated-wrappers/uniswap_feature';
|
|
export * from '../test/generated-wrappers/uniswap_v3_feature';
|
|
export * from '../test/generated-wrappers/weth_transformer';
|
|
export * from '../test/generated-wrappers/zero_ex';
|
|
export * from '../test/generated-wrappers/zero_ex_optimized';
|