From 1d68c4105ac35c342de76046655748528ba6c3b8 Mon Sep 17 00:00:00 2001 From: xianny Date: Tue, 1 Oct 2019 17:17:40 -0700 Subject: [PATCH 1/2] redo changes from #2147 --- packages/0x.js/src/index.ts | 36 ++-------------------- packages/testnet-faucets/package.json | 1 + packages/testnet-faucets/src/ts/handler.ts | 17 +++++----- 3 files changed, 10 insertions(+), 44 deletions(-) diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index a7518a7029..8ac78e3ad3 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -1,4 +1,4 @@ -export { ContractAddresses } from '@0x/contract-addresses'; +export { getContractAddressesForNetworkOrThrow, NetworkId, ContractAddresses } from '@0x/contract-addresses'; export { assetDataUtils, @@ -9,12 +9,10 @@ export { } from '@0x/order-utils'; export { - ContractWrappers, CoordinatorWrapper, CoordinatorServerCancellationResponse, CoordinatorServerError, IndexedFilterValues, - ContractWrappersConfig, OrderTransactionOpts, TransactionOpts, OrderInfo, @@ -33,9 +31,6 @@ export { ExchangeAssetProxyRegisteredEventArgs, ExchangeContract, DevUtilsContract, - ForwarderContract, - DutchAuctionContract, - CoordinatorContract, CoordinatorRegistryEventArgs, CoordinatorRegistryEvents, CoordinatorRegistryCoordinatorEndpointSetEventArgs, @@ -70,28 +65,6 @@ export { ZRXTokenTransferEventArgs, ZRXTokenApprovalEventArgs, ZRXTokenContract, - DummyERC20TokenEventArgs, - DummyERC20TokenEvents, - DummyERC20TokenTransferEventArgs, - DummyERC20TokenApprovalEventArgs, - DummyERC20TokenContract, - DummyERC721TokenEventArgs, - DummyERC721TokenEvents, - DummyERC721TokenTransferEventArgs, - DummyERC721TokenApprovalEventArgs, - DummyERC721TokenApprovalForAllEventArgs, - DummyERC721TokenContract, - ERC20ProxyEventArgs, - ERC20ProxyEvents, - ERC20ProxyContract, - ERC20ProxyAuthorizedAddressAddedEventArgs, - ERC20ProxyAuthorizedAddressRemovedEventArgs, - ERC721ProxyEventArgs, - ERC721ProxyEvents, - ERC721ProxyAuthorizedAddressAddedEventArgs, - ERC721ProxyAuthorizedAddressRemovedEventArgs, - ERC721ProxyContract, - OrderValidatorContract, } from '@0x/abi-gen-wrappers'; export import Web3ProviderEngine = require('web3-provider-engine'); @@ -104,7 +77,7 @@ export { MetamaskSubprovider, } from '@0x/subproviders'; -export { AbiDecoder, DecodedCalldata, BigNumber } from '@0x/utils'; +export { DecodedCalldata, BigNumber } from '@0x/utils'; export { Order, @@ -139,12 +112,7 @@ export { JSONRPCRequestPayload, JSONRPCResponsePayload, JSONRPCResponseError, - LogEntry, DecodedLogArgs, - LogEntryEvent, - DecodedLogEntry, - DecodedLogEntryEvent, - RawLog, AbiDefinition, FunctionAbi, EventAbi, diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 25073d8287..d2c751cd4d 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -20,6 +20,7 @@ "license": "Apache-2.0", "dependencies": { "0x.js": "^7.0.2", + "@0x/contract-addresses": "^3.1.0", "@0x/contract-wrappers": "^12.1.0", "@0x/subproviders": "^5.0.4", "@0x/typescript-typings": "^4.3.0", diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts index b70674cfa7..fbd6e1fda4 100644 --- a/packages/testnet-faucets/src/ts/handler.ts +++ b/packages/testnet-faucets/src/ts/handler.ts @@ -1,7 +1,6 @@ import { assetDataUtils, BigNumber, - ContractWrappers, generatePseudoRandomSalt, Order, orderHashUtils, @@ -10,9 +9,10 @@ import { SignedOrder, Web3ProviderEngine, } from '0x.js'; +import { getContractAddressesForNetworkOrThrow } from '@0x/contract-addresses'; import { NonceTrackerSubprovider, PrivateKeyWalletSubprovider } from '@0x/subproviders'; import { logUtils } from '@0x/utils'; -import { Web3Wrapper } from '@0x/web3-wrapper'; +import { SupportedProvider, Web3Wrapper } from '@0x/web3-wrapper'; import * as express from 'express'; import * as _ from 'lodash'; @@ -26,7 +26,7 @@ import { TOKENS_BY_NETWORK } from './tokens'; interface NetworkConfig { dispatchQueue: DispatchQueue; web3Wrapper: Web3Wrapper; - contractWrappers: ContractWrappers; + provider: SupportedProvider; networkId: number; } @@ -64,15 +64,11 @@ export class Handler { const web3Wrapper = new Web3Wrapper(providerObj); // tslint:disable-next-line:custom-no-magic-numbers const networkId = parseInt(networkIdString, 10); - const contractWrappersConfig = { - networkId, - }; - const contractWrappers = new ContractWrappers(providerObj, contractWrappersConfig); const dispatchQueue = new DispatchQueue(); this._networkConfigByNetworkId[networkId] = { dispatchQueue, web3Wrapper, - contractWrappers, + provider: providerObj, networkId, }; }); @@ -124,7 +120,7 @@ export class Handler { recipient, requestedAssetType, networkConfig.networkId, - networkConfig.contractWrappers.getProvider(), + networkConfig.provider, ); break; default: @@ -164,6 +160,7 @@ export class Handler { const takerAssetAmount = Web3Wrapper.toBaseUnitAmount(ASSET_AMOUNT, takerTokenIfExists.decimals); const makerAssetData = assetDataUtils.encodeERC20AssetData(makerTokenIfExists.address); const takerAssetData = assetDataUtils.encodeERC20AssetData(takerTokenIfExists.address); + const contractAddresses = getContractAddressesForNetworkOrThrow(networkConfig.networkId); const order: Order = { makerAddress: configs.DISPENSER_ADDRESS, takerAddress: req.params.recipient as string, @@ -182,7 +179,7 @@ export class Handler { // tslint:disable-next-line:custom-no-magic-numbers .div(1000) .integerValue(BigNumber.ROUND_FLOOR), - exchangeAddress: networkConfig.contractWrappers.exchange.address, + exchangeAddress: contractAddresses.exchange, chainId: networkConfig.networkId, }; const orderHash = orderHashUtils.getOrderHashHex(order); From 3adbe843dafe3a2f7361a8b3e423db6cc0246889 Mon Sep 17 00:00:00 2001 From: xianny Date: Tue, 1 Oct 2019 17:51:25 -0700 Subject: [PATCH 2/2] update contract-addresses version --- packages/testnet-faucets/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index d2c751cd4d..aab6c24775 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -20,7 +20,7 @@ "license": "Apache-2.0", "dependencies": { "0x.js": "^7.0.2", - "@0x/contract-addresses": "^3.1.0", + "@0x/contract-addresses": "^3.2.0", "@0x/contract-wrappers": "^12.1.0", "@0x/subproviders": "^5.0.4", "@0x/typescript-typings": "^4.3.0",