Improve contract recompilation

packages/cli/cli_internal.ts

@@ -26,10 +26,18 @@
 import { checkFullNodeVersion, codegen, getConfigFile, getSdkFullNodeVersion, isNetworkLive, loadConfig } from './src'
 import { Project } from './src/project'
 
 function getConfig(options: any): Configuration {
   const configFile = options.config ? (options.config as string) : getConfigFile()
   console.log(`Loading alephium config file: ${configFile}`)
   const config = loadConfig(configFile)
+  if (config.forceRecompile && config.skipRecompileIfDeployedOnMainnet) {
+    throw new Error(`The forceRecompile and skipRecompileIfDeployedOnMainnet flags cannot be enabled at the same time`)
+  }
+
+  if (config.forceRecompile && (config.skipRecompileContracts ?? []).length > 0) {
+    throw new Error(`The skipRecompileContracts cannot be specified when forceRecompile is enabled`)
+  }
+
   const isDebugModeEnabled = config.enableDebugMode || options.debug
   if (isDebugModeEnabled) enableDebugMode()
   return { ...config, enableDebugMode: isDebugModeEnabled }
@@ -91,21 +99,11 @@
     try {
       const config = getConfig(options)
       const networkId = checkAndGetNetworkId(options.network)
       const nodeUrl = config.networks[networkId].nodeUrl
       if (!(await isNetworkLive(nodeUrl))) {
         throw new Error(`${networkId} is not live`)
       }
 
-      if (config.forceRecompile && config.skipRecompileIfDeployedOnMainnet) {
-        throw new Error(
-          `The forceRecompile and skipRecompileIfDeployedOnMainnet flags cannot be enabled at the same time`
-        )
-      }
-
-      if (config.forceRecompile && (config.skipRecompileContracts ?? []).length > 0) {
-        throw new Error(`The skipRecompileContracts cannot be specified when forceRecompile is enabled`)
-      }
-
       web3.setCurrentNodeProvider(nodeUrl)
       const connectedFullNodeVersion = (await web3.getCurrentNodeProvider().infos.getInfosVersion()).version
       const sdkFullNodeVersion = getSdkFullNodeVersion()
@@ -121,7 +119,8 @@
         connectedFullNodeVersion,
         config.forceRecompile,
         config.skipRecompileIfDeployedOnMainnet,
-        config.skipRecompileContracts ?? []
+        config.skipRecompileContracts ?? [],
+        config.networks['mainnet'].nodeUrl
       )
       console.log('✅ Compilation completed!')
       if (options.skipGenerate) {

packages/cli/src/deployment.ts

@@ -167,7 +167,7 @@
   }
 
   getInstance<I extends ContractInstance>(
     contract: ContractFactory<I, any>,
     group?: number,
     taskId?: string
   ): I | undefined {
@@ -218,7 +218,7 @@
     return this.contracts.size === 0 && this.scripts.size === 0 && this.migrations.size === 0
   }
 
   marshal(): any {
     return {
       deployerAddress: this.deployerAddress,
       contracts: Object.fromEntries(this.contracts),
@@ -227,7 +227,7 @@
     }
   }
 
   static unmarshal(json: any): DeploymentsPerAddress {
     const deployerAddress = json.deployerAddress as string
     const contracts = new Map(Object.entries<DeployContractExecutionResult>(json.contracts))
     const scripts = new Map(Object.entries<RunScriptResult>(json.scripts))
@@ -288,7 +288,7 @@
     return true
   }
   // previous !== undefined if retry is false
   return previous!.issueTokenAmount !== issueTokenAmount
 }
 
 async function needToRunScript(
@@ -602,7 +602,10 @@
       configuration.sourceDir ?? DEFAULT_CONFIGURATION_VALUES.sourceDir,
       artifactDir,
       undefined,
-      configuration.forceRecompile
+      configuration.forceRecompile,
+      configuration.skipRecompileIfDeployedOnMainnet,
+      configuration.skipRecompileContracts ?? [],
+      configuration.networks['mainnet'].nodeUrl
     )
   }
 

packages/cli/src/project.ts

@@ -39,7 +39,7 @@ import { promises as fsPromises } from 'fs'
 import { parseError } from './error'
 
 const crypto = new WebCrypto()
