aboutsummaryrefslogtreecommitdiffstats
path: root/packages/testnet-faucets/src
diff options
context:
space:
mode:
authorJacob Evans <jacob@dekz.net>2018-02-10 04:20:25 +0800
committerJacob Evans <jacob@dekz.net>2018-02-10 04:20:25 +0800
commite68b9c7e81dd89867fadef3d1d87a988f968f450 (patch)
treed8ba6d5954b87203276bbe31b7f748282682c247 /packages/testnet-faucets/src
parentfea4b6aecd5b1e80b5e70a6792db056e6b621c8a (diff)
downloaddexon-sol-tools-e68b9c7e81dd89867fadef3d1d87a988f968f450.tar
dexon-sol-tools-e68b9c7e81dd89867fadef3d1d87a988f968f450.tar.gz
dexon-sol-tools-e68b9c7e81dd89867fadef3d1d87a988f968f450.tar.bz2
dexon-sol-tools-e68b9c7e81dd89867fadef3d1d87a988f968f450.tar.lz
dexon-sol-tools-e68b9c7e81dd89867fadef3d1d87a988f968f450.tar.xz
dexon-sol-tools-e68b9c7e81dd89867fadef3d1d87a988f968f450.tar.zst
dexon-sol-tools-e68b9c7e81dd89867fadef3d1d87a988f968f450.zip
Convert to baseUnits in signed order
Diffstat (limited to 'packages/testnet-faucets/src')
-rw-r--r--packages/testnet-faucets/src/ts/handler.ts16
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts
index ac2718f84..bf713d709 100644
--- a/packages/testnet-faucets/src/ts/handler.ts
+++ b/packages/testnet-faucets/src/ts/handler.ts
@@ -129,18 +129,18 @@ export class Handler {
}
const zeroEx = networkConfig.zeroEx;
res.setHeader('Content-Type', 'application/json');
- const makerTokenAddress = await zeroEx.tokenRegistry.getTokenAddressBySymbolIfExistsAsync(requestedAssetType);
- if (_.isUndefined(makerTokenAddress)) {
+ const makerToken = await zeroEx.tokenRegistry.getTokenBySymbolIfExistsAsync(requestedAssetType);
+ if (_.isUndefined(makerToken) || _.isUndefined(makerToken.address)) {
throw new Error(`Unsupported asset type: ${requestedAssetType}`);
}
const takerTokenSymbol =
requestedAssetType === RequestedAssetType.WETH ? RequestedAssetType.ZRX : RequestedAssetType.WETH;
- const takerTokenAddress = await zeroEx.tokenRegistry.getTokenAddressBySymbolIfExistsAsync(takerTokenSymbol);
- if (_.isUndefined(takerTokenAddress)) {
+ const takerToken = await zeroEx.tokenRegistry.getTokenBySymbolIfExistsAsync(takerTokenSymbol);
+ if (_.isUndefined(takerToken) || _.isUndefined(takerToken.address)) {
throw new Error(`Unsupported asset type: ${requestedAssetType}`);
}
- const makerTokenAmount = new BigNumber(0.1);
- const takerTokenAmount = new BigNumber(0.1);
+ const makerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(0.1), makerToken.decimals);
+ const takerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(0.1), takerToken.decimals);
const order: Order = {
maker: configs.DISPENSER_ADDRESS,
taker: req.params.recipient,
@@ -148,8 +148,8 @@ export class Handler {
takerFee: new BigNumber(0),
makerTokenAmount,
takerTokenAmount,
- makerTokenAddress,
- takerTokenAddress,
+ makerTokenAddress: makerToken.address,
+ takerTokenAddress: takerToken.address,
salt: ZeroEx.generatePseudoRandomSalt(),
exchangeContractAddress: zeroEx.exchange.getContractAddress(),
feeRecipient: ZeroEx.NULL_ADDRESS,