solc-typed-ast 19.2.1 → 20.0.1

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.
@@ -1,4 +1,3 @@
1
- import { InferType } from "../types";
2
1
  import { ASTNodeConstructor } from "./ast_node";
3
2
  import { ContractDefinition } from "./implementation/declaration/contract_definition";
4
3
  import { EventDefinition } from "./implementation/declaration/event_definition";
@@ -8,7 +7,7 @@ import { VariableDeclaration } from "./implementation/declaration/variable_decla
8
7
  import { EmitStatement } from "./implementation/statement/emit_statement";
9
8
  type FunctionLikeResolvable = FunctionDefinition | ModifierDefinition | EventDefinition;
10
9
  type Resolvable = FunctionLikeResolvable | VariableDeclaration;
11
- export declare function resolve<T extends Resolvable>(scope: ContractDefinition, target: T, inference: InferType, onlyParents?: boolean): T | undefined;
10
+ export declare function resolve<T extends Resolvable>(scope: ContractDefinition, target: T, onlyParents?: boolean): T | undefined;
12
11
  /**
13
12
  * Resolve an inheritable contract property following the standard C3 linearization order.
14
13
  *
@@ -20,8 +19,8 @@ export declare function resolve<T extends Resolvable>(scope: ContractDefinition,
20
19
  * functions/events can have the same name and different arguments
21
20
  * @param onlyParents boolean flag specifing that we want to only look through the bases of the contract.
22
21
  */
23
- export declare function resolveByName<T extends Resolvable>(scope: ContractDefinition, constructor: ASTNodeConstructor<T>, name: string, inference: InferType, onlyParents?: boolean): T[];
24
- export declare function resolveEvent(scope: ContractDefinition, statement: EmitStatement, inference: InferType, onlyParents?: boolean): EventDefinition | undefined;
25
- export declare function resolveCallable(scope: ContractDefinition, definition: FunctionDefinition | VariableDeclaration, inference: InferType, onlyParents?: boolean): FunctionDefinition | VariableDeclaration | undefined;
22
+ export declare function resolveByName<T extends Resolvable>(scope: ContractDefinition, constructor: ASTNodeConstructor<T>, name: string, onlyParents?: boolean): T[];
23
+ export declare function resolveEvent(scope: ContractDefinition, statement: EmitStatement): EventDefinition | undefined;
24
+ export declare function resolveCallable(scope: ContractDefinition, definition: FunctionDefinition | VariableDeclaration, onlyParents?: boolean): FunctionDefinition | VariableDeclaration | undefined;
26
25
  export {};
27
26
  //# sourceMappingURL=dispatch.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../src/ast/dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AACtF,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,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAIxF,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAE1E,KAAK,sBAAsB,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,eAAe,CAAC;AACxF,KAAK,UAAU,GAAG,sBAAsB,GAAG,mBAAmB,CAAC;AAyB/D,wBAAgB,OAAO,CAAC,CAAC,SAAS,UAAU,EACxC,KAAK,EAAE,kBAAkB,EACzB,MAAM,EAAE,CAAC,EACT,SAAS,EAAE,SAAS,EACpB,WAAW,UAAQ,GACpB,CAAC,GAAG,SAAS,CA6Bf;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,UAAU,EAC9C,KAAK,EAAE,kBAAkB,EACzB,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAClC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,WAAW,UAAQ,GACpB,CAAC,EAAE,CAgCL;AAiBD,wBAAgB,YAAY,CACxB,KAAK,EAAE,kBAAkB,EACzB,SAAS,EAAE,aAAa,EACxB,SAAS,EAAE,SAAS,EACpB,WAAW,UAAQ,GACpB,eAAe,GAAG,SAAS,CAW7B;AAED,wBAAgB,eAAe,CAC3B,KAAK,EAAE,kBAAkB,EACzB,UAAU,EAAE,kBAAkB,GAAG,mBAAmB,EACpD,SAAS,EAAE,SAAS,EACpB,WAAW,UAAQ,GACpB,kBAAkB,GAAG,mBAAmB,GAAG,SAAS,CAwBtD"}
