crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add additional gas to calls to fillOrderNoThrow

Browse Source
This commit is contained in:
Alex Browne 2018-06-05 14:59:20 -07:00
parent 45a3d8b75a
commit 36b01fbdcf
No known key found for this signature in database
GPG Key ID: 7974B08A447ABE31
3 changed files with 55 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/contracts/src/utils/exchange_wrapper.ts
View File

@ -60,14 +60,14 @@ export class ExchangeWrapper {
public async fillOrderNoThrowAsync(
signedOrder: SignedOrder,
from: string,
opts: { takerAssetFillAmount?: BigNumber } = {},
opts: { takerAssetFillAmount?: BigNumber; gas?: number } = {},
): Promise<TransactionReceiptWithDecodedLogs> {
const params = orderUtils.createFill(signedOrder, opts.takerAssetFillAmount);
const txHash = await this._exchange.fillOrderNoThrow.sendTransactionAsync(
params.order,
params.takerAssetFillAmount,
params.signature,
{ from },
{ from, gas: opts.gas },
);
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
return tx;
@ -105,14 +105,14 @@ export class ExchangeWrapper {
public async batchFillOrdersNoThrowAsync(
orders: SignedOrder[],
from: string,
opts: { takerAssetFillAmounts?: BigNumber[] } = {},
opts: { takerAssetFillAmounts?: BigNumber[]; gas?: number } = {},
): Promise<TransactionReceiptWithDecodedLogs> {
const params = formatters.createBatchFill(orders, opts.takerAssetFillAmounts);
const txHash = await this._exchange.batchFillOrdersNoThrow.sendTransactionAsync(
params.orders,
params.takerAssetFillAmounts,
params.signatures,
{ from },
{ from, gas: opts.gas },
);
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
return tx;
@ -135,14 +135,14 @@ export class ExchangeWrapper {
public async marketSellOrdersNoThrowAsync(
orders: SignedOrder[],
from: string,
opts: { takerAssetFillAmount: BigNumber },
opts: { takerAssetFillAmount: BigNumber; gas?: number },
): Promise<TransactionReceiptWithDecodedLogs> {
const params = formatters.createMarketSellOrders(orders, opts.takerAssetFillAmount);
const txHash = await this._exchange.marketSellOrdersNoThrow.sendTransactionAsync(
params.orders,
params.takerAssetFillAmount,
params.signatures,
{ from },
{ from, gas: opts.gas },
);
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
return tx;

13
packages/contracts/test/exchange/core.ts
View File

@ -621,14 +621,7 @@ describe('Exchange core', () => {
);
});
// TODO(albrow):
//
// AssertionError: expected '9021000000000000000000' to equal '1042000000000000000000'
// + expected - actual
//
// -9021000000000000000000
// +1042000000000000000000
it.skip('should cancel only orders with a makerEpoch less than existing makerEpoch', async () => {
it('should cancel only orders with a makerEpoch less than existing makerEpoch', async () => {
// Cancel all transactions with a makerEpoch less than 1
const makerEpoch = new BigNumber(1);
await exchangeWrapper.cancelOrdersUpToAsync(makerEpoch, makerAddress);
@ -658,7 +651,9 @@ describe('Exchange core', () => {
salt: new BigNumber(3),
}),
];
await exchangeWrapper.batchFillOrdersNoThrowAsync(signedOrders, takerAddress);
await exchangeWrapper.batchFillOrdersNoThrowAsync(signedOrders, takerAddress, {
gas: 490000,
});
const newBalances = await erc20Wrapper.getBalancesAsync();
const fillMakerAssetAmount = signedOrders[2].makerAssetAmount.add(signedOrders[3].makerAssetAmount);

182
packages/contracts/test/exchange/wrapper.ts
View File

@ -192,71 +192,50 @@ describe('Exchange wrappers', () => {
});
describe('fillOrderNoThrow', () => {
// TODO(albrow):
//
// AssertionError: expected '10000000000000000000000' to equal '9950000000000000000000'
// + expected - actual
// -10000000000000000000000
// +9950000000000000000000
//
// We think this is failing due to a problem in the fillOrderNoThrow
// function in the smart contract. (There's a lot of assembly).
it.skip('should transfer the correct amounts', async () => {
it('should transfer the correct amounts', async () => {
const signedOrder = orderFactory.newSignedOrder({
makerAssetAmount: Web3Wrapper.toBaseUnitAmount(new BigNumber(100), 18),
takerAssetAmount: Web3Wrapper.toBaseUnitAmount(new BigNumber(200), 18),
});
const takerAssetFillAmount = signedOrder.takerAssetAmount.div(2);
console.log('maker balance: ', erc20Balances[makerAddress][defaultMakerAssetAddress].toString());
await exchangeWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress, {
takerAssetFillAmount,
gas: 250000,
});
const newBalances = await erc20Wrapper.getBalancesAsync();
const makerAssetFilledAmount = takerAssetFillAmount
.times(signedOrder.makerAssetAmount)
.dividedToIntegerBy(signedOrder.takerAssetAmount);
const makerFee = signedOrder.makerFee
.times(makerAssetFilledAmount)
.dividedToIntegerBy(signedOrder.makerAssetAmount);
const takerFee = signedOrder.takerFee
.times(makerAssetFilledAmount)
.dividedToIntegerBy(signedOrder.makerAssetAmount);
console.log('new maker balance: ', newBalances[makerAddress][defaultMakerAssetAddress].toString());
// const makerAssetFilledAmount = takerAssetFillAmount
// .times(signedOrder.makerAssetAmount)
// .dividedToIntegerBy(signedOrder.takerAssetAmount);
// const makerFee = signedOrder.makerFee
// .times(makerAssetFilledAmount)
// .dividedToIntegerBy(signedOrder.makerAssetAmount);
// const takerFee = signedOrder.takerFee
// .times(makerAssetFilledAmount)
// .dividedToIntegerBy(signedOrder.makerAssetAmount);
// console.log('makerAssetFilledAmount: ', makerAssetFilledAmount);
// console.log('makerFee: ', makerFee);
// console.log('takerFee: ', takerFee);
// expect(newBalances[makerAddress][defaultMakerAssetAddress]).to.be.bignumber.equal(
// erc20Balances[makerAddress][defaultMakerAssetAddress].minus(makerAssetFilledAmount),
// );
// console.log(1);
// expect(newBalances[makerAddress][defaultTakerAssetAddress]).to.be.bignumber.equal(
// erc20Balances[makerAddress][defaultTakerAssetAddress].add(takerAssetFillAmount),
// );
// console.log(2);
// expect(newBalances[makerAddress][zrxToken.address]).to.be.bignumber.equal(
// erc20Balances[makerAddress][zrxToken.address].minus(makerFee),
// );
// console.log(3);
// expect(newBalances[takerAddress][defaultTakerAssetAddress]).to.be.bignumber.equal(
// erc20Balances[takerAddress][defaultTakerAssetAddress].minus(takerAssetFillAmount),
// );
// console.log(4);
// expect(newBalances[takerAddress][defaultMakerAssetAddress]).to.be.bignumber.equal(
// erc20Balances[takerAddress][defaultMakerAssetAddress].add(makerAssetFilledAmount),
// );
// console.log(5);
// expect(newBalances[takerAddress][zrxToken.address]).to.be.bignumber.equal(
// erc20Balances[takerAddress][zrxToken.address].minus(takerFee),
// );
// console.log(6);
// expect(newBalances[feeRecipientAddress][zrxToken.address]).to.be.bignumber.equal(
// erc20Balances[feeRecipientAddress][zrxToken.address].add(makerFee.add(takerFee)),
// );
expect(newBalances[makerAddress][defaultMakerAssetAddress]).to.be.bignumber.equal(
erc20Balances[makerAddress][defaultMakerAssetAddress].minus(makerAssetFilledAmount),
);
expect(newBalances[makerAddress][defaultTakerAssetAddress]).to.be.bignumber.equal(
erc20Balances[makerAddress][defaultTakerAssetAddress].add(takerAssetFillAmount),
);
expect(newBalances[makerAddress][zrxToken.address]).to.be.bignumber.equal(
erc20Balances[makerAddress][zrxToken.address].minus(makerFee),
);
expect(newBalances[takerAddress][defaultTakerAssetAddress]).to.be.bignumber.equal(
erc20Balances[takerAddress][defaultTakerAssetAddress].minus(takerAssetFillAmount),
);
expect(newBalances[takerAddress][defaultMakerAssetAddress]).to.be.bignumber.equal(
erc20Balances[takerAddress][defaultMakerAssetAddress].add(makerAssetFilledAmount),
);
expect(newBalances[takerAddress][zrxToken.address]).to.be.bignumber.equal(
erc20Balances[takerAddress][zrxToken.address].minus(takerFee),
);
expect(newBalances[feeRecipientAddress][zrxToken.address]).to.be.bignumber.equal(
erc20Balances[feeRecipientAddress][zrxToken.address].add(makerFee.add(takerFee)),
);
});
it('should not change erc20Balances if maker erc20Balances are too low to fill order', async () => {
@ -367,13 +346,7 @@ describe('Exchange wrappers', () => {
expect(newBalances).to.be.deep.equal(erc20Balances);
});
// TODO(albrow):
// AssertionError: expected '632535711063398434296830887161296310597744028651' to equal '1298408583951973923893717610336274351578718691204'
// + expected - actual
// -632535711063398434296830887161296310597744028651
// +1298408583951973923893717610336274351578718691204
it.skip('should successfully exchange ERC721 tokens', async () => {
it('should successfully exchange ERC721 tokens', async () => {
// Construct Exchange parameters
const makerAssetId = erc721MakerAssetId;
const takerAssetId = erc721TakerAssetId;
@ -390,7 +363,10 @@ describe('Exchange wrappers', () => {
expect(initialOwnerTakerAsset).to.be.bignumber.equal(takerAddress);
// Call Exchange
const takerAssetFillAmount = signedOrder.takerAssetAmount;
await exchangeWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress, { takerAssetFillAmount });
await exchangeWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress, {
takerAssetFillAmount,
gas: 270000,
});
// Verify post-conditions
const newOwnerMakerAsset = await erc721Token.ownerOf.callAsync(makerAssetId);
expect(newOwnerMakerAsset).to.be.bignumber.equal(takerAddress);
@ -524,76 +500,7 @@ describe('Exchange wrappers', () => {
});
describe('batchFillOrdersNoThrow', async () => {
// TODO(albrow)
//
// AssertionError: expected { Object (0x5409ed021d9299bf6814279a6a1411a7e866a631, 0x6ecbe1db9ef729cbe972c83fb886247691fb6beb, ...) } to deeply equal { Object (0x5409ed021d9299bf6814279a6a1411a7e866a631, 0x6ecbe1db9ef729cbe972c83fb886247691fb6beb, ...) }
// + expected - actual
//
// }
// "0x6ecbe1db9ef729cbe972c83fb886247691fb6beb": {
// "0x0b1ba0af832d7c05fd64161e0db78e85978e8082": {
// "c": [
// - 102000000
// + 103000000
// ]
// "e": 22
// "s": 1
// }
// "0x34d402f14d58e001d8efbe6585051bf9706aa064": {
// "c": [
// - 99000000
// + 98500000
// ]
// "e": 21
// "s": 1
// }
// "0x48bacb9266a570d521063ef5dd96e61686dbe788": {
// "c": [
// - 99990000
// + 99985000
// ]
// "e": 21
// "s": 1
// }
// --
// }
// "0xe36ea790bc9d7ab70c55260c66d52b1eca985f84": {
// "0x0b1ba0af832d7c05fd64161e0db78e85978e8082": {
// "c": [
// - 98000000
// + 97000000
// ]
// "e": 21
// "s": 1
// }
// "0x34d402f14d58e001d8efbe6585051bf9706aa064": {
// "c": [
// - 101000000
// + 101500000
// ]
// "e": 22
// "s": 1
// }
// "0x48bacb9266a570d521063ef5dd96e61686dbe788": {
// "c": [
// - 99990000
// + 99985000
// ]
// "e": 21
// "s": 1
// }
// --
// "s": 1
// }
// "0x48bacb9266a570d521063ef5dd96e61686dbe788": {
// "c": [
// - 100020000
// + 100030000
// ]
// "e": 22
// "s": 1
// }
it.skip('should transfer the correct amounts', async () => {
it('should transfer the correct amounts', async () => {
const takerAssetFillAmounts: BigNumber[] = [];
const makerAssetAddress = erc20TokenA.address;
const takerAssetAddress = erc20TokenB.address;
@ -634,14 +541,14 @@ describe('Exchange wrappers', () => {
await exchangeWrapper.batchFillOrdersNoThrowAsync(signedOrders, takerAddress, {
takerAssetFillAmounts,
gas: 600000,
});
const newBalances = await erc20Wrapper.getBalancesAsync();
expect(newBalances).to.be.deep.equal(erc20Balances);
});
// TODO(albrow): Failing similar to above.
it.skip('should not throw if an order is invalid and fill the remaining orders', async () => {
it('should not throw if an order is invalid and fill the remaining orders', async () => {
const takerAssetFillAmounts: BigNumber[] = [];
const makerAssetAddress = erc20TokenA.address;
const takerAssetAddress = erc20TokenB.address;
@ -691,6 +598,7 @@ describe('Exchange wrappers', () => {
const newOrders = [invalidOrder, ...validOrders];
await exchangeWrapper.batchFillOrdersNoThrowAsync(newOrders, takerAddress, {
takerAssetFillAmounts,
gas: 450000,
});
const newBalances = await erc20Wrapper.getBalancesAsync();
@ -826,8 +734,7 @@ describe('Exchange wrappers', () => {
);
});
// TODO(albrow): Failing with wrong values
it.skip('should fill all signedOrders if cannot fill entire takerAssetFillAmount', async () => {
it('should fill all signedOrders if cannot fill entire takerAssetFillAmount', async () => {
const takerAssetFillAmount = Web3Wrapper.toBaseUnitAmount(new BigNumber(100000), 18);
_.forEach(signedOrders, signedOrder => {
erc20Balances[makerAddress][defaultMakerAssetAddress] = erc20Balances[makerAddress][
@ -854,6 +761,7 @@ describe('Exchange wrappers', () => {
});
await exchangeWrapper.marketSellOrdersNoThrowAsync(signedOrders, takerAddress, {
takerAssetFillAmount,
gas: 600000,
});
const newBalances = await erc20Wrapper.getBalancesAsync();
@ -1005,8 +913,7 @@ describe('Exchange wrappers', () => {
);
});
// TODO(albrow): Failing with wrong values
it.skip('should fill all signedOrders if cannot fill entire takerAssetFillAmount', async () => {
it('should fill all signedOrders if cannot fill entire takerAssetFillAmount', async () => {
const takerAssetFillAmount = Web3Wrapper.toBaseUnitAmount(new BigNumber(100000), 18);
_.forEach(signedOrders, signedOrder => {
erc20Balances[makerAddress][defaultMakerAssetAddress] = erc20Balances[makerAddress][
@ -1033,6 +940,7 @@ describe('Exchange wrappers', () => {
});
await exchangeWrapper.marketSellOrdersNoThrowAsync(signedOrders, takerAddress, {
takerAssetFillAmount,
gas: 600000,
});
const newBalances = await erc20Wrapper.getBalancesAsync();