diff options
24 files changed, 26 insertions, 31 deletions
diff --git a/.gitignore b/.gitignore index 1b5d40348..c37cf438e 100644 --- a/.gitignore +++ b/.gitignore @@ -76,5 +76,12 @@ bin/ # generated contract artifacts packages/contracts/src/artifacts +# generated contract wrappers +packages/0x.js/src/contract_wrappers/generated/ +packages/contracts/src/contract_wrappers/generated/ + +# solc-bin in deployer +packages/deployer/solc_bin/ + # Monorepo scripts packages/*/scripts/ diff --git a/packages/0x.js/.npmignore b/packages/0x.js/.npmignore index 7fd911797..6a3eb57bd 100644 --- a/packages/0x.js/.npmignore +++ b/packages/0x.js/.npmignore @@ -8,3 +8,4 @@ test/ /contract_templates/ /generated_docs/ /scripts/ +/lib/src/monorepo_scripts/ diff --git a/packages/0x.js/src/contract_wrappers/generated/.gitignore b/packages/0x.js/src/contract_wrappers/generated/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/packages/0x.js/src/contract_wrappers/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/packages/abi-gen/.npmignore b/packages/abi-gen/.npmignore index 87bc30436..d645458f6 100644 --- a/packages/abi-gen/.npmignore +++ b/packages/abi-gen/.npmignore @@ -3,3 +3,4 @@ yarn-error.log /src/ /scripts/ tsconfig.json +/lib/monorepo_scripts/ diff --git a/packages/assert/.npmignore b/packages/assert/.npmignore index 05fa23a59..44df80fad 100644 --- a/packages/assert/.npmignore +++ b/packages/assert/.npmignore @@ -4,3 +4,4 @@ yarn-error.log /scripts/ test/ tsconfig.json +/lib/src/monorepo_scripts/ diff --git a/packages/base-contract/.npmignore b/packages/base-contract/.npmignore index ad5ffcd56..24e65ad5b 100644 --- a/packages/base-contract/.npmignore +++ b/packages/base-contract/.npmignore @@ -3,3 +3,4 @@ yarn-error.log /scripts/ /src/ tsconfig.json +/lib/monorepo_scripts/ diff --git a/packages/connect/.npmignore b/packages/connect/.npmignore index a9d200050..9db6e838d 100644 --- a/packages/connect/.npmignore +++ b/packages/connect/.npmignore @@ -5,3 +5,4 @@ yarn-error.log /generated_docs/ test/ tsconfig.json +/lib/src/monorepo_scripts/ diff --git a/packages/contracts/src/contract_wrappers/generated/.gitignore b/packages/contracts/src/contract_wrappers/generated/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/packages/contracts/src/contract_wrappers/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/packages/deployer/.npmignore b/packages/deployer/.npmignore index 05fa23a59..44df80fad 100644 --- a/packages/deployer/.npmignore +++ b/packages/deployer/.npmignore @@ -4,3 +4,4 @@ yarn-error.log /scripts/ test/ tsconfig.json +/lib/src/monorepo_scripts/ diff --git a/packages/deployer/solc_bin/.gitignore b/packages/deployer/solc_bin/.gitignore deleted file mode 100644 index a6c7c2852..000000000 --- a/packages/deployer/solc_bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/packages/dev-utils/.npmignore b/packages/dev-utils/.npmignore index 05fa23a59..44df80fad 100644 --- a/packages/dev-utils/.npmignore +++ b/packages/dev-utils/.npmignore @@ -4,3 +4,4 @@ yarn-error.log /scripts/ test/ tsconfig.json +/lib/src/monorepo_scripts/ diff --git a/packages/json-schemas/.npmignore b/packages/json-schemas/.npmignore index e14c0cba7..5333847e7 100644 --- a/packages/json-schemas/.npmignore +++ b/packages/json-schemas/.npmignore @@ -5,3 +5,4 @@ yarn-error.log /schemas/ test/ tsconfig.json +/lib/src/monorepo_scripts/ diff --git a/packages/react-docs/.npmignore b/packages/react-docs/.npmignore index 87bc30436..d645458f6 100644 --- a/packages/react-docs/.npmignore +++ b/packages/react-docs/.npmignore @@ -3,3 +3,4 @@ yarn-error.log /src/ /scripts/ tsconfig.json +/lib/monorepo_scripts/ diff --git a/packages/react-shared/.npmignore b/packages/react-shared/.npmignore index 87bc30436..d645458f6 100644 --- a/packages/react-shared/.npmignore +++ b/packages/react-shared/.npmignore @@ -3,3 +3,4 @@ yarn-error.log /src/ /scripts/ tsconfig.json +/lib/monorepo_scripts/ diff --git a/packages/sol-cov/.npmignore b/packages/sol-cov/.npmignore index 87bc30436..037786e46 100644 --- a/packages/sol-cov/.npmignore +++ b/packages/sol-cov/.npmignore @@ -3,3 +3,4 @@ yarn-error.log /src/ /scripts/ tsconfig.json +/lib/src/monorepo_scripts/ diff --git a/packages/sra-report/.npmignore b/packages/sra-report/.npmignore index 87bc30436..d645458f6 100644 --- a/packages/sra-report/.npmignore +++ b/packages/sra-report/.npmignore @@ -3,3 +3,4 @@ yarn-error.log /src/ /scripts/ tsconfig.json +/lib/monorepo_scripts/ diff --git a/packages/subproviders/.npmignore b/packages/subproviders/.npmignore index 05fa23a59..44df80fad 100644 --- a/packages/subproviders/.npmignore +++ b/packages/subproviders/.npmignore @@ -4,3 +4,4 @@ yarn-error.log /scripts/ test/ tsconfig.json +/lib/src/monorepo_scripts/ diff --git a/packages/tslint-config/.npmignore b/packages/tslint-config/.npmignore index 1767d198e..c46793a87 100644 --- a/packages/tslint-config/.npmignore +++ b/packages/tslint-config/.npmignore @@ -4,3 +4,4 @@ node_modules/ /scripts/ /rules/ tsconfig.json +/lib/monorepo_scripts/ diff --git a/packages/types/.npmignore b/packages/types/.npmignore index ad5ffcd56..24e65ad5b 100644 --- a/packages/types/.npmignore +++ b/packages/types/.npmignore @@ -3,3 +3,4 @@ yarn-error.log /scripts/ /src/ tsconfig.json +/lib/monorepo_scripts/ diff --git a/packages/typescript-typings/.npmignore b/packages/typescript-typings/.npmignore index 104d718ed..53eb3e269 100644 --- a/packages/typescript-typings/.npmignore +++ b/packages/typescript-typings/.npmignore @@ -1,3 +1,4 @@ .* yarn-error.log /scripts/ +/lib/monorepo_scripts/ diff --git a/packages/utils/.npmignore b/packages/utils/.npmignore index ad5ffcd56..24e65ad5b 100644 --- a/packages/utils/.npmignore +++ b/packages/utils/.npmignore @@ -3,3 +3,4 @@ yarn-error.log /scripts/ /src/ tsconfig.json +/lib/monorepo_scripts/ diff --git a/packages/web3-wrapper/.npmignore b/packages/web3-wrapper/.npmignore index ad5ffcd56..24e65ad5b 100644 --- a/packages/web3-wrapper/.npmignore +++ b/packages/web3-wrapper/.npmignore @@ -3,3 +3,4 @@ yarn-error.log /scripts/ /src/ tsconfig.json +/lib/monorepo_scripts/ diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index 2268bf1ab..72cb94c02 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -151,13 +151,6 @@ export class Blockchain { } public async isAddressInTokenRegistryAsync(tokenAddress: string): Promise<boolean> { utils.assert(!_.isUndefined(this._zeroEx), 'ZeroEx must be instantiated.'); - // HACK: temporarily whitelist the new WETH token address `as if` they were - // already in the tokenRegistry. - // TODO: Remove this hack once we've updated the TokenRegistries - // Airtable task: https://airtable.com/tblFe0Q9JuKJPYbTn/viwsOG2Y97qdIeCIO/recv3VGmIorFzHBVz - if (configs.SHOULD_DEPRECATE_OLD_WETH_TOKEN && tokenAddress === configs.NEW_WRAPPED_ETHERS[this.networkId]) { - return true; - } const tokenIfExists = await this._zeroEx.tokenRegistry.getTokenIfExistsAsync(tokenAddress); return !_.isUndefined(tokenIfExists); } @@ -744,22 +737,9 @@ export class Blockchain { // HACK: For now we have a hard-coded list of iconUrls for the dummyTokens // TODO: Refactor this out and pull the iconUrl directly from the TokenRegistry const iconUrl = configs.ICON_URL_BY_SYMBOL[t.symbol]; - // HACK: Temporarily we hijack the WETH addresses fetched from the tokenRegistry - // so that we can take our time with actually updating it. This ensures that when - // we deploy the new WETH page, everyone will re-fill their trackedTokens with the - // new canonical WETH. - // TODO: Remove this hack once we've updated the TokenRegistries - // Airtable task: https://airtable.com/tblFe0Q9JuKJPYbTn/viwsOG2Y97qdIeCIO/recv3VGmIorFzHBVz - let address = t.address; - if (configs.SHOULD_DEPRECATE_OLD_WETH_TOKEN && t.symbol === 'WETH') { - const newEtherTokenAddressIfExists = configs.NEW_WRAPPED_ETHERS[this.networkId]; - if (!_.isUndefined(newEtherTokenAddressIfExists)) { - address = newEtherTokenAddressIfExists; - } - } const token: Token = { iconUrl, - address, + address: t.address, name: t.name, symbol: t.symbol, decimals: t.decimals, diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts index 597e9689a..a54fc56a8 100644 --- a/packages/website/ts/utils/configs.ts +++ b/packages/website/ts/utils/configs.ts @@ -65,12 +65,6 @@ export const configs = { GOOGLE_ANALYTICS_ID: 'UA-98720122-1', LAST_LOCAL_STORAGE_FILL_CLEARANCE_DATE: '2017-11-22', LAST_LOCAL_STORAGE_TRACKED_TOKEN_CLEARANCE_DATE: '2017-12-19', - // NEW_WRAPPED_ETHERS is temporary until we remove the SHOULD_DEPRECATE_OLD_WETH_TOKEN flag - // and add the new WETHs to the tokenRegistry - NEW_WRAPPED_ETHERS: { - 1: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', - 42: '0xd0a1e359811322d97991e03f863a0c30c2cf029c', - } as { [networkId: string]: string }, OUTDATED_WRAPPED_ETHERS: [ { 42: { @@ -96,7 +90,6 @@ export const configs = { [3]: [`https://ropsten.infura.io/${INFURA_API_KEY}`], [4]: [`https://rinkeby.infura.io/${INFURA_API_KEY}`], } as PublicNodeUrlsByNetworkId, - SHOULD_DEPRECATE_OLD_WETH_TOKEN: true, SYMBOLS_OF_MINTABLE_KOVAN_TOKENS: ['MKR', 'MLN', 'GNT', 'DGD', 'REP'], SYMBOLS_OF_MINTABLE_RINKEBY_ROPSTEN_TOKENS: [ 'TKN0', |