From dbae6ec165c300a353767d9602d54d56d1b07082 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 15 Jan 2019 15:21:42 +0100 Subject: Updated CHANGELOGS --- packages/sol-trace/CHANGELOG.json | 9 +++++++++ packages/sol-trace/CHANGELOG.md | 4 ++++ 2 files changed, 13 insertions(+) (limited to 'packages/sol-trace') diff --git a/packages/sol-trace/CHANGELOG.json b/packages/sol-trace/CHANGELOG.json index 858ec8227..8157d441e 100644 --- a/packages/sol-trace/CHANGELOG.json +++ b/packages/sol-trace/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1547561734, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1547225310, "version": "1.0.1", diff --git a/packages/sol-trace/CHANGELOG.md b/packages/sol-trace/CHANGELOG.md index f2c34622d..ac09a1bbf 100644 --- a/packages/sol-trace/CHANGELOG.md +++ b/packages/sol-trace/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.2 - _January 15, 2019_ + + * Dependencies updated + ## v1.0.1 - _January 11, 2019_ * Dependencies updated -- cgit v1.2.3 From f570f80674c22f69712c45e8e3c48e948b51f357 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 15 Jan 2019 15:21:53 +0100 Subject: Publish - 0x.js@3.0.2 - @0x/abi-gen@1.0.22 - @0x/abi-gen-templates@1.0.2 - @0x/abi-gen-wrappers@2.2.0 - @0x/assert@1.0.23 - @0x/asset-buyer@4.0.1 - @0x/base-contract@3.0.13 - @0x/connect@3.0.13 - @0x/contract-addresses@2.2.0 - @0x/contract-artifacts@1.3.0 - @0x/contract-wrappers@5.0.0 - @0x/dev-tools-pages@0.0.13 - @0x/dev-utils@1.0.24 - ethereum-types@1.1.6 - @0x/fill-scenarios@1.1.2 - @0x/instant@1.0.7 - @0x/json-schemas@2.1.7 - @0x/metacoin@0.0.35 - @0x/migrations@2.4.0 - @0x/monorepo-scripts@1.0.18 - @0x/order-utils@3.1.2 - @0x/order-watcher@2.4.2 - @0x/pipeline@1.0.5 - @0x/react-docs@1.0.25 - @0x/react-shared@1.1.2 - @0x/sol-compiler@2.0.2 - @0x/sol-coverage@1.0.2 - @0x/sol-doc@1.0.14 - @0x/sol-profiler@1.0.2 - @0x/sol-resolver@1.2.3 - @0x/sol-trace@1.0.2 - @0x/sol-tracing-utils@4.0.0 - @0x/sra-spec@1.0.16 - @0x/subproviders@2.1.11 - @0x/testnet-faucets@1.0.63 - @0x/tslint-config@2.0.2 - @0x/types@1.5.2 - @0x/typescript-typings@3.0.8 - @0x/utils@3.0.1 - @0x/web3-wrapper@3.2.4 - @0x/website@0.0.66 - @0x/contracts-examples@1.0.5 - @0x/contracts-extensions@1.2.2 - @0x/contracts-interfaces@1.0.5 - @0x/contracts-libs@1.0.5 - @0x/contracts-multisig@1.0.5 - @0x/contracts-protocol@2.2.2 - @0x/contracts-test-utils@2.0.0 - @0x/contracts-tokens@1.0.5 - @0x/contracts-utils@1.0.5 --- packages/sol-trace/package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/sol-trace') diff --git a/packages/sol-trace/package.json b/packages/sol-trace/package.json index cfe2bc953..acae60303 100644 --- a/packages/sol-trace/package.json +++ b/packages/sol-trace/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-trace", - "version": "1.0.1", + "version": "1.0.2", "engines": { "node": ">=6.12" }, @@ -29,16 +29,16 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-trace/README.md", "dependencies": { - "@0x/sol-tracing-utils": "^3.0.0", - "@0x/subproviders": "^2.1.10", - "@0x/typescript-typings": "^3.0.7", - "ethereum-types": "^1.1.5", + "@0x/sol-tracing-utils": "^4.0.0", + "@0x/subproviders": "^2.1.11", + "@0x/typescript-typings": "^3.0.8", + "ethereum-types": "^1.1.6", "ethereumjs-util": "^5.1.1", "lodash": "^4.17.5", "loglevel": "^1.6.1" }, "devDependencies": { - "@0x/tslint-config": "^2.0.1", + "@0x/tslint-config": "^2.0.2", "@types/loglevel": "^1.5.3", "@types/node": "*", "npm-run-all": "^4.1.2", -- cgit v1.2.3 From fcdd0de9eea6b06449aaa9ac71dadfcd4faf4968 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 17 Jan 2019 14:37:15 +0100 Subject: Fix/simplify handling of revert trace snippets --- packages/sol-trace/src/revert_trace_subprovider.ts | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'packages/sol-trace') diff --git a/packages/sol-trace/src/revert_trace_subprovider.ts b/packages/sol-trace/src/revert_trace_subprovider.ts index fa065cfcb..046dad812 100644 --- a/packages/sol-trace/src/revert_trace_subprovider.ts +++ b/packages/sol-trace/src/revert_trace_subprovider.ts @@ -109,9 +109,7 @@ export class RevertTraceSubprovider extends TraceCollectionSubprovider { const fileNameToFileIndex = _.invert(contractData.sources); const fileIndex = _.parseInt(fileNameToFileIndex[sourceRange.fileName]); const sourceSnippet = getSourceRangeSnippet(sourceRange, contractData.sourceCodes[fileIndex]); - if (sourceSnippet !== null) { - sourceSnippets.push(sourceSnippet); - } + sourceSnippets.push(sourceSnippet); } const filteredSnippets = filterSnippets(sourceSnippets); if (filteredSnippets.length > 0) { @@ -135,9 +133,7 @@ function filterSnippets(sourceSnippets: SourceSnippet[]): SourceSnippet[] { const results: SourceSnippet[] = [sourceSnippets[0]]; let prev = sourceSnippets[0]; for (const sourceSnippet of sourceSnippets) { - if (sourceSnippet.type === 'IfStatement') { - continue; - } else if (sourceSnippet.source === prev.source) { + if (sourceSnippet.source === prev.source) { prev = sourceSnippet; continue; } @@ -157,12 +153,5 @@ function getStackTraceString(sourceSnippet: SourceSnippet): string { } function getSourceSnippetString(sourceSnippet: SourceSnippet): string { - switch (sourceSnippet.type) { - case 'ContractDefinition': - return `contract ${sourceSnippet.name}`; - case 'FunctionDefinition': - return `function ${sourceSnippet.name}`; - default: - return `${sourceSnippet.source}`; - } + return `${sourceSnippet.source}`; } -- cgit v1.2.3