From 5b8f294aafa7834434345d1e340fd692b2d888c2 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 20 Mar 2019 14:31:01 +0100 Subject: [PATCH 1/2] Update solidity-parser-antlr --- packages/sol-tracing-utils/CHANGELOG.json | 9 +++++ packages/sol-tracing-utils/package.json | 4 +-- yarn.lock | 43 +++++------------------ 3 files changed, 20 insertions(+), 36 deletions(-) diff --git a/packages/sol-tracing-utils/CHANGELOG.json b/packages/sol-tracing-utils/CHANGELOG.json index 80a3a287a3..ef6013414c 100644 --- a/packages/sol-tracing-utils/CHANGELOG.json +++ b/packages/sol-tracing-utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "6.0.8", + "changes": [ + { + "note": "Update solidity-parser-antlr to 0.4.2", + "pr": 1719 + } + ] + }, { "version": "6.0.7", "changes": [ diff --git a/packages/sol-tracing-utils/package.json b/packages/sol-tracing-utils/package.json index f1793d6116..4ac5d88a45 100644 --- a/packages/sol-tracing-utils/package.json +++ b/packages/sol-tracing-utils/package.json @@ -49,7 +49,7 @@ "@0x/typescript-typings": "^4.1.0", "@0x/utils": "^4.2.2", "@0x/web3-wrapper": "^6.0.2", - "@types/solidity-parser-antlr": "^0.2.0", + "@types/solidity-parser-antlr": "^0.2.3", "chalk": "^2.3.0", "ethereum-types": "^2.1.0", "ethereumjs-util": "^5.1.1", @@ -62,7 +62,7 @@ "rimraf": "^2.6.2", "semaphore-async-await": "^1.5.1", "solc": "^0.5.5", - "solidity-parser-antlr": "^0.2.12" + "solidity-parser-antlr": "^0.4.2" }, "devDependencies": { "@0x/tslint-config": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index 19f79e4574..84e8cfaf81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1841,9 +1841,9 @@ version "0.0.7" resolved "https://registry.yarnpkg.com/@types/sleep/-/sleep-0.0.7.tgz#0572b5d06978b4305671c614b0f68b4640ce7d43" -"@types/solidity-parser-antlr@^0.2.0": - version "0.2.1" - resolved "https://registry.npmjs.org/@types/solidity-parser-antlr/-/solidity-parser-antlr-0.2.1.tgz#29ff386773a72a06c8a9c40c666d2a1cea53c2ed" +"@types/solidity-parser-antlr@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@types/solidity-parser-antlr/-/solidity-parser-antlr-0.2.3.tgz#bb2d9c6511bf483afe4fc3e2714da8a924e59e3f" "@types/styled-components@4.0.0": version "4.0.0" @@ -13548,15 +13548,6 @@ react-dom@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" -react-dom@^16.4.2: - version "16.8.4" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.4.tgz#1061a8e01a2b3b0c8160037441c3bf00a0e3bc48" - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.13.4" - react-dom@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7" @@ -13614,8 +13605,8 @@ react-highlight@0xproject/react-highlight#react-peer-deps: dependencies: highlight.js "^9.11.0" highlightjs-solidity "^1.0.5" - react "^16.4.2" - react-dom "^16.4.2" + react "^16.5.2" + react-dom "^16.5.2" react-hot-loader@^4.3.3: version "4.3.4" @@ -13860,15 +13851,6 @@ react@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" -react@^16.4.2: - version "16.8.4" - resolved "https://registry.yarnpkg.com/react/-/react-16.8.4.tgz#fdf7bd9ae53f03a9c4cd1a371432c206be1c4768" - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.13.4" - react@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42" @@ -14740,13 +14722,6 @@ schedule@^0.5.0: dependencies: object-assign "^4.1.1" -scheduler@^0.13.4: - version "0.13.4" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.4.tgz#8fef05e7a3580c76c0364d2df5e550e4c9140298" - 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" @@ -15260,14 +15235,14 @@ solhint@^1.4.1: prettier "^1.14.3" prettier-plugin-solidity "^1.0.0-alpha.4" -solidity-parser-antlr@^0.2.12: - version "0.2.12" - resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.2.12.tgz#1154f183d5cdda2c7677549ee584dbdb7fb2269c" - solidity-parser-antlr@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.3.3.tgz#0352e35f914095daa7eef9f3a55cf8074e28cc5b" +solidity-parser-antlr@^0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.4.2.tgz#b862eba5936e7a90b4f5f1c8eb1d33fe86650f78" + sort-keys@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" From fa36c91bd62aeb9c4b8791421e08726d0d0e7b85 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 20 Mar 2019 14:50:26 +0100 Subject: [PATCH 2/2] Remove legacy entries from AST Visitor --- packages/sol-tracing-utils/src/ast_visitor.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/sol-tracing-utils/src/ast_visitor.ts b/packages/sol-tracing-utils/src/ast_visitor.ts index 27f19378bc..4187eb589a 100644 --- a/packages/sol-tracing-utils/src/ast_visitor.ts +++ b/packages/sol-tracing-utils/src/ast_visitor.ts @@ -73,15 +73,9 @@ export class ASTVisitor { public VariableDeclarationStatement(ast: Parser.VariableDeclarationStatement): void { this._visitStatement(ast); } - public Statement(ast: Parser.Statement): void { - this._visitStatement(ast); - } public WhileStatement(ast: Parser.WhileStatement): void { this._visitStatement(ast); } - public SimpleStatement(ast: Parser.SimpleStatement): void { - this._visitStatement(ast); - } public ThrowStatement(ast: Parser.ThrowStatement): void { this._visitStatement(ast); } @@ -108,9 +102,6 @@ export class ASTVisitor { public AssemblyBlock(ast: Parser.AssemblyBlock): void { this._visitStatement(ast); } - public AssemblyExpression(ast: Parser.AssemblyExpression): void { - this._visitStatement(ast); - } public AssemblyAssignment(ast: Parser.AssemblyAssignment): void { this._visitStatement(ast); }