Merge pull request #123 from NethermindEth/fix/artifact-folder-path

Files now saved to artifacts folder within current workspace

api/src/handlers/compile.rs

@@ -116,6 +116,7 @@ pub async fn do_compile(compilation_request: CompilationRequest) -> Result<Json<
     // initialize the files
     initialize_files(compilation_request.contracts, workspace_path).await?;
 
+    // TODO(edwin): change to tokio
     let command = Command::new("npx")
         .arg("hardhat")
         .arg("compile")

plugin/src/types/contracts.ts

@@ -26,15 +26,16 @@ interface DeployedContract extends Contract {
 interface CompilationResult {
   status: string
   message: string
-  file_content: SolFile[]
+  file_content: CompiledArtifact[]
 }
 
 interface VerificationResult {
   status: string
   message: string
 }
 
-interface SolFile {
+interface CompiledArtifact {
+  // Is a relative path to a file
   file_name: string
   file_content: string
   is_contract: boolean
@@ -68,5 +69,5 @@ export type {
   DeployedContract,
   CompilationResult,
   VerificationResult,
-  SolFile
+  CompiledArtifact
 }

plugin/src/utils/utils.ts

@@ -9,8 +9,7 @@ const getFileNameFromPath = (path: string): string => path.split('/').pop() ?? '
 const getContractNameFromFullName = (fullName: string): string => fullName.split('.')[0]
 
 const artifactFolder = (path: string): string => {
-  if (path.includes('artifacts')) return path.split('/').slice(0, -1).join('/')
-  return path.split('/').slice(0, -1).join('/').concat('/artifacts')
+  return path.concat('/artifacts')
 }
 
 const artifactFilename = (ext: '.json' | '.casm', filename: string): string => filename.split('.')[0].concat(ext)