* v4 FillQuoteTransformer (#104) * Update FQT to support v4 orders * `@0x/contracts-zero-ex`: Tweak FQT `@0x/contracts-zero-ex`: Drop `ERC20BridgeTransfer` event and add `PartialQuoteFill` event. * `@0x/contracts-utils`: Add `LibSafeMathV06.downcastToUint128()` * `@0x/protocol-utils`: Update transformer utils for V4 FQT * `@0x/contracts-zero-ex`: Fixing FQT tests... * `@0x/contracts-zero-ex`: rename FQT bridge event * `@0x/contracts-zero-ex`: Un-`only` tests * `@0x/migrations`: Update `BridgeAdapter` deployment * `@0x/contracts-integrations`: Delete `mtx_tests` * `@0x/protocol-utils`: Address review comments * `@0x/contracts-zero-ex`: Address review comments * `@0x/migrations`: Update migrations Co-authored-by: Michael Zhu <mchl.zhu.96@gmail.com> Co-authored-by: Lawrence Forman <me@merklejerk.com> * v4: Asset-swapper (main branch) (#113) * refactor quote_requestor * WIP v4/asset-swapper: Clean up SwapQuoter and remove @0x/orderbook * Start replacing SignedOrder everywhere * wip: new order type * wip * remove order-utils from most places * hack: Play around with VerboseX types (#119) * hack: Play around with VerboseX types * More hacks * Fix up the bridgeData encodings * Rework Orderbook return type * feat: Don't charge a protocol fee for RFQ orders WIP (#121) * fix simple build errors * simplify types a little * remove SwapQuoteCalculator: unnecessary abstraction * Fix all ./src build errors; make types consistent * export more types for use in 0x API; modify Orderbook interface * stop overriding APIOrder * feat: RFQ v4 + consolidated bridge encoders (#125) * feat: check if taker address is contract * Rework bridge data * Worst case adjustments * RFQT v4 * Future/v4 validate orders (#126) * RFQT v4 * v4 validate native orders * use default invalid signature * refactor rfqt validations in swap quoter * fix types * fix RFQT unlisted api key * remove priceAwareRFQFlag * adjust maker/taker amounts * update JSON schemas * filter zero fillable orders Co-authored-by: xianny <xianny@gmail.com> * fix type export Co-authored-by: xianny <xianny@gmail.com> * remove order-utils as much as possible * work on tests compile * Comment out quote reporter test * updated tests * restore order-utils accidental changes * some lints * Remove old fill_test * ts lint disable for now * update quote report * Re-enable quote report tests * make fill data required field * fix lint * type guards * force fillData as required * fix lint * fix naming * exports * adjust MultiBridge by slippage * cleanups (checkpoint 1) * cleanup types (checkpoint #2) * remove unused deps * `@0x/contract-addresses`: Deploy new FQT (#129) Co-authored-by: Lawrence Forman <me@merklejerk.com> * commit bump to republish * DRY up the rfqt mocker * fix: Balancer load top pools (#131) * fix: Balancer load top 250 pools * refetch top pools on an interval Co-authored-by: Jacob Evans <jacob@dekz.net> Co-authored-by: Kim Persson <kimpers@users.noreply.github.com> Co-authored-by: Lawrence Forman <lawrence@0xproject.com> Co-authored-by: Lawrence Forman <me@merklejerk.com> * Update post rebase * prettier * Remove test helpers exported in asset-swapper * Clean up from review comments * prettier * lint * recreate rfqt mocker * change merge and INVALID_SIGNATURE Co-authored-by: Lawrence Forman <lawrence@0xproject.com> Co-authored-by: Michael Zhu <mchl.zhu.96@gmail.com> Co-authored-by: Lawrence Forman <me@merklejerk.com> Co-authored-by: Xianny <8582774+xianny@users.noreply.github.com> Co-authored-by: Kim Persson <kimpers@users.noreply.github.com>
136 lines
4.0 KiB
Solidity
136 lines
4.0 KiB
Solidity
// SPDX-License-Identifier: Apache-2.0
|
|
/*
|
|
|
|
Copyright 2019 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;
|
|
pragma experimental ABIEncoderV2;
|
|
|
|
import "../src/NativeOrderSampler.sol";
|
|
import "../src/UtilitySampler.sol";
|
|
|
|
|
|
contract TestNativeOrderSamplerToken {
|
|
mapping (address => uint256) public balanceOf;
|
|
mapping (address => mapping(address => uint256)) public allowance;
|
|
|
|
function setBalanceAndAllowance(
|
|
address owner,
|
|
address spender,
|
|
uint256 balance,
|
|
uint256 allowance_
|
|
)
|
|
external
|
|
{
|
|
balanceOf[owner] = balance;
|
|
allowance[owner][spender] = allowance_;
|
|
}
|
|
}
|
|
|
|
contract TestNativeOrderSampler is
|
|
NativeOrderSampler,
|
|
UtilitySampler
|
|
{
|
|
uint8 private constant MAX_ORDER_STATUS = uint8(IExchange.OrderStatus.CANCELLED) + 1;
|
|
bytes32 private constant VALID_SIGNATURE_HASH = keccak256(hex"01");
|
|
|
|
function createTokens(uint256 count)
|
|
external
|
|
returns (TestNativeOrderSamplerToken[] memory tokens)
|
|
{
|
|
tokens = new TestNativeOrderSamplerToken[](count);
|
|
for (uint256 i = 0; i < count; ++i) {
|
|
tokens[i] = new TestNativeOrderSamplerToken();
|
|
}
|
|
}
|
|
|
|
function setTokenBalanceAndAllowance(
|
|
TestNativeOrderSamplerToken token,
|
|
address owner,
|
|
address spender,
|
|
uint256 balance,
|
|
uint256 allowance
|
|
)
|
|
external
|
|
{
|
|
token.setBalanceAndAllowance(owner, spender, balance, allowance);
|
|
}
|
|
|
|
// IExchange.getLimitOrderRelevantState()
|
|
function getLimitOrderRelevantState(
|
|
IExchange.LimitOrder memory order,
|
|
IExchange.Signature calldata signature
|
|
)
|
|
external
|
|
view
|
|
returns (
|
|
IExchange.OrderInfo memory orderInfo,
|
|
uint128 actualFillableTakerTokenAmount,
|
|
bool isSignatureValid
|
|
)
|
|
{
|
|
// The order salt determines everything.
|
|
orderInfo.orderHash = keccak256(abi.encode(order.salt));
|
|
if (uint8(order.salt) == 0xFF) {
|
|
orderInfo.status = IExchange.OrderStatus.FILLED;
|
|
} else {
|
|
orderInfo.status = IExchange.OrderStatus.FILLABLE;
|
|
}
|
|
|
|
isSignatureValid = signature.r == VALID_SIGNATURE_HASH;
|
|
|
|
// The expiration time is the filled taker asset amount.
|
|
orderInfo.takerTokenFilledAmount = uint128(order.expiry);
|
|
|
|
// Calculate how much is fillable in maker terms given the filled taker amount
|
|
uint256 fillableMakerTokenAmount = LibMathV06.getPartialAmountFloor(
|
|
uint256(
|
|
order.takerAmount
|
|
- orderInfo.takerTokenFilledAmount
|
|
),
|
|
uint256(order.takerAmount),
|
|
uint256(order.makerAmount)
|
|
);
|
|
|
|
// Take the min of the balance/allowance and the fillable maker amount
|
|
fillableMakerTokenAmount = LibSafeMathV06.min256(
|
|
fillableMakerTokenAmount,
|
|
_getSpendableERC20BalanceOf(order.makerToken, order.maker)
|
|
);
|
|
|
|
// Convert to taker terms
|
|
actualFillableTakerTokenAmount = LibMathV06.getPartialAmountCeil(
|
|
fillableMakerTokenAmount,
|
|
uint256(order.makerAmount),
|
|
uint256(order.takerAmount)
|
|
).safeDowncastToUint128();
|
|
}
|
|
|
|
function _getSpendableERC20BalanceOf(
|
|
IERC20TokenV06 token,
|
|
address owner
|
|
)
|
|
internal
|
|
view
|
|
returns (uint256)
|
|
{
|
|
return LibSafeMathV06.min256(
|
|
token.allowance(owner, address(this)),
|
|
token.balanceOf(owner)
|
|
);
|
|
}
|
|
}
|