aboutsummaryrefslogtreecommitdiffstats
path: root/src/contract_wrappers
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-08-21 20:02:50 +0800
committerGitHub <noreply@github.com>2017-08-21 20:02:50 +0800
commitdd6997423f64509f1badfc8b44a63e3cf73db648 (patch)
tree3ffff9842331b90a9f3a01dc17bc310eb26e82fa /src/contract_wrappers
parent69668d07c17fbd303316360f88ba89c9e7464a15 (diff)
parent9099ef4ee554a44f46d9de128333b7ad231fa61a (diff)
downloaddexon-sol-tools-dd6997423f64509f1badfc8b44a63e3cf73db648.tar
dexon-sol-tools-dd6997423f64509f1badfc8b44a63e3cf73db648.tar.gz
dexon-sol-tools-dd6997423f64509f1badfc8b44a63e3cf73db648.tar.bz2
dexon-sol-tools-dd6997423f64509f1badfc8b44a63e3cf73db648.tar.lz
dexon-sol-tools-dd6997423f64509f1badfc8b44a63e3cf73db648.tar.xz
dexon-sol-tools-dd6997423f64509f1badfc8b44a63e3cf73db648.tar.zst
dexon-sol-tools-dd6997423f64509f1badfc8b44a63e3cf73db648.zip
Merge pull request #118 from 0xProject/artifacts-update
Update artifacts with the latest mainnet version
Diffstat (limited to 'src/contract_wrappers')
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts4
-rw-r--r--src/contract_wrappers/token_registry_wrapper.ts3
2 files changed, 3 insertions, 4 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 5d7521e89..a324b8554 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -669,7 +669,7 @@ export class ExchangeWrapper extends ContractWrapper {
);
const wouldRoundingErrorOccur = await this._isRoundingErrorAsync(
- signedOrder.takerTokenAmount, fillTakerAmount, signedOrder.makerTokenAmount,
+ fillTakerAmount, signedOrder.takerTokenAmount, signedOrder.makerTokenAmount,
);
if (wouldRoundingErrorOccur) {
throw new Error(ExchangeContractErrs.OrderFillRoundingError);
@@ -713,7 +713,7 @@ export class ExchangeWrapper extends ContractWrapper {
makerTokenAmount: BigNumber.BigNumber): Promise<boolean> {
const exchangeInstance = await this._getExchangeContractAsync();
const isRoundingError = await exchangeInstance.isRoundingError.call(
- demoninator, numerator, makerTokenAmount,
+ numerator, demoninator, makerTokenAmount,
);
return isRoundingError;
}
diff --git a/src/contract_wrappers/token_registry_wrapper.ts b/src/contract_wrappers/token_registry_wrapper.ts
index d15e5c4f7..eaaea150d 100644
--- a/src/contract_wrappers/token_registry_wrapper.ts
+++ b/src/contract_wrappers/token_registry_wrapper.ts
@@ -30,8 +30,7 @@ export class TokenRegistryWrapper extends ContractWrapper {
address: metadata[0],
name: metadata[1],
symbol: metadata[2],
- url: metadata[3],
- decimals: metadata[4].toNumber(),
+ decimals: metadata[3].toNumber(),
};
});
return tokens;