1
+ {"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../src/ast/dispatch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AACtF,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,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAIxF,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAE1E,KAAK,sBAAsB,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,eAAe,CAAC;AACxF,KAAK,UAAU,GAAG,sBAAsB,GAAG,mBAAmB,CAAC;AAyB/D,wBAAgB,OAAO,CAAC,CAAC,SAAS,UAAU,EACxC,KAAK,EAAE,kBAAkB,EACzB,MAAM,EAAE,CAAC,EACT,WAAW,UAAQ,GACpB,CAAC,GAAG,SAAS,CA6Bf;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,UAAU,EAC9C,KAAK,EAAE,kBAAkB,EACzB,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAClC,IAAI,EAAE,MAAM,EACZ,WAAW,UAAQ,GACpB,CAAC,EAAE,CAgCL;AAiBD,wBAAgB,YAAY,CACxB,KAAK,EAAE,kBAAkB,EACzB,SAAS,EAAE,aAAa,GACzB,eAAe,GAAG,SAAS,CAS7B;AAED,wBAAgB,eAAe,CAC3B,KAAK,EAAE,kBAAkB,EACzB,UAAU,EAAE,kBAAkB,GAAG,mBAAmB,EACpD,WAAW,UAAQ,GACpB,kBAAkB,GAAG,mBAAmB,GAAG,SAAS,CAwBtD"}
@@ -1,6 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.resolveCallable = exports.resolveEvent = exports.resolveByName = exports.resolve = void 0;
4
+ const utils_1 = require("ethereum-cryptography/utils");
5
+ const typeIdentifiers_1 = require("../typeIdentifiers");
4
6
  const constants_1 = require("./constants");
5
7
  const contract_definition_1 = require("./implementation/declaration/contract_definition");
6
8
  const event_definition_1 = require("./implementation/declaration/event_definition");
@@ -24,14 +26,14 @@ function getResolvableCollection(contract, target) {
24
26
  }
25
27
  throw new Error("Unable to select resolvable collection for target " + target.name);
26
28
  }