-const mainnetNodeUrl = 'https://node.mainnet.alephium.org'
+const defaultMainnetNodeUrl = 'https://node.mainnet.alephium.org'
 
 class TypedMatcher<T extends SourceKind> {
   matcher: RegExp
@@ -590,8 +590,12 @@ export class Project {
     }
   }
 
-  private static async getDeployedContracts(sourceInfos: SourceInfo[], artifactsRootDir: string): Promise<string[]> {
-    const nodeProvider = new NodeProvider(mainnetNodeUrl)
+  private static async getDeployedContracts(
+    mainnetNodeUrl: string | undefined,
+    sourceInfos: SourceInfo[],
+    artifactsRootDir: string
+  ): Promise<string[]> {
+    const nodeProvider = new NodeProvider(mainnetNodeUrl ?? defaultMainnetNodeUrl)
     const result: string[] = []
     for (const sourceInfo of sourceInfos) {
       const artifactPath = sourceInfo.getArtifactPath(artifactsRootDir)
@@ -611,6 +615,7 @@ export class Project {
   }
 
   private static async filterChangedContracts(
+    mainnetNodeUrl: string | undefined,
     sourceInfos: SourceInfo[],
     artifactsRootDir: string,
     changedContracts: string[],
@@ -622,7 +627,7 @@ export class Project {
       const remainSourceInfo = sourceInfos.filter(
         (s) => s.type === SourceKind.Contract && !skipRecompileContracts.includes(s.name)
       )
-      deployedContracts = await this.getDeployedContracts(remainSourceInfo, artifactsRootDir)
+      deployedContracts = await this.getDeployedContracts(mainnetNodeUrl, remainSourceInfo, artifactsRootDir)
     } else {
       deployedContracts = []
     }
@@ -658,7 +663,8 @@ export class Project {
     changedContracts: string[],
     forceRecompile: boolean,
     skipRecompileIfDeployedOnMainnet: boolean,
-    skipRecompileContracts: string[]
+    skipRecompileContracts: string[],
+    mainnetNodeUrl: string | undefined
   ): Promise<Project> {
     const removeDuplicates = sourceInfos.reduce((acc: SourceInfo[], sourceInfo: SourceInfo) => {
       if (acc.find((info) => info.sourceCodeHash === sourceInfo.sourceCodeHash) === undefined) {
@@ -720,6 +726,7 @@ export class Project {
       projectArtifact
     )
     const filteredChangedContracts = await Project.filterChangedContracts(
+      mainnetNodeUrl,
       sourceInfos,
       artifactsRootDir,
       changedContracts,
@@ -741,7 +748,8 @@ export class Project {
     changedContracts: string[],
     forceRecompile: boolean,
     skipRecompileIfDeployedOnMainnet: boolean,
-    skipRecompileContracts: string[]
+    skipRecompileContracts: string[],
+    mainnetNodeUrl: string | undefined
   ): Promise<Project> {
     const projectArtifact = await ProjectArtifact.from(projectRootDir)
     if (projectArtifact === undefined) {
@@ -797,7 +805,8 @@ export class Project {
         changedContracts,
         forceRecompile,
         skipRecompileIfDeployedOnMainnet,
-        skipRecompileContracts
+        skipRecompileContracts,
+        mainnetNodeUrl
       )
     }
   }
@@ -929,7 +938,8 @@ export class Project {
     defaultFullNodeVersion: string | undefined = undefined,
     forceRecompile = false,
     skipRecompileIfDeployedOnMainnet = false,
-    skipRecompileContracts: string[] = []
+    skipRecompileContracts: string[] = [],
+    mainnetNodeUrl: string | undefined = undefined
   ): Promise<Project> {
     const provider = web3.getCurrentNodeProvider()
     const fullNodeVersion = defaultFullNodeVersion ?? (await provider.infos.getInfosVersion()).version
@@ -959,7 +969,8 @@ export class Project {
         changedContracts,
         forceRecompile,
         skipRecompileIfDeployedOnMainnet,
-        skipRecompileContracts
+        skipRecompileContracts,
+        mainnetNodeUrl
       )
     }
     // we need to reload those contracts that did not regenerate bytecode
@@ -974,7 +985,8 @@ export class Project {
       changedContracts,
       forceRecompile,
       skipRecompileIfDeployedOnMainnet,
-      skipRecompileContracts
+      skipRecompileContracts,
+      mainnetNodeUrl
     )
   }
 }