Update dependencies

package.json

@@ -48,7 +48,7 @@
     "test:watch": "mocha --watch"
   },
   "dependencies": {
-    "@solidity-parser/parser": "^0.6.0",
+    "@solidity-parser/parser": "0.14.5",
     "@syntest/framework": "^0.1.2",
     "@truffle/config": "^1.2.44",
     "@truffle/provider": "^0.1.17",
@@ -68,7 +68,7 @@
     "sc-istanbul": "^0.4.5",
     "semver": "^7.3.5",
     "solidity-coverage": "^0.7.16",
-    "truffle": "^5.1.65",
+    "truffle": "5.1.65",
     "web3": "^1.3.4",
     "web3-utils": "^1.5.2"
   },

src/analysis/static/SolidityVisitor.ts

@@ -1,5 +1,4 @@
 import {
-  Visitor,
   SourceUnit,
   PragmaDirective,
   ImportDirective,
@@ -48,7 +47,6 @@ import {
   AssemblyLiteral,
   SubAssembly,
   TupleExpression,
-  TypeNameExpression,
   StringLiteral,
   NumberLiteral,
   BooleanLiteral,
@@ -61,9 +59,11 @@ import {
   HexNumber,
   DecimalNumber,
   Continue,
-} from "@solidity-parser/parser";
+} from "@solidity-parser/parser/dist/src/ast-types";
 
-export interface SolidityVisitor extends Visitor {
+import { ASTVisitor } from "@solidity-parser/parser/dist/src/ast-types";
+
+export interface SolidityVisitor extends ASTVisitor {
   SourceUnit?: (node: SourceUnit) => void;
   PragmaDirective?: (node: PragmaDirective) => void;
   ImportDirective?: (node: ImportDirective) => void;
@@ -112,7 +112,6 @@ export interface SolidityVisitor extends Visitor {
   AssemblyLiteral?: (node: AssemblyLiteral) => void;
   SubAssembly?: (node: SubAssembly) => void;
   TupleExpression?: (node: TupleExpression) => void;
-  TypeNameExpression?: (node: TypeNameExpression) => void;
   StringLiteral?: (node: StringLiteral) => void;
   NumberLiteral?: (node: NumberLiteral) => void;
   BooleanLiteral?: (node: BooleanLiteral) => void;
@@ -178,7 +177,6 @@ export interface SolidityVisitor extends Visitor {
   "AssemblyLiteral:exit"?: (node: AssemblyLiteral) => void;
   "SubAssembly:exit"?: (node: SubAssembly) => void;
   "TupleExpression:exit"?: (node: TupleExpression) => void;
-  "TypeNameExpression:exit"?: (node: TypeNameExpression) => void;
   "NumberLiteral:exit"?: (node: NumberLiteral) => void;
   "BooleanLiteral:exit"?: (node: BooleanLiteral) => void;
   "Identifier:exit"?: (node: Identifier) => void;

src/analysis/static/dependency/ImportVisitor.ts

@@ -17,7 +17,7 @@
  */
 
 import { SolidityVisitor } from "../SolidityVisitor";
-import { ImportDirective } from "@solidity-parser/parser";
+import { ImportDirective } from "@solidity-parser/parser/dist/src/ast-types";
 
 /**
  * Visits the AST nodes of a contract to find all import statements

src/analysis/static/dependency/LibraryVisitor.ts

@@ -20,7 +20,7 @@ import { SolidityVisitor } from "../SolidityVisitor";
 import {
   ContractDefinition,
   FunctionDefinition,
-} from "@solidity-parser/parser";
+} from "@solidity-parser/parser/dist/src/ast-types";
 
 /**
  * Visits the AST nodes of a contract to find all libraries with public and external functions.

src/analysis/static/map/ContractVisitor.ts

@@ -21,7 +21,7 @@ import {
   ContractDefinition,
   FunctionDefinition,
   TypeName,
-} from "@solidity-parser/parser";
+} from "@solidity-parser/parser/dist/src/ast-types";
 import { ContractMetadata, ContractKind } from "./ContractMetadata";
 import {
   ContractFunction,
@@ -209,9 +209,15 @@ export class ContractVisitor implements SolidityVisitor {
         break;
       }
       case "Mapping": {
-        paramType = `Map<${type.keyType.name},${this.resolveTypes(
-          type.valueType
-        )}>`;
+        if (type.keyType.type === 'ElementaryTypeName') {
+          paramType = `Map<${type.keyType.name},${this.resolveTypes(
+            type.valueType
+          )}>`;
+        } else {
+          paramType = `Map<${type.keyType.namePath},${this.resolveTypes(
+            type.valueType
+          )}>`;
+        }
         break;
       }
       case "ArrayTypeName": {
@@ -221,13 +227,13 @@ export class ContractVisitor implements SolidityVisitor {
       case "FunctionTypeName": {
         const parameterTypes = type.parameterTypes
           .map((param) => {
-            return this.resolveTypes(param);
+            return param.name;
           })
           .join(",");
 
         const returnTypes = type.returnTypes
           .map((param) => {
-            return this.resolveTypes(param);
+            return param.name;
           })
           .join(",");
 

src/seeding/constant/ConstantVisitor.ts

@@ -27,7 +27,7 @@ import {
   MemberAccess,
   HexNumber,
   DecimalNumber,
-} from "@solidity-parser/parser";
+} from "@solidity-parser/parser/dist/src/ast-types";
 import { ConstantPool } from "./ConstantPool";
 
 /**