27
- function resolve(scope, target, inference, onlyParents = false) {
29
+ function resolve(scope, target, onlyParents = false) {
28
30
  let finder;
29
31
  if (target instanceof variable_declaration_1.VariableDeclaration) {
30
32
  finder = (candidate) => candidate.name === target.name;
31
33
  }
32
34
  else {
33
- const signatureHash = inference.signatureHash(target);
34
- finder = (candidate) => signatureHash === inference.signatureHash(candidate);
35
+ const hash = (0, typeIdentifiers_1.signatureHash)(target);
36
+ finder = (candidate) => (0, utils_1.equalsBytes)(hash, (0, typeIdentifiers_1.signatureHash)(candidate));
35
37
  }
36
38
  for (const base of scope.vLinearizedBaseContracts) {
37
39
  if (onlyParents && base === scope) {
@@ -57,7 +59,7 @@ exports.resolve = resolve;
57
59
  * functions/events can have the same name and different arguments
58
60
  * @param onlyParents boolean flag specifing that we want to only look through the bases of the contract.
59
61
  */
60
- function resolveByName(scope, constructor, name, inference, onlyParents = false) {
62
+ function resolveByName(scope, constructor, name, onlyParents = false) {
61
63
  const result = [];
62
64
  const found = new Set();
63
65
  for (const base of scope.vLinearizedBaseContracts) {
@@ -74,7 +76,7 @@ function resolveByName(scope, constructor, name, inference, onlyParents = false)
74
76
  */
75
77
  const resolvableIdentifier = resolvable instanceof variable_declaration_1.VariableDeclaration
76
78
  ? resolvable.name
77
- : inference.signatureHash(resolvable);
79
+ : (0, utils_1.bytesToHex)((0, typeIdentifiers_1.signatureHash)(resolvable));
78
80
  if (resolvable.name === name && !found.has(resolvableIdentifier)) {
79
81
  result.push(resolvable);
80
82
  found.add(resolvableIdentifier);
@@ -94,31 +96,29 @@ function isExplicitlyBound(call) {
94
96
  }
95
97
  return false;
96
98
  }
97
- function resolveEvent(scope, statement, inference, onlyParents = false) {
99
+ function resolveEvent(scope, statement) {
98
100
  const call = statement.vEventCall;
99
101
  const definition = call.vReferencedDeclaration;
100
102
  if (definition instanceof event_definition_1.EventDefinition) {
101
- return isExplicitlyBound(call)
102
- ? definition
103
- : resolve(scope, definition, inference, onlyParents);
103
+ return isExplicitlyBound(call) ? definition : resolve(scope, definition);
104
104
  }
105
105
  return undefined;
106
106
  }
107
107
  exports.resolveEvent = resolveEvent;
108
- function resolveCallable(scope, definition, inference, onlyParents = false) {
109
- const selector = inference.signatureHash(definition);
108
+ function resolveCallable(scope, definition, onlyParents = false) {
109
+ const selector = (0, typeIdentifiers_1.signatureHash)(definition);
110
110
  for (const base of scope.vLinearizedBaseContracts) {
111
111
  if (onlyParents && base === scope) {
112
112
  continue;
113
113
  }
114
114
  for (const fn of base.vFunctions) {
115
- if (inference.signatureHash(fn) === selector) {
115
+ if ((0, utils_1.equalsBytes)((0, typeIdentifiers_1.signatureHash)(fn), selector)) {
116
116
  return fn;
117
117
  }
118
118
  }
119
119
  for (const v of base.vStateVariables) {
120
120
  if (v.visibility === constants_1.StateVariableVisibility.Public) {
121
- if (inference.signatureHash(v) === selector) {
121
+ if ((0, utils_1.equalsBytes)((0, typeIdentifiers_1.signatureHash)(v), selector)) {
122
122
  return v;
123
123
  }
124
124
  }
@@ -1 +1 @@
1
- {"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/ast/dispatch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/ast/dispatch.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { FunctionDefinition, VariableDeclaration, EventDefinition, ErrorDefinition } from "../ast";
2
- export declare function signature(nd: FunctionDefinition | VariableDeclaration | EventDefinition | ErrorDefinition): string;
3
- export declare function signatureHash(nd: FunctionDefinition | VariableDeclaration | EventDefinition | ErrorDefinition): Uint8Array;
1
+ import { FunctionDefinition, VariableDeclaration, EventDefinition, ErrorDefinition, ModifierDefinition } from "../ast";
2
+ export declare function signature(nd: FunctionDefinition | VariableDeclaration | EventDefinition | ErrorDefinition | ModifierDefinition): string;
3
+ export declare function signatureHash(nd: FunctionDefinition | VariableDeclaration | EventDefinition | ErrorDefinition | ModifierDefinition): Uint8Array;
4
4
  //# sourceMappingURL=signature.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"signature.d.ts","sourceRoot":"","sources":["../../src/typeIdentifiers/signature.ts"],"names":[],"mappings":"AACA,OAAO,EAOH,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,eAAe,EAElB,MAAM,QAAQ,CAAC;AAuLhB,wBAAgB,SAAS,CACrB,EAAE,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,eAAe,GAAG,eAAe,GACjF,MAAM,CA8BR;AAED,wBAAgB,aAAa,CACzB,EAAE,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,eAAe,GAAG,eAAe,GACjF,UAAU,CAKZ"}
1
+ {"version":3,"file":"signature.d.ts","sourceRoot":"","sources":["../../src/typeIdentifiers/signature.ts"],"names":[],"mappings":"AACA,OAAO,EAOH,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,eAAe,EAEf,kBAAkB,EACrB,MAAM,QAAQ,CAAC;AAuLhB,wBAAgB,SAAS,CACrB,EAAE,EACI,kBAAkB,GAClB,mBAAmB,GACnB,eAAe,GACf,eAAe,GACf,kBAAkB,GACzB,MAAM,CAmCR;AAED,wBAAgB,aAAa,CACzB,EAAE,EACI,kBAAkB,GAClB,mBAAmB,GACnB,eAAe,GACf,eAAe,GACf,kBAAkB,GACzB,UAAU,CAKZ"}
@@ -128,12 +128,16 @@ function signature(nd) {
128
128
  let argTs;
129
129
  if (nd instanceof ast_1.FunctionDefinition ||
130
130
  nd instanceof ast_1.EventDefinition ||
131
- nd instanceof ast_1.ErrorDefinition) {
131
+ nd instanceof ast_1.ErrorDefinition ||
132
+ nd instanceof ast_1.ModifierDefinition) {
132
133
  argTs = nd.vParameters.vParameters.map(utils_2.typeOf);
133
134
  }
134
135
  else {
135
136
  [argTs] = (0, utils_2.getterArgsAndReturn)(nd);
136
137
  }
138
+ if (nd instanceof ast_1.ModifierDefinition) {
139
+ return `${nd.name}(${argTs.map((t) => t.pp()).join(",")})`;
140
+ }
137
141
  const isLibFun = nd instanceof ast_1.FunctionDefinition &&
138
142
  nd.vScope instanceof ast_1.ContractDefinition &&
139
143
  nd.vScope.kind === ast_1.ContractKind.Library;
@@ -1 +1 @@
1
- {"version":3,"file":"signature.js","sourceRoot":"","sources":["../../src/typeIdentifiers/signature.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"signature.js","sourceRoot":"","sources":["../../src/typeIdentifiers/signature.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/typeIdentifiers/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,YAAY,EACZ,UAAU,EAEV,QAAQ,EACR,mBAAmB,EACtB,MAAM,QAAQ,CAAC;AAGhB,OAAO,EAQH,cAAc,EACjB,MAAM,OAAO,CAAC;AAMf;;GAEG;AACH,wBAAgB,MAAM,CAAC,EAAE,EAAE,UAAU,GAAG,mBAAmB,GAAG,QAAQ,GAAG,cAAc,CAgBtF;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,cAAc,CA2BrF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,mBAAmB,GAAG,CAAC,cAAc,EAAE,EAAE,cAAc,CAAC,CAyC9F;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,cAAc,GAAG,cAAc,CAkB5D;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,cAAc,CAkB/E;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,cAAc,GAAG,OAAO,CAK1D"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/typeIdentifiers/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,YAAY,EACZ,UAAU,EAGV,QAAQ,EACR,mBAAmB,EACtB,MAAM,QAAQ,CAAC;AAGhB,OAAO,EASH,cAAc,EACjB,MAAM,OAAO,CAAC;AAMf;;GAEG;AACH,wBAAgB,MAAM,CAAC,EAAE,EAAE,UAAU,GAAG,mBAAmB,GAAG,QAAQ,GAAG,cAAc,CAgBtF;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,cAAc,CA2BrF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,mBAAmB,GAAG,CAAC,cAAc,EAAE,EAAE,cAAc,CAAC,CAqD9F;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,cAAc,GAAG,cAAc,CAkB5D;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,cAAc,CAkB/E;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,cAAc,GAAG,OAAO,CAK1D"}
@@ -83,13 +83,21 @@ function getterArgsAndReturn(v) {
83
83
  break;
84
84
  }
85
85
  }
86
- let retType = (0, abi_1.toABIType)(changeLocationTo(typeOf(type), ast_1.DataLocation.Memory), ctx);
87
- // Filter out top-level arrays. Maps are already filtered by toABIType
88
- if (retType instanceof ast_2.TupleTypeId) {
89
- const filteredComps = retType.components.filter((compT) => !(compT instanceof ast_2.ArrayTypeId));
90
- // For top-level tuples remove any arrays from the tuple
91
- retType = filteredComps.length === 1 ? filteredComps[0] : new ast_2.TupleTypeId(filteredComps);
92
- }
86
+ const solT = changeLocationTo(typeOf(type), ast_1.DataLocation.Memory);
87
+ let retTs;
88
+ if (solT instanceof ast_2.PointerTypeId && solT.toType instanceof ast_2.StructTypeId) {
89
+ const def = ctx.locate(solT.toType.id);
90
+ // Filter out top-level arrays and maps
91
+ retTs = def.vMembers
92
+ .map((decl) => changeLocationTo(typeOf(decl), ast_1.DataLocation.Memory))
93
+ .filter((t) => !((t instanceof ast_2.PointerTypeId && t.toType instanceof ast_2.ArrayTypeId) ||
94
+ t instanceof ast_2.MappingTypeId))
95
+ .map((t) => (0, abi_1.toABIType)(t, ctx));
96
+ }
97
+ else {
98
+ retTs = [(0, abi_1.toABIType)(solT, ctx)];
99
+ }
100
+ const retType = retTs.length === 1 ? retTs[0] : new ast_2.TupleTypeId(retTs);
93
101
  return [argTypes, retType];
94
102
  }
95
103
  exports.getterArgsAndReturn = getterArgsAndReturn;
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/typeIdentifiers/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/typeIdentifiers/utils.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": "19.2.1",
3
+ "version": "20.0.1",
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": [