aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-06-02 18:42:31 +0800
committerFabio Berger <me@fabioberger.com>2017-06-02 18:42:31 +0800
commit6f98d8328419962e257c570e3fcb5cb4246162a3 (patch)
tree831f3a1560bf703302d40fe63592303dc71e3aca
parentefcfa1af702ca78d4d15a686136635eb775ce570 (diff)
parent2a0c6abbe7f9abeacc4fea05bc468413ec1f4732 (diff)
downloaddexon-sol-tools-6f98d8328419962e257c570e3fcb5cb4246162a3.tar
dexon-sol-tools-6f98d8328419962e257c570e3fcb5cb4246162a3.tar.gz
dexon-sol-tools-6f98d8328419962e257c570e3fcb5cb4246162a3.tar.bz2
dexon-sol-tools-6f98d8328419962e257c570e3fcb5cb4246162a3.tar.lz
dexon-sol-tools-6f98d8328419962e257c570e3fcb5cb4246162a3.tar.xz
dexon-sol-tools-6f98d8328419962e257c570e3fcb5cb4246162a3.tar.zst
dexon-sol-tools-6f98d8328419962e257c570e3fcb5cb4246162a3.zip
Merge branch 'fillOrderAsync' into addEventSubscriptions
# Conflicts: # src/contract_wrappers/exchange_wrapper.ts
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts18
-rw-r--r--test/exchange_wrapper_test.ts25
2 files changed, 39 insertions, 4 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index b394edb06..de614f471 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -203,9 +203,9 @@ export class ExchangeWrapper extends ContractWrapper {
}
this.exchangeLogEventObjs = [];
}
- private async validateFillOrderAsync(signedOrder: SignedOrder, fillAmount: BigNumber.BigNumber,
+ private async validateFillOrderAsync(signedOrder: SignedOrder, fillTakerAmountInBaseUnits: BigNumber.BigNumber,
senderAddress: string) {
- if (fillAmount.eq(0)) {
+ if (fillTakerAmountInBaseUnits.eq(0)) {
throw new Error(FillOrderValidationErrs.FILL_AMOUNT_IS_ZERO);
}
if (signedOrder.taker !== constants.NULL_ADDRESS && signedOrder.taker !== senderAddress) {
@@ -221,12 +221,22 @@ export class ExchangeWrapper extends ContractWrapper {
signedOrder.maker);
const takerAllowance = await this.tokenWrapper.getProxyAllowanceAsync(signedOrder.takerTokenAddress,
senderAddress);
- if (fillAmount.greaterThan(takerBalance)) {
+ // How many taker tokens would you get for 1 maker token;
+ const exchangeRate = signedOrder.takerTokenAmount.div(signedOrder.makerTokenAmount);
+ const fillMakerAmountInBaseUnits = fillTakerAmountInBaseUnits.div(exchangeRate);
+
+ if (fillTakerAmountInBaseUnits.greaterThan(takerBalance)) {
throw new Error(FillOrderValidationErrs.NOT_ENOUGH_TAKER_BALANCE);
}
- if (fillAmount.greaterThan(takerAllowance)) {
+ if (fillTakerAmountInBaseUnits.greaterThan(takerAllowance)) {
throw new Error(FillOrderValidationErrs.NOT_ENOUGH_TAKER_ALLOWANCE);
}
+ if (fillMakerAmountInBaseUnits.greaterThan(makerBalance)) {
+ throw new Error(FillOrderValidationErrs.NOT_ENOUGH_MAKER_BALANCE);
+ }
+ if (fillMakerAmountInBaseUnits.greaterThan(makerAllowance)) {
+ throw new Error(FillOrderValidationErrs.NOT_ENOUGH_MAKER_ALLOWANCE);
+ }
}
private throwErrorLogsAsErrors(logs: ContractEvent[]): void {
const errEvent = _.find(logs, {event: 'LogError'});
diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts
index 77e241e79..cfb75789c 100644
--- a/test/exchange_wrapper_test.ts
+++ b/test/exchange_wrapper_test.ts
@@ -190,6 +190,31 @@ describe('ExchangeWrapper', () => {
signedOrder, fillTakerAmountInBaseUnits, shouldCheckTransfer,
)).to.be.rejectedWith(FillOrderValidationErrs.NOT_ENOUGH_TAKER_ALLOWANCE);
});
+ it('should throw when maker balance is less than maker fill amount', async () => {
+ const fillableAmount = new BigNumber(5);
+ const signedOrder = await fillScenarios.createAFillableSignedOrderAsync(
+ makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
+ );
+ const lackingMakerBalance = new BigNumber(3);
+ await zeroEx.token.transferAsync(makerTokenAddress, makerAddress, coinBase, lackingMakerBalance);
+ zeroEx.setTransactionSenderAccount(takerAddress);
+ return expect(zeroEx.exchange.fillOrderAsync(
+ signedOrder, fillTakerAmountInBaseUnits, shouldCheckTransfer,
+ )).to.be.rejectedWith(FillOrderValidationErrs.NOT_ENOUGH_MAKER_BALANCE);
+ });
+ it('should throw when maker allowance is less than maker fill amount', async () => {
+ const fillableAmount = new BigNumber(5);
+ const signedOrder = await fillScenarios.createAFillableSignedOrderAsync(
+ makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
+ );
+ const newAllowanceWhichIsLessThanFillAmount = fillTakerAmountInBaseUnits.minus(1);
+ await zeroEx.token.setProxyAllowanceAsync(makerTokenAddress, makerAddress,
+ newAllowanceWhichIsLessThanFillAmount);
+ zeroEx.setTransactionSenderAccount(takerAddress);
+ return expect(zeroEx.exchange.fillOrderAsync(
+ signedOrder, fillTakerAmountInBaseUnits, shouldCheckTransfer,
+ )).to.be.rejectedWith(FillOrderValidationErrs.NOT_ENOUGH_MAKER_ALLOWANCE);
+ });
});
describe('successful fills', () => {
it('should fill the valid order', async () => {