Merge pull request #2990 from ethereum/truffleFix

fix compilation result sync for truffle
pull/2991/head
bunsenstraat 2 years ago committed by GitHub
commit 628e287799
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      libs/remixd/src/services/truffleClient.ts

@ -61,7 +61,7 @@ export class TruffleClient extends PluginClient {
} }
private async processArtifact () { private async processArtifact () {
const folderFiles = await fs.readdir(this.buildPath) const folderFiles = await fs.readdir(this.buildPath)
// name of folders are file names // name of folders are file names
for (const file of folderFiles) { for (const file of folderFiles) {
if (file.endsWith('.json')) { if (file.endsWith('.json')) {
@ -77,7 +77,6 @@ export class TruffleClient extends PluginClient {
const content = await fs.readFile(join(this.buildPath, file), { encoding: 'utf-8' }) const content = await fs.readFile(join(this.buildPath, file), { encoding: 'utf-8' })
await this.feedContractArtifactFile(file, content, compilationResult) await this.feedContractArtifactFile(file, content, compilationResult)
this.emit('compilationFinished', compilationResult.compilationTarget, { sources: compilationResult.input }, 'soljson', compilationResult.output, compilationResult.solcVersion) this.emit('compilationFinished', compilationResult.compilationTarget, { sources: compilationResult.input }, 'soljson', compilationResult.output, compilationResult.solcVersion)
} }
} }
if (!this.warnLog) { if (!this.warnLog) {
@ -104,10 +103,12 @@ export class TruffleClient extends PluginClient {
const contentJSON = JSON.parse(content) const contentJSON = JSON.parse(content)
const contractName = basename(path).replace('.json', '') const contractName = basename(path).replace('.json', '')
compilationResultPart.solcVersion = contentJSON.compiler.version compilationResultPart.solcVersion = contentJSON.compiler.version
compilationResultPart.compilationTarget = contentJSON.ast.absolutePath // file name in artifacts starts with `project:/`
const filepath = contentJSON.ast.absolutePath.startsWith('project:/') ? contentJSON.ast.absolutePath.replace('project:/', '') : contentJSON.ast.absolutePath
compilationResultPart.compilationTarget = filepath
compilationResultPart.input[path] = { content: contentJSON.source } compilationResultPart.input[path] = { content: contentJSON.source }
// extract data // extract data
const relPath = utils.relativePath(contentJSON.ast.absolutePath, this.currentSharedFolder) const relPath = utils.relativePath(filepath, this.currentSharedFolder)
if (!compilationResultPart.output['sources'][relPath]) compilationResultPart.output['sources'][relPath] = {} if (!compilationResultPart.output['sources'][relPath]) compilationResultPart.output['sources'][relPath] = {}
const location = contentJSON.ast.src.split(':') const location = contentJSON.ast.src.split(':')

Loading…
Cancel
Save