Implement new artifacts format

1 files changed, 6 insertions, 5 deletions

diff --git a/packages/sol-resolver/src/resolvers/name_resolver.ts b/packages/sol-resolver/src/resolvers/name_resolver.ts
index 6849b7610..a0bedab98 100644
--- a/packages/sol-resolver/src/resolvers/name_resolver.ts
+++ b/packages/sol-resolver/src/resolvers/name_resolver.ts
@@ -18,7 +18,7 @@ export class NameResolver extends EnumerableResolver {
         const onFile = (filePath: string) => {
             const contractName = path.basename(filePath, SOLIDITY_FILE_EXTENSION);
             if (contractName === lookupContractName) {
-                const source = fs.readFileSync(filePath).toString();
+                const source = fs.readFileSync(path.join(this._contractsDir, filePath)).toString();
                 contractSource = {
                     source,
                     path: filePath,
@@ -35,7 +35,7 @@ export class NameResolver extends EnumerableResolver {
         const contractSources: ContractSource[] = [];
         const onFile = (filePath: string) => {
             const contractName = path.basename(filePath, SOLIDITY_FILE_EXTENSION);
-            const source = fs.readFileSync(filePath).toString();
+            const source = fs.readFileSync(path.join(this._contractsDir, filePath)).toString();
             const contractSource = {
                 source,
                 path: filePath,
@@ -54,9 +54,10 @@ export class NameResolver extends EnumerableResolver {
             throw new Error(`No directory found at ${dirPath}`);
         }
         for (const fileName of dirContents) {
-            const entryPath = path.join(dirPath, fileName);
-            const isDirectory = fs.lstatSync(entryPath).isDirectory();
-            const isComplete = isDirectory ? this._traverseContractsDir(entryPath, onFile) : onFile(entryPath);
+            const absoluteEntryPath = path.join(dirPath, fileName);
+            const isDirectory = fs.lstatSync(absoluteEntryPath).isDirectory();
+            const entryPath = path.relative(this._contractsDir, absoluteEntryPath);
+            const isComplete = isDirectory ? this._traverseContractsDir(absoluteEntryPath, onFile) : onFile(entryPath);
             if (isComplete) {
                 return isComplete;
             }