solc-typed-ast 9.1.1 → 9.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -33,5 +33,5 @@ export declare type ScopeNode = SourceUnit | ContractDefinition | FunctionDefini
|
|
|
33
33
|
* functions/events with the same name but different arguments. In all other
|
|
34
34
|
* cases the returned set should have either 0 or 1 elements.
|
|
35
35
|
*/
|
|
36
|
-
export declare function resolveAny(name: string, ctx: ASTNode, version: string, inclusive?: boolean): Set<AnyResolvable>;
|
|
36
|
+
export declare function resolveAny(name: string, ctx: ASTNode, version: string, inclusive?: boolean, ignoreVisiblity?: boolean): Set<AnyResolvable>;
|
|
37
37
|
//# sourceMappingURL=definitions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../src/ast/definitions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../src/ast/definitions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AACtF,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,8BAA8B,EAAE,MAAM,iEAAiE,CAAC;AACjH,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EACH,KAAK,EAEL,cAAc,EACd,cAAc,EACd,4BAA4B,EAC/B,MAAM,4BAA4B,CAAC;AAEpC;;GAEG;AACH,oBAAY,aAAa,GACnB,mBAAmB,GACnB,kBAAkB,GAClB,kBAAkB,GAClB,eAAe,GACf,eAAe,GACf,gBAAgB,GAChB,cAAc,GACd,kBAAkB,GAClB,8BAA8B,GAC9B,eAAe,CAAC;AAEtB;;GAEG;AACH,oBAAY,SAAS,GACf,UAAU,GACV,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,4BAA4B,GAC5B,KAAK,GACL,cAAc,GACd,cAAc,CAAC;AAkSrB;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,UAAU,CACtB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,MAAM,EACf,SAAS,UAAQ,EACjB,eAAe,UAAQ,GACxB,GAAG,CAAC,aAAa,CAAC,CAuGpB"}
|
package/dist/ast/definitions.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resolveAny = void 0;
|
|
4
4
|
const semver_1 = require("semver");
|
|
5
|
+
const _1 = require(".");
|
|
5
6
|
const misc_1 = require("../misc");
|
|
6
7
|
const abi_1 = require("../types/abi");
|
|
7
8
|
const constants_1 = require("./constants");
|
|
@@ -109,7 +110,7 @@ function* lookupInSourceUnit(name, scope, visitedUnits) {
|
|
|
109
110
|
else if (child.vSymbolAliases.length === 0) {
|
|
110
111
|
// import "..."
|
|
111
112
|
// @todo maybe its better to go through child.vSourceUnit.vExportedSymbols here?
|
|
112
|
-
yield* lookupInScope(name, child.vSourceUnit, visitedUnits);
|
|
113
|
+
yield* lookupInScope(name, child.vSourceUnit, visitedUnits, false);
|
|
113
114
|
}
|
|
114
115
|
else {
|
|
115
116
|
// `import {<name>} from "..."` or `import {a as <name>} from "..."`
|
|
@@ -140,7 +141,7 @@ function* lookupInSourceUnit(name, scope, visitedUnits) {
|
|
|
140
141
|
/**
|
|
141
142
|
* Lookup the definition corresponding to `name` in the `ContractDefinition` `scope`. Yield all matches.
|
|
142
143
|
*/
|
|
143
|
-
function* lookupInContractDefinition(name, scope) {
|
|
144
|
+
function* lookupInContractDefinition(name, scope, ignoreVisiblity) {
|
|
144
145
|
const overridenSigHashes = new Set();
|
|
145
146
|
for (const base of scope.vLinearizedBaseContracts) {
|
|
146
147
|
for (const child of base.children) {
|
|
@@ -153,6 +154,16 @@ function* lookupInContractDefinition(name, scope) {
|
|
|
153
154
|
child instanceof error_definition_1.ErrorDefinition ||
|
|
154
155
|
child instanceof user_defined_value_type_definition_1.UserDefinedValueTypeDefinition) &&
|
|
155
156
|
child.name === name) {
|
|
157
|
+
// If we are not ignoring visibility, and the node is a private function or state var
|
|
158
|
+
// in a base class different from scope, then ignore it
|
|
159
|
+
if (!ignoreVisiblity &&
|
|
160
|
+
((child instanceof variable_declaration_1.VariableDeclaration &&
|
|
161
|
+
child.visibility === constants_1.StateVariableVisibility.Private) ||
|
|
162
|
+
(child instanceof function_definition_1.FunctionDefinition &&
|
|
163
|
+
child.visibility === _1.FunctionVisibility.Private)) &&
|
|
164
|
+
base !== scope) {
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
156
167
|
let sigHash;
|
|
157
168
|
if (child instanceof function_definition_1.FunctionDefinition) {
|
|
158
169
|
// Its a safe to assume V2 as its backward-compatible and
|
|
@@ -209,13 +220,13 @@ function* lookupInBlock(name, scope) {
|
|
|
209
220
|
* 1. Multiple FunctionDefinitions (and potentially VariableDeclarations corresponding to public state variables) with the same name and DIFFERENT SIGNATURES
|
|
210
221
|
* 2. Multiple EventDefinitions with the same name and different signatures.
|
|
211
222
|
*/
|
|
212
|
-
function lookupInScope(name, scope, visitedUnits = new Set()) {
|
|
223
|
+
function lookupInScope(name, scope, visitedUnits = new Set(), ignoreVisiblity) {
|
|
213
224
|
let results;
|
|
214
225
|
if (scope instanceof meta_1.SourceUnit) {
|
|
215
226
|
results = lookupInSourceUnit(name, scope, visitedUnits);
|
|
216
227
|
}
|
|
217
228
|
else if (scope instanceof contract_definition_1.ContractDefinition) {
|
|
218
|
-
results = lookupInContractDefinition(name, scope);
|
|
229
|
+
results = lookupInContractDefinition(name, scope, ignoreVisiblity);
|
|
219
230
|
}
|
|
220
231
|
else if (scope instanceof function_definition_1.FunctionDefinition) {
|
|
221
232
|
results = lookupInFunctionDefinition(name, scope);
|
|
@@ -254,7 +265,7 @@ function lookupInScope(name, scope, visitedUnits = new Set()) {
|
|
|
254
265
|
* functions/events with the same name but different arguments. In all other
|
|
255
266
|
* cases the returned set should have either 0 or 1 elements.
|
|
256
267
|
*/
|
|
257
|
-
function resolveAny(name, ctx, version, inclusive = false) {
|
|
268
|
+
function resolveAny(name, ctx, version, inclusive = false, ignoreVisiblity = false) {
|
|
258
269
|
let scope = inclusive && isScope(ctx, version) ? ctx : getContainingScope(ctx, version);
|
|
259
270
|
const elements = name.split(".");
|
|
260
271
|
for (let i = 0; i < elements.length; i++) {
|
|
@@ -264,7 +275,7 @@ function resolveAny(name, ctx, version, inclusive = false) {
|
|
|
264
275
|
// If this is the first element (e.g. `A` in `A.B.C`), walk up the
|
|
265
276
|
// stack of scopes starting from the current context, looking for `A`
|
|
266
277
|
while (scope !== undefined) {
|
|
267
|
-
res = lookupInScope(element, scope);
|
|
278
|
+
res = lookupInScope(element, scope, undefined, ignoreVisiblity);
|
|
268
279
|
if (res.size > 0) {
|
|
269
280
|
// Sanity check - when multiple results are found, they must either be overloaded events
|
|
270
281
|
// or overloaded functions/public state vars.
|
|
@@ -295,7 +306,7 @@ function resolveAny(name, ctx, version, inclusive = false) {
|
|
|
295
306
|
else {
|
|
296
307
|
// If this is a later segment (e.g. `B` or `C` in `A.B.C`),
|
|
297
308
|
// then resolve it recursively in the current scope.
|
|
298
|
-
res = resolveAny(element, scope, version, true);
|
|
309
|
+
res = resolveAny(element, scope, version, true, ignoreVisiblity);
|
|
299
310
|
}
|
|
300
311
|
// We didn't find anything - return empty set
|
|
301
312
|
if (res === undefined || res.size === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/ast/definitions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/ast/definitions.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "solc-typed-ast",
|
|
3
|
-
"version": "9.1.
|
|
3
|
+
"version": "9.1.2",
|
|
4
4
|
"description": "A TypeScript library providing a normalized typed Solidity AST along with the utilities necessary to generate the AST (from Solc) and traverse/manipulate it.",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"files": [
|