Use OpenZeppelin fork of resolver engine (#1066)

* Use OpenZeppelin fork of resolver engine

Adds fix to handle Windows-like paths.

Fixes #1049

* Use platform independent path separator

Author: spalladino

packages/cli/package-lock.json

@@ -55,7 +55,8 @@
   "homepage": "https://github.com/OpenZeppelin/openzeppelin-sdk/tree/master/packages/cli#readme",
   "dependencies": {
     "@openzeppelin/upgrades": "2.5.0-rc.1",
-    "@resolver-engine/imports-fs": "^0.3.2",
+    "@openzeppelin/resolver-engine-core": "^0.3.3",
+    "@openzeppelin/resolver-engine-imports-fs": "^0.3.3",
     "@types/fs-extra": "^7.0.0",
     "@types/npm": "^2.0.29",
     "@types/semver": "^5.5.0",

packages/cli/package.json

@@ -1,4 +1,4 @@
-import { ResolverEngine } from '@resolver-engine/core';
+import { ResolverEngine } from '@openzeppelin/resolver-engine-core';
 import pathSys from 'path';
 import urlSys from 'url';
 import { getImports } from '../../../utils/solidity';
@@ -95,7 +95,7 @@ export async function gatherSources(
   const alreadyImported = new Set();
 
   if (workingDir !== '') {
-    workingDir += '/';
+    workingDir += pathSys.sep;
   }
 
   const absoluteRoots = roots.map(what => resolvePath(workingDir, what));

packages/cli/src/models/compiler/solidity/ResolverEngineGatherer.ts

@@ -1,3 +1,4 @@
+import path from 'path';
 import flatMap from 'lodash.flatmap';
 import { Loggy } from '@openzeppelin/upgrades';
 import solc, {
@@ -168,8 +169,10 @@ class SolidityContractsCompiler {
   private _buildContractSchema(solcOutput: CompilerOutput, fileName: string, contractName: string): CompiledContract {
     const output = solcOutput.contracts[fileName][contractName];
     const source = solcOutput.sources[fileName];
-    fileName = fileName.substring(fileName.lastIndexOf('/') + 1);
-    const contract = this.contracts.find(aContract => aContract.fileName === fileName);
+    fileName = path.basename(fileName);
+    const contract = this.contracts.find(
+      aContract => aContract.fileName === fileName,
+    );
 
     return {
       fileName,

packages/cli/src/models/compiler/solidity/SolidityContractsCompiler.ts

@@ -16,7 +16,7 @@ import {
   DEFAULT_OPTIMIZER,
   DEFAULT_EVM_VERSION,
 } from './SolidityContractsCompiler';
-import { ImportsFsEngine } from '@resolver-engine/imports-fs';
+import { ImportsFsEngine } from '@openzeppelin/resolver-engine-imports-fs';
 import { gatherSources } from './ResolverEngineGatherer';
 import { SolcBuild } from './CompilerProvider';
 import { compilerVersionsMatch, compilerSettingsMatch } from '../../../utils/solidity';