* 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>
133 lines
5.4 KiB
TypeScript
133 lines
5.4 KiB
TypeScript
import { artifacts as erc20Artifacts, DummyERC20TokenContract } from '@0x/contracts-erc20';
|
|
import { blockchainTests, constants, expect, web3Wrapper } from '@0x/contracts-test-utils';
|
|
import { BigNumber } from '@0x/utils';
|
|
import * as _ from 'lodash';
|
|
|
|
import { artifacts } from '../artifacts';
|
|
import { BalanceCheckerContract } from '../wrappers';
|
|
|
|
// tslint:disable: custom-no-magic-numbers
|
|
|
|
const ETH_ADDRESS = '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee';
|
|
|
|
blockchainTests.resets('BalanceChecker contract', env => {
|
|
let contract: BalanceCheckerContract;
|
|
|
|
before(async () => {
|
|
contract = await BalanceCheckerContract.deployFrom0xArtifactAsync(
|
|
artifacts.BalanceChecker,
|
|
env.provider,
|
|
env.txDefaults,
|
|
{},
|
|
);
|
|
});
|
|
|
|
describe('getBalances', () => {
|
|
it('returns the correct array for a successful call', async () => {
|
|
const makerToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync(
|
|
erc20Artifacts.DummyERC20Token,
|
|
env.provider,
|
|
env.txDefaults,
|
|
artifacts,
|
|
constants.DUMMY_TOKEN_NAME,
|
|
constants.DUMMY_TOKEN_SYMBOL,
|
|
new BigNumber(18),
|
|
constants.DUMMY_TOKEN_TOTAL_SUPPLY,
|
|
);
|
|
|
|
const accounts = await web3Wrapper.getAvailableAddressesAsync();
|
|
const owner = accounts[0];
|
|
const owner2 = accounts[1];
|
|
|
|
await makerToken.mint(new BigNumber(100)).awaitTransactionSuccessAsync({ from: owner });
|
|
|
|
const testResults = await contract.balances([owner, owner2], [makerToken.address, ETH_ADDRESS]).callAsync();
|
|
|
|
expect(testResults).to.eql([new BigNumber(100), new BigNumber(100000000000000000000)]);
|
|
});
|
|
it('it throws an error if the input arrays of different lengths', async () => {
|
|
const accounts = await web3Wrapper.getAvailableAddressesAsync();
|
|
const owner = accounts[0];
|
|
|
|
try {
|
|
await contract.balances([owner], [ETH_ADDRESS, ETH_ADDRESS]).callAsync();
|
|
expect.fail();
|
|
} catch (error) {
|
|
expect(error.message).to.eql('users array is a different length than the tokens array');
|
|
}
|
|
});
|
|
});
|
|
describe('getMinOfBalancesOrAllowances', () => {
|
|
it('returns the balance if the allowance can cover it', async () => {
|
|
const makerToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync(
|
|
erc20Artifacts.DummyERC20Token,
|
|
env.provider,
|
|
env.txDefaults,
|
|
artifacts,
|
|
constants.DUMMY_TOKEN_NAME,
|
|
constants.DUMMY_TOKEN_SYMBOL,
|
|
new BigNumber(18),
|
|
constants.DUMMY_TOKEN_TOTAL_SUPPLY,
|
|
);
|
|
|
|
const accounts = await web3Wrapper.getAvailableAddressesAsync();
|
|
const owner = accounts[0];
|
|
const owner2 = accounts[1];
|
|
|
|
const allowanceTarget = '0xdef1c0ded9bec7f1a1670819833240f027b25eff';
|
|
|
|
await makerToken.mint(new BigNumber(100)).awaitTransactionSuccessAsync({ from: owner });
|
|
await makerToken.approve(allowanceTarget, new BigNumber(150)).awaitTransactionSuccessAsync({ from: owner });
|
|
|
|
await makerToken.mint(new BigNumber(150)).awaitTransactionSuccessAsync({ from: owner2 });
|
|
await makerToken
|
|
.approve(allowanceTarget, new BigNumber(200))
|
|
.awaitTransactionSuccessAsync({ from: owner2 });
|
|
|
|
const testResults = await contract
|
|
.getMinOfBalancesOrAllowances(
|
|
[owner, owner2],
|
|
[makerToken.address, makerToken.address],
|
|
allowanceTarget,
|
|
)
|
|
.callAsync();
|
|
|
|
expect(testResults).to.eql([new BigNumber(100), new BigNumber(150)]);
|
|
});
|
|
it('returns the allowance if the allowance < balance', async () => {
|
|
const makerToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync(
|
|
erc20Artifacts.DummyERC20Token,
|
|
env.provider,
|
|
env.txDefaults,
|
|
artifacts,
|
|
constants.DUMMY_TOKEN_NAME,
|
|
constants.DUMMY_TOKEN_SYMBOL,
|
|
new BigNumber(18),
|
|
constants.DUMMY_TOKEN_TOTAL_SUPPLY,
|
|
);
|
|
|
|
const accounts = await web3Wrapper.getAvailableAddressesAsync();
|
|
const owner = accounts[0];
|
|
const owner2 = accounts[1];
|
|
|
|
const allowanceTarget = '0xdef1c0ded9bec7f1a1670819833240f027b25eff';
|
|
|
|
await makerToken.mint(new BigNumber(100)).awaitTransactionSuccessAsync({ from: owner });
|
|
await makerToken.approve(allowanceTarget, new BigNumber(50)).awaitTransactionSuccessAsync({ from: owner });
|
|
|
|
await makerToken.mint(new BigNumber(100)).awaitTransactionSuccessAsync({ from: owner2 });
|
|
await makerToken.approve(allowanceTarget, new BigNumber(75)).awaitTransactionSuccessAsync({ from: owner2 });
|
|
|
|
const testResults = await contract
|
|
.getMinOfBalancesOrAllowances(
|
|
[owner, owner2],
|
|
[makerToken.address, makerToken.address],
|
|
allowanceTarget,
|
|
)
|
|
.callAsync();
|
|
|
|
expect(testResults).to.eql([new BigNumber(50), new BigNumber(75)]);
|
|
});
|
|
});
|
|
});
|