diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2018-02-06 08:28:03 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2018-02-06 10:11:26 +0800 |
commit | 83d0bad3a1e6635dedb46fbd99ee1bec5246d4bf (patch) | |
tree | 626fd908627a4b6b7e48c3b7326c12a1f30c2f5f /packages/testnet-faucets/src/ts/handler.ts | |
parent | 99b1f81e89e3ac929c7829552ea7ae19998524e9 (diff) | |
download | dexon-0x-contracts-83d0bad3a1e6635dedb46fbd99ee1bec5246d4bf.tar dexon-0x-contracts-83d0bad3a1e6635dedb46fbd99ee1bec5246d4bf.tar.gz dexon-0x-contracts-83d0bad3a1e6635dedb46fbd99ee1bec5246d4bf.tar.bz2 dexon-0x-contracts-83d0bad3a1e6635dedb46fbd99ee1bec5246d4bf.tar.lz dexon-0x-contracts-83d0bad3a1e6635dedb46fbd99ee1bec5246d4bf.tar.xz dexon-0x-contracts-83d0bad3a1e6635dedb46fbd99ee1bec5246d4bf.tar.zst dexon-0x-contracts-83d0bad3a1e6635dedb46fbd99ee1bec5246d4bf.zip |
Addressed comments and update 0xProject/types-ethereumjs-util deps
Diffstat (limited to 'packages/testnet-faucets/src/ts/handler.ts')
-rw-r--r-- | packages/testnet-faucets/src/ts/handler.ts | 92 |
1 files changed, 41 insertions, 51 deletions
diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts index 7883cefd8..1dae8a47f 100644 --- a/packages/testnet-faucets/src/ts/handler.ts +++ b/packages/testnet-faucets/src/ts/handler.ts @@ -2,13 +2,13 @@ import { Order, SignedOrder, ZeroEx } from '0x.js'; import { BigNumber } from '@0xproject/utils'; import * as express from 'express'; import * as _ from 'lodash'; +import * as Web3 from 'web3'; // HACK: web3 injects XMLHttpRequest into the global scope and ProviderEngine checks XMLHttpRequest // to know whether it is running in a browser or node environment. We need it to be undefined since // we are not running in a browser env. // Filed issue: https://github.com/ethereum/web3.js/issues/844 (global as any).XMLHttpRequest = undefined; - import ProviderEngine = require('web3-provider-engine'); import HookedWalletSubprovider = require('web3-provider-engine/subproviders/hooked-wallet'); import NonceSubprovider = require('web3-provider-engine/subproviders/nonce-tracker'); @@ -22,12 +22,6 @@ import { rpcUrls } from './rpc_urls'; import { utils } from './utils'; import { ZRXRequestQueue } from './zrx_request_queue'; -// HACK: web3 leaks XMLHttpRequest into the global scope and causes requests to hang -// because they are using the wrong XHR package. -// Filed issue: https://github.com/ethereum/web3.js/issues/844 -// tslint:disable-next-line:ordered-imports -import * as Web3 from 'web3'; - interface ItemByNetworkId<T> { [networkId: string]: T; } @@ -38,15 +32,46 @@ enum RequestedAssetType { ZRX = 'ZRX', } -const TWO_DAYS_IN_MS = 1.728e8; // TODO: make this configurable +const FIVE_DAYS_IN_MS = 4.32e8; // TODO: make this configurable export class Handler { private _zeroExByNetworkId: ItemByNetworkId<ZeroEx> = {}; private _etherRequestQueueByNetworkId: ItemByNetworkId<RequestQueue> = {}; private _zrxRequestQueueByNetworkId: ItemByNetworkId<RequestQueue> = {}; + private static _dispenseAsset( + req: express.Request, + res: express.Response, + requestQueueByNetworkId: ItemByNetworkId<RequestQueue>, + requestedAssetType: RequestedAssetType, + ) { + const requestQueue = _.get(requestQueueByNetworkId, req.params.networkId); + if (_.isUndefined(requestQueue)) { + res.status(400).send('UNSUPPORTED_NETWORK_ID'); + return; + } + const didAddToQueue = requestQueue.add(req.params.recipient); + if (!didAddToQueue) { + res.status(503).send('QUEUE_IS_FULL'); + return; + } + utils.consoleLog(`Added ${req.params.recipient} to queue: ${requestedAssetType} networkId: ${req.params.networkId}`); + res.status(200).end(); + } + private static _createProviderEngine(rpcUrl: string) { + const engine = new ProviderEngine(); + engine.addProvider(new NonceSubprovider()); + engine.addProvider(new HookedWalletSubprovider(idManagement)); + engine.addProvider( + new RpcSubprovider({ + rpcUrl, + }), + ); + engine.start(); + return engine; + } constructor() { _.forIn(rpcUrls, (rpcUrl: string, networkId: string) => { - const providerObj = this._createProviderEngine(rpcUrl); + const providerObj = Handler._createProviderEngine(rpcUrl); const web3 = new Web3(providerObj); const zeroExConfig = { networkId: +networkId, @@ -77,10 +102,10 @@ export class Handler { res.status(200).send(payload); } public dispenseEther(req: express.Request, res: express.Response) { - this._dispenseAsset(req, res, this._etherRequestQueueByNetworkId, RequestedAssetType.ETH); + Handler._dispenseAsset(req, res, this._etherRequestQueueByNetworkId, RequestedAssetType.ETH); } public dispenseZRX(req: express.Request, res: express.Response) { - this._dispenseAsset(req, res, this._zrxRequestQueueByNetworkId, RequestedAssetType.ZRX); + Handler._dispenseAsset(req, res, this._zrxRequestQueueByNetworkId, RequestedAssetType.ZRX); } public async dispenseWETHOrder(req: express.Request, res: express.Response) { await this._dispenseOrder(req, res, RequestedAssetType.WETH); @@ -88,28 +113,8 @@ export class Handler { public async dispenseZRXOrder(req: express.Request, res: express.Response, next: express.NextFunction) { await this._dispenseOrder(req, res, RequestedAssetType.ZRX); } - // tslint:disable-next-line:prefer-function-over-method - private _dispenseAsset( - req: express.Request, - res: express.Response, - requestQueueByNetworkId: ItemByNetworkId<RequestQueue>, - requestedAssetType: RequestedAssetType, - ) { - const requestQueue = _.get(requestQueueByNetworkId, req.networkId); - if (_.isUndefined(requestQueue)) { - res.status(400).send('UNSUPPORTED_NETWORK_ID'); - return; - } - const didAddToQueue = requestQueue.add(req.recipientAddress); - if (!didAddToQueue) { - res.status(503).send('QUEUE_IS_FULL'); - return; - } - utils.consoleLog(`Added ${req.recipientAddress} to queue: ${requestedAssetType} networkId: ${req.networkId}`); - res.status(200).end(); - } private async _dispenseOrder(req: express.Request, res: express.Response, requestedAssetType: RequestedAssetType) { - const zeroEx = _.get(this._zeroExByNetworkId, req.networkId); + const zeroEx = _.get(this._zeroExByNetworkId, req.params.networkId); if (_.isUndefined(zeroEx)) { res.status(400).send('UNSUPPORTED_NETWORK_ID'); return; @@ -117,21 +122,19 @@ export class Handler { res.setHeader('Content-Type', 'application/json'); const makerTokenAddress = await zeroEx.tokenRegistry.getTokenAddressBySymbolIfExistsAsync(requestedAssetType); if (_.isUndefined(makerTokenAddress)) { - res.status(400).send('INVALID_TOKEN'); - return; + 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)) { - res.status(400).send('INVALID_TOKEN'); - return; + throw new Error(`Unsupported asset type: ${requestedAssetType}`); } const makerTokenAmount = new BigNumber(0.1); const takerTokenAmount = new BigNumber(0.1); const order: Order = { maker: configs.DISPENSER_ADDRESS, - taker: req.recipientAddress, + taker: req.params.recipient, makerFee: new BigNumber(0), takerFee: new BigNumber(0), makerTokenAmount, @@ -141,7 +144,7 @@ export class Handler { salt: ZeroEx.generatePseudoRandomSalt(), exchangeContractAddress: zeroEx.exchange.getContractAddress(), feeRecipient: ZeroEx.NULL_ADDRESS, - expirationUnixTimestampSec: new BigNumber(Date.now() + TWO_DAYS_IN_MS), + expirationUnixTimestampSec: new BigNumber(Date.now() + FIVE_DAYS_IN_MS), }; const orderHash = ZeroEx.getOrderHashHex(order); const signature = await zeroEx.signOrderHashAsync(orderHash, configs.DISPENSER_ADDRESS, false); @@ -154,17 +157,4 @@ export class Handler { utils.consoleLog(`Dispensed signed order: ${payload}`); res.status(200).send(payload); } - // tslint:disable-next-line:prefer-function-over-method - private _createProviderEngine(rpcUrl: string) { - const engine = new ProviderEngine(); - engine.addProvider(new NonceSubprovider()); - engine.addProvider(new HookedWalletSubprovider(idManagement)); - engine.addProvider( - new RpcSubprovider({ - rpcUrl, - }), - ); - engine.start(); - return engine; - } } |