aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorBrandon Millman <brandon@0xproject.com>2018-02-10 04:39:43 +0800
committerGitHub <noreply@github.com>2018-02-10 04:39:43 +0800
commit2e3c9b87df9b8a0b99533e89ce3442b5f4fec5df (patch)
treeb91ff5cc4db5ff2cc348dffe99489cbbfbd4a5a3 /packages
parentfea4b6aecd5b1e80b5e70a6792db056e6b621c8a (diff)
parent0a2947b86039030707d0d1bf20c27857bffad2aa (diff)
downloaddexon-sol-tools-2e3c9b87df9b8a0b99533e89ce3442b5f4fec5df.tar
dexon-sol-tools-2e3c9b87df9b8a0b99533e89ce3442b5f4fec5df.tar.gz
dexon-sol-tools-2e3c9b87df9b8a0b99533e89ce3442b5f4fec5df.tar.bz2
dexon-sol-tools-2e3c9b87df9b8a0b99533e89ce3442b5f4fec5df.tar.lz
dexon-sol-tools-2e3c9b87df9b8a0b99533e89ce3442b5f4fec5df.tar.xz
dexon-sol-tools-2e3c9b87df9b8a0b99533e89ce3442b5f4fec5df.tar.zst
dexon-sol-tools-2e3c9b87df9b8a0b99533e89ce3442b5f4fec5df.zip
Merge pull request #388 from 0xProject/fix/testnet-faucet/base-unit-orders
Convert to baseUnits in signed order
Diffstat (limited to 'packages')
-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..5f6ada186 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)) {
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)) {
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,