From ebbb4df227d5e290b4bd392322405440dded6e4c Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Mon, 21 Jan 2019 15:16:16 +1100 Subject: [PATCH 01/17] Remove owner from migrations --- packages/migrations/src/migration.ts | 50 ++++++++++------------------ 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts index e0f2450173..f33d6337aa 100644 --- a/packages/migrations/src/migration.ts +++ b/packages/migrations/src/migration.ts @@ -18,8 +18,9 @@ import { erc20TokenInfo, erc721TokenInfo } from './utils/token_info'; */ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial): Promise { const web3Wrapper = new Web3Wrapper(provider); - const accounts: string[] = await web3Wrapper.getAvailableAddressesAsync(); - const owner = accounts[0]; + if (_.isUndefined(txDefaults.from)) { + throw new Error('from address must be specified'); + } // Proxies const erc20Proxy = await wrappers.ERC20ProxyContract.deployFrom0xArtifactAsync( @@ -84,48 +85,38 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial ); await web3Wrapper.awaitTransactionSuccessAsync( - await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { - from: owner, - }), + await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, txDefaults), ); await web3Wrapper.awaitTransactionSuccessAsync( - await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { - from: owner, - }), + await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, txDefaults), ); await web3Wrapper.awaitTransactionSuccessAsync( - await multiAssetProxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { - from: owner, - }), + await multiAssetProxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, txDefaults), ); // MultiAssetProxy await web3Wrapper.awaitTransactionSuccessAsync( - await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(multiAssetProxy.address, { - from: owner, - }), + await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(multiAssetProxy.address, txDefaults), ); await web3Wrapper.awaitTransactionSuccessAsync( - await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(multiAssetProxy.address, { - from: owner, - }), + await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(multiAssetProxy.address, txDefaults), ); await web3Wrapper.awaitTransactionSuccessAsync( - await multiAssetProxy.registerAssetProxy.sendTransactionAsync(erc20Proxy.address), + await multiAssetProxy.registerAssetProxy.sendTransactionAsync(erc20Proxy.address, txDefaults), ); await web3Wrapper.awaitTransactionSuccessAsync( - await multiAssetProxy.registerAssetProxy.sendTransactionAsync(erc721Proxy.address), + await multiAssetProxy.registerAssetProxy.sendTransactionAsync(erc721Proxy.address, txDefaults), ); // Register the Asset Proxies to the Exchange await web3Wrapper.awaitTransactionSuccessAsync( - await exchange.registerAssetProxy.sendTransactionAsync(erc20Proxy.address), + await exchange.registerAssetProxy.sendTransactionAsync(erc20Proxy.address, txDefaults), ); await web3Wrapper.awaitTransactionSuccessAsync( - await exchange.registerAssetProxy.sendTransactionAsync(erc721Proxy.address), + await exchange.registerAssetProxy.sendTransactionAsync(erc721Proxy.address, txDefaults), ); await web3Wrapper.awaitTransactionSuccessAsync( - await exchange.registerAssetProxy.sendTransactionAsync(multiAssetProxy.address), + await exchange.registerAssetProxy.sendTransactionAsync(multiAssetProxy.address, txDefaults), ); // Forwarder @@ -156,7 +147,8 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial ); // Multisigs - const owners = [accounts[0], accounts[1]]; + const accounts: string[] = await web3Wrapper.getAvailableAddressesAsync(); + const owners = _.uniq([accounts[0], accounts[1], txDefaults.from]); const confirmationsRequired = new BigNumber(2); const secondsRequired = new BigNumber(0); @@ -173,19 +165,13 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial // Transfer Ownership to the Asset Proxy Owner await web3Wrapper.awaitTransactionSuccessAsync( - await erc20Proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { - from: owner, - }), + await erc20Proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, txDefaults), ); await web3Wrapper.awaitTransactionSuccessAsync( - await erc721Proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { - from: owner, - }), + await erc721Proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, txDefaults), ); await web3Wrapper.awaitTransactionSuccessAsync( - await multiAssetProxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { - from: owner, - }), + await multiAssetProxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, txDefaults), ); // Fund the Forwarder with ZRX From bee48d1d4304738afd67c829490f2b90b6ce8677 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Mon, 21 Jan 2019 15:52:39 +1100 Subject: [PATCH 02/17] Remove partial type for TxData txDefaults --- packages/migrations/CHANGELOG.json | 4 ++++ packages/migrations/src/migration.ts | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index 64ae94b14c..7938f137f8 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -5,6 +5,10 @@ { "note": "Upgrade the bignumber.js to v8.0.2", "pr": 1517 + }, + { + "note": "Removed `owner` in Migrations. `txDefaults` is now a non-Partial type", + "pr": 1533 } ] }, diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts index f33d6337aa..7668ec9238 100644 --- a/packages/migrations/src/migration.ts +++ b/packages/migrations/src/migration.ts @@ -16,11 +16,8 @@ import { erc20TokenInfo, erc721TokenInfo } from './utils/token_info'; * @param txDefaults Default transaction values to use when deploying contracts (e.g., specify the desired contract creator with the `from` parameter). * @returns The addresses of the contracts that were deployed. */ -export async function runMigrationsAsync(provider: Provider, txDefaults: Partial): Promise { +export async function runMigrationsAsync(provider: Provider, txDefaults: TxData): Promise { const web3Wrapper = new Web3Wrapper(provider); - if (_.isUndefined(txDefaults.from)) { - throw new Error('from address must be specified'); - } // Proxies const erc20Proxy = await wrappers.ERC20ProxyContract.deployFrom0xArtifactAsync( @@ -206,10 +203,7 @@ let _cachedContractAddresses: ContractAddresses; * @param txDefaults Default transaction values to use when deploying contracts (e.g., specify the desired contract creator with the `from` parameter). * @returns The addresses of the contracts that were deployed. */ -export async function runMigrationsOnceAsync( - provider: Provider, - txDefaults: Partial, -): Promise { +export async function runMigrationsOnceAsync(provider: Provider, txDefaults: TxData): Promise { if (!_.isUndefined(_cachedContractAddresses)) { return _cachedContractAddresses; } From 98203bcc8ccc771e925d041f58025c37f1da1305 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Mon, 21 Jan 2019 16:02:20 +1100 Subject: [PATCH 03/17] Convert from to lower case. fixes #1490 --- packages/migrations/CHANGELOG.json | 4 ++++ packages/migrations/src/cli.ts | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index 7938f137f8..6637746dea 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -9,6 +9,10 @@ { "note": "Removed `owner` in Migrations. `txDefaults` is now a non-Partial type", "pr": 1533 + }, + { + "note": "Convert `from` to lower case", + "pr": 1533 } ] }, diff --git a/packages/migrations/src/cli.ts b/packages/migrations/src/cli.ts index 2404e79217..4e8ce982fa 100644 --- a/packages/migrations/src/cli.ts +++ b/packages/migrations/src/cli.ts @@ -27,8 +27,9 @@ const args = yargs const provider = new Web3ProviderEngine(); provider.addProvider(rpcSubprovider); provider.start(); + const normalizedFromAddress = (args.from as string).toLowerCase(); const txDefaults = { - from: args.from, + from: normalizedFromAddress, }; await runMigrationsAsync(provider, txDefaults); process.exit(0); From 6f090a2fdada03eab95ca7cc800c4ca6d851e6ee Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Wed, 23 Jan 2019 11:11:32 +1100 Subject: [PATCH 04/17] Improve CHANGELOG --- packages/migrations/CHANGELOG.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index 6637746dea..ffda41e103 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -7,11 +7,15 @@ "pr": 1517 }, { - "note": "Removed `owner` in Migrations. `txDefaults` is now a non-Partial type", + "note": "Removed `owner` in Migrations", "pr": 1533 }, { - "note": "Convert `from` to lower case", + "note": "`txDefaults` parameter now requires the `from` field", + "pr": 1533 + }, + { + "note": "Convert `from` to lower case when passed in via cli", "pr": 1533 } ] From e272f8e1d9b82e6cc24f5cddb3e852ed463923ab Mon Sep 17 00:00:00 2001 From: David Sun Date: Thu, 24 Jan 2019 15:44:42 -0500 Subject: [PATCH 05/17] changed error message --- packages/instant/src/components/erc20_asset_amount_input.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/instant/src/components/erc20_asset_amount_input.tsx b/packages/instant/src/components/erc20_asset_amount_input.tsx index 0418f9165c..7e09f777a7 100644 --- a/packages/instant/src/components/erc20_asset_amount_input.tsx +++ b/packages/instant/src/components/erc20_asset_amount_input.tsx @@ -95,7 +95,7 @@ export class ERC20AssetAmountInput extends React.PureComponent From 68dbf8b2a7feeb3f394cc57227304f9ae7b2a4a3 Mon Sep 17 00:00:00 2001 From: David Sun Date: Thu, 24 Jan 2019 22:31:16 -0500 Subject: [PATCH 06/17] added new svg assets and modified svg code to fix transparency --- .../ts/icons/illustrations/low-cost.svg | 52 +++++++++---------- .../illustrations/networkedLiquidity.svg | 46 +++++++--------- .../ts/icons/illustrations/secureTrading.svg | 28 +++++----- 3 files changed, 59 insertions(+), 67 deletions(-) diff --git a/packages/website/ts/icons/illustrations/low-cost.svg b/packages/website/ts/icons/illustrations/low-cost.svg index 530cbdd791..da0d2e27c5 100644 --- a/packages/website/ts/icons/illustrations/low-cost.svg +++ b/packages/website/ts/icons/illustrations/low-cost.svg @@ -1,30 +1,30 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/website/ts/icons/illustrations/networkedLiquidity.svg b/packages/website/ts/icons/illustrations/networkedLiquidity.svg index c50ba7e7c3..e03488ac7e 100755 --- a/packages/website/ts/icons/illustrations/networkedLiquidity.svg +++ b/packages/website/ts/icons/illustrations/networkedLiquidity.svg @@ -1,28 +1,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/packages/website/ts/icons/illustrations/secureTrading.svg b/packages/website/ts/icons/illustrations/secureTrading.svg index 21912961d1..109ddbb5ba 100755 --- a/packages/website/ts/icons/illustrations/secureTrading.svg +++ b/packages/website/ts/icons/illustrations/secureTrading.svg @@ -1,15 +1,15 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + From 1e939591ae244a4cde45df3e04afbd41276c94ec Mon Sep 17 00:00:00 2001 From: David Sun Date: Sat, 26 Jan 2019 19:26:40 -0500 Subject: [PATCH 07/17] added USDC as an option --- packages/instant/src/assets/icons/usdc.svg | 1 + packages/instant/src/data/asset_data_network_mapping.ts | 5 +++++ packages/instant/src/data/asset_meta_data_map.ts | 7 +++++++ 3 files changed, 13 insertions(+) create mode 100644 packages/instant/src/assets/icons/usdc.svg diff --git a/packages/instant/src/assets/icons/usdc.svg b/packages/instant/src/assets/icons/usdc.svg new file mode 100644 index 0000000000..6302c7b518 --- /dev/null +++ b/packages/instant/src/assets/icons/usdc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/instant/src/data/asset_data_network_mapping.ts b/packages/instant/src/data/asset_data_network_mapping.ts index 4fd0a25eda..77fe75adc9 100644 --- a/packages/instant/src/data/asset_data_network_mapping.ts +++ b/packages/instant/src/data/asset_data_network_mapping.ts @@ -63,4 +63,9 @@ export const assetDataNetworkMapping: AssetDataByNetwork[] = [ [Network.Kovan]: '0xf47261b00000000000000000000000008cb3971b8eb709c14616bd556ff6683019e90d9c', [Network.Mainnet]: '0xf47261b00000000000000000000000001985365e9f78359a9b6ad760e32412f4a445e862', }, + // USDC + { + [Network.Kovan]: '', + [Network.Mainnet]: '0xf47261b0000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', + }, ]; diff --git a/packages/instant/src/data/asset_meta_data_map.ts b/packages/instant/src/data/asset_meta_data_map.ts index 88611a8c07..a8cb349f06 100644 --- a/packages/instant/src/data/asset_meta_data_map.ts +++ b/packages/instant/src/data/asset_meta_data_map.ts @@ -199,4 +199,11 @@ export const assetMetaDataMap: ObjectMap = { symbol: 'dai', name: 'Dai Stablecoin', }, + '0xf47261b0000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': { + assetProxyId: AssetProxyId.ERC20, + decimals: 6, + primaryColor: '#2775CA', + symbol: 'usdc', + name: 'USD Coin', + }, }; From ba645692b08e649a33b1f6ccdccadc57cb7ef128 Mon Sep 17 00:00:00 2001 From: David Sun Date: Tue, 29 Jan 2019 16:19:00 -0500 Subject: [PATCH 08/17] updated svg asset --- packages/instant/src/assets/icons/usdc.svg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/instant/src/assets/icons/usdc.svg b/packages/instant/src/assets/icons/usdc.svg index 6302c7b518..a9201efb65 100644 --- a/packages/instant/src/assets/icons/usdc.svg +++ b/packages/instant/src/assets/icons/usdc.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + From e23f90e41c177552aa7e1bde98c6ba1b7acb9d4f Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 30 Jan 2019 13:31:01 +0100 Subject: [PATCH 09/17] Fix the cannot read property range of null bug --- packages/sol-tracing-utils/CHANGELOG.json | 4 ++++ packages/sol-tracing-utils/src/ast_visitor.ts | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/sol-tracing-utils/CHANGELOG.json b/packages/sol-tracing-utils/CHANGELOG.json index 16a12ca632..024e896da5 100644 --- a/packages/sol-tracing-utils/CHANGELOG.json +++ b/packages/sol-tracing-utils/CHANGELOG.json @@ -17,6 +17,10 @@ { "note": "Print resasonable error message on bytecode collision", "pr": 1535 + }, + { + "note": "Fix the bug in `ASTVisitor` causing the 'cannot read property `range` of `null`' error", + "pr": 1557 } ] }, diff --git a/packages/sol-tracing-utils/src/ast_visitor.ts b/packages/sol-tracing-utils/src/ast_visitor.ts index 1ac9cd1de9..27f19378bc 100644 --- a/packages/sol-tracing-utils/src/ast_visitor.ts +++ b/packages/sol-tracing-utils/src/ast_visitor.ts @@ -89,7 +89,9 @@ export class ASTVisitor { this._visitStatement(ast); } public ExpressionStatement(ast: Parser.ExpressionStatement): void { - this._visitStatement(ast.expression); + if (!_.isNull(ast.expression)) { + this._visitStatement(ast.expression); + } } public InlineAssemblyStatement(ast: Parser.InlineAssemblyStatement): void { this._visitStatement(ast); From ea5e78b217fdb43c50be13a80417e77ff06c970e Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 30 Jan 2019 13:55:58 +0100 Subject: [PATCH 10/17] Improve error messages when unable to find bytecode --- packages/sol-trace/CHANGELOG.json | 9 +++++++++ packages/sol-trace/package.json | 1 + .../sol-trace/src/revert_trace_subprovider.ts | 17 +++++++++++++++-- packages/sol-tracing-utils/CHANGELOG.json | 4 ++++ packages/sol-tracing-utils/package.json | 1 + .../sol-tracing-utils/src/trace_collector.ts | 17 +++++++++++++++-- 6 files changed, 45 insertions(+), 4 deletions(-) diff --git a/packages/sol-trace/CHANGELOG.json b/packages/sol-trace/CHANGELOG.json index 550ca2feb9..b633b3d212 100644 --- a/packages/sol-trace/CHANGELOG.json +++ b/packages/sol-trace/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "2.0.1", + "changes": [ + { + "note": "Improve error messages when unable to find matching bytecode", + "pr": 1558 + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/sol-trace/package.json b/packages/sol-trace/package.json index 2aedf7ebc8..25e81a82af 100644 --- a/packages/sol-trace/package.json +++ b/packages/sol-trace/package.json @@ -32,6 +32,7 @@ "@0x/sol-tracing-utils": "^4.0.1", "@0x/subproviders": "^2.1.11", "@0x/typescript-typings": "^3.0.8", + "chalk": "^2.3.0", "ethereum-types": "^1.1.6", "ethereumjs-util": "^5.1.1", "lodash": "^4.17.5", diff --git a/packages/sol-trace/src/revert_trace_subprovider.ts b/packages/sol-trace/src/revert_trace_subprovider.ts index 046dad8124..899a928142 100644 --- a/packages/sol-trace/src/revert_trace_subprovider.ts +++ b/packages/sol-trace/src/revert_trace_subprovider.ts @@ -11,6 +11,7 @@ import { TraceCollectionSubprovider, utils, } from '@0x/sol-tracing-utils'; +import chalk from 'chalk'; import { stripHexPrefix } from 'ethereumjs-util'; import * as _ from 'lodash'; import { getLogger, levels, Logger } from 'loglevel'; @@ -71,9 +72,21 @@ export class RevertTraceSubprovider extends TraceCollectionSubprovider { const bytecode = await this._web3Wrapper.getContractCodeAsync(evmCallStackEntry.address); const contractData = utils.getContractDataIfExists(this._contractsData, bytecode); if (_.isUndefined(contractData)) { + const shortenHex = (hex: string) => { + /** + * Length chooses so that both error messages are of the same length + * and it's enough data to figure out which artifact has a problem. + */ + const length = 18; + return `${hex.substr(0, length + 2)}...${hex.substr(hex.length - length, length)}`; + }; const errMsg = isContractCreation - ? `Unknown contract creation transaction` - : `Transaction to an unknown address: ${evmCallStackEntry.address}`; + ? `Unable to find matching bytecode for contract creation ${chalk.bold( + shortenHex(bytecode), + )}, please check your artifacts. Ignoring...` + : `Unable to find matching bytecode for contract address ${chalk.bold( + evmCallStackEntry.address, + )}, please check your artifacts. Ignoring...`; this._logger.warn(errMsg); continue; } diff --git a/packages/sol-tracing-utils/CHANGELOG.json b/packages/sol-tracing-utils/CHANGELOG.json index 024e896da5..89a5b6876d 100644 --- a/packages/sol-tracing-utils/CHANGELOG.json +++ b/packages/sol-tracing-utils/CHANGELOG.json @@ -21,6 +21,10 @@ { "note": "Fix the bug in `ASTVisitor` causing the 'cannot read property `range` of `null`' error", "pr": 1557 + }, + { + "note": "Improve error messages when unable to find matching bytecode", + "pr": 1558 } ] }, diff --git a/packages/sol-tracing-utils/package.json b/packages/sol-tracing-utils/package.json index 4b0fff222a..929c73b84e 100644 --- a/packages/sol-tracing-utils/package.json +++ b/packages/sol-tracing-utils/package.json @@ -53,6 +53,7 @@ "ethereum-types": "^1.1.6", "ethereumjs-util": "^5.1.1", "glob": "^7.1.2", + "chalk": "^2.3.0", "istanbul": "^0.4.5", "lodash": "^4.17.5", "loglevel": "^1.6.1", diff --git a/packages/sol-tracing-utils/src/trace_collector.ts b/packages/sol-tracing-utils/src/trace_collector.ts index f5dde87621..2a1f15b838 100644 --- a/packages/sol-tracing-utils/src/trace_collector.ts +++ b/packages/sol-tracing-utils/src/trace_collector.ts @@ -1,4 +1,5 @@ import { promisify } from '@0x/utils'; +import chalk from 'chalk'; import { stripHexPrefix } from 'ethereumjs-util'; import * as fs from 'fs'; import { Collector } from 'istanbul'; @@ -71,9 +72,21 @@ export class TraceCollector { : (traceInfo as TraceInfoExistingContract).runtimeBytecode; const contractData = utils.getContractDataIfExists(this._contractsData, bytecode); if (_.isUndefined(contractData)) { + const shortenHex = (hex: string) => { + /** + * Length chooses so that both error messages are of the same length + * and it's enough data to figure out which artifact has a problem. + */ + const length = 18; + return `${hex.substr(0, length + 2)}...${hex.substr(hex.length - length, length)}`; + }; const errMsg = isContractCreation - ? `Unknown contract creation transaction` - : `Transaction to an unknown address: ${traceInfo.address}`; + ? `Unable to find matching bytecode for contract creation ${chalk.bold( + shortenHex(bytecode), + )}, please check your artifacts. Ignoring...` + : `Unable to find matching bytecode for contract address ${chalk.bold( + traceInfo.address, + )}, please check your artifacts. Ignoring...`; this._logger.warn(errMsg); return; } From d6b6f1e7d9bcb7570593600cf89574bdebb05c27 Mon Sep 17 00:00:00 2001 From: Fabio B Date: Wed, 30 Jan 2019 14:25:43 +0100 Subject: [PATCH 11/17] Update packages/sol-trace/src/revert_trace_subprovider.ts Co-Authored-By: LogvinovLeon --- packages/sol-trace/src/revert_trace_subprovider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sol-trace/src/revert_trace_subprovider.ts b/packages/sol-trace/src/revert_trace_subprovider.ts index 899a928142..ea2b684a59 100644 --- a/packages/sol-trace/src/revert_trace_subprovider.ts +++ b/packages/sol-trace/src/revert_trace_subprovider.ts @@ -74,7 +74,7 @@ export class RevertTraceSubprovider extends TraceCollectionSubprovider { if (_.isUndefined(contractData)) { const shortenHex = (hex: string) => { /** - * Length chooses so that both error messages are of the same length + * Length choosen so that both error messages are of the same length * and it's enough data to figure out which artifact has a problem. */ const length = 18; From 3d8caa4694bf90d7916a6c8dfbcc057bb95b5cce Mon Sep 17 00:00:00 2001 From: "F. Eugene Aumson" Date: Wed, 30 Jan 2019 15:51:59 -0500 Subject: [PATCH 12/17] Fix hang in Python CI test runs (#1560) --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d0115c47b2..af25def64f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -201,7 +201,7 @@ jobs: steps: - checkout - run: sudo chown -R circleci:circleci /usr/local/bin - - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages + - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7 - restore_cache: key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} - run: @@ -249,7 +249,7 @@ jobs: steps: - checkout - run: sudo chown -R circleci:circleci /usr/local/bin - - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages + - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7 - restore_cache: key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} - run: @@ -277,7 +277,7 @@ jobs: steps: - checkout - run: sudo chown -R circleci:circleci /usr/local/bin - - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages + - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7 - restore_cache: key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} - run: From 96e880d1704a4daeaad655c395681c66c376f8b1 Mon Sep 17 00:00:00 2001 From: fragosti Date: Wed, 30 Jan 2019 15:28:55 -0800 Subject: [PATCH 13/17] fix typos on landing --- packages/website/ts/pages/why.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/ts/pages/why.tsx b/packages/website/ts/pages/why.tsx index a0ed5f95a4..905258ccb9 100644 --- a/packages/website/ts/pages/why.tsx +++ b/packages/website/ts/pages/why.tsx @@ -102,7 +102,7 @@ export class NextWhy extends React.Component { @@ -110,7 +110,7 @@ export class NextWhy extends React.Component { Date: Wed, 30 Jan 2019 15:29:42 -0800 Subject: [PATCH 14/17] add site verification tag --- packages/website/public/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/website/public/index.html b/packages/website/public/index.html index 738b675e75..7b143ddfa4 100644 --- a/packages/website/public/index.html +++ b/packages/website/public/index.html @@ -11,6 +11,7 @@ content="An Open Protocol For Decentralized Exchange On The Ethereum Blockchain" /> + 0x: The Protocol for Trading Tokens From 0c9369bf043b4d95d259cbcd9161d94ae65eb437 Mon Sep 17 00:00:00 2001 From: fragosti Date: Wed, 30 Jan 2019 15:31:34 -0800 Subject: [PATCH 15/17] fix typo --- packages/website/ts/pages/why.tsx | 2 +- yarn.lock | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/packages/website/ts/pages/why.tsx b/packages/website/ts/pages/why.tsx index 905258ccb9..48888d10a7 100644 --- a/packages/website/ts/pages/why.tsx +++ b/packages/website/ts/pages/why.tsx @@ -102,7 +102,7 @@ export class NextWhy extends React.Component { diff --git a/yarn.lock b/yarn.lock index 1b51eff116..3bc39a8306 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13495,6 +13495,15 @@ react-dom@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" +react-dom@^16.4.2: + version "16.7.0" + resolved "https://registry.npmjs.org/react-dom/-/react-dom-16.7.0.tgz#a17b2a7ca89ee7390bc1ed5eb81783c7461748b8" + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.12.0" + react-dom@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7" @@ -13821,6 +13830,15 @@ react@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" +react@^16.4.2: + version "16.7.0" + resolved "https://registry.npmjs.org/react/-/react-16.7.0.tgz#b674ec396b0a5715873b350446f7ea0802ab6381" + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.12.0" + react@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42" @@ -14709,6 +14727,13 @@ schedule@^0.5.0: dependencies: object-assign "^4.1.1" +scheduler@^0.12.0: + version "0.12.0" + resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.12.0.tgz#8ab17699939c0aedc5a196a657743c496538647b" + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.4.4: version "0.4.7" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" From 4efe9419370a61530cfb235086b05fbee7c4abe0 Mon Sep 17 00:00:00 2001 From: fragosti Date: Wed, 30 Jan 2019 17:22:33 -0800 Subject: [PATCH 16/17] remove extra quotes from google-site-verification --- packages/website/public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/public/index.html b/packages/website/public/index.html index 7b143ddfa4..dd17beebc4 100644 --- a/packages/website/public/index.html +++ b/packages/website/public/index.html @@ -11,7 +11,7 @@ content="An Open Protocol For Decentralized Exchange On The Ethereum Blockchain" /> - + 0x: The Protocol for Trading Tokens From c9facdf8253010fb44d2385ca465d576e5b338f1 Mon Sep 17 00:00:00 2001 From: David Sun Date: Thu, 31 Jan 2019 18:56:31 -0500 Subject: [PATCH 17/17] changed button to medium blue --- packages/website/ts/components/portal/back_button.tsx | 2 +- packages/website/ts/components/portal/portal.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/ts/components/portal/back_button.tsx b/packages/website/ts/components/portal/back_button.tsx index bea69bb95d..9b4451196d 100644 --- a/packages/website/ts/components/portal/back_button.tsx +++ b/packages/website/ts/components/portal/back_button.tsx @@ -31,7 +31,7 @@ export const BackButton = (props: BackButtonProps) => {
-
{props.labelText}
+
{props.labelText}
diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx index 59cf2db71e..6ebbf8d1fb 100644 --- a/packages/website/ts/components/portal/portal.tsx +++ b/packages/website/ts/components/portal/portal.tsx @@ -321,7 +321,7 @@ export class Portal extends React.Component { }; return (
} + header={} body={} /> );