crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2232 from 0xProject/refactor/3.0-wrappers

Browse Source 
Reduce exports from 0x.js
This commit is contained in:
Fabio B 2019-10-02 06:45:02 +02:00 committed by GitHub
commit 18366bd58d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/0x.js/src/index.ts
View File

@ -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,

1
packages/testnet-faucets/package.json
View File

@ -20,6 +20,7 @@
"license": "Apache-2.0",
"dependencies": {
"0x.js": "^7.0.2",
"@0x/contract-addresses": "^3.2.0",
"@0x/contract-wrappers": "^12.1.0",
"@0x/subproviders": "^5.0.4",
"@0x/typescript-typings": "^4.3.0",

17
packages/testnet-faucets/src/ts/handler.ts
View File

@ -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);