Improve the return type of deployToDevnet

packages/cli/src/codegen.ts

@@ -34,7 +34,7 @@ import * as prettier from 'prettier'
 import path from 'path'
 import fs from 'fs'
 import { Configuration, DEFAULT_CONFIGURATION_VALUES } from './types'
-import { getDeploymentFilePath } from './utils'
+import { getDeploymentFilePath, taskIdToVariable } from './utils'
 import { Deployments, DeploymentsPerAddress } from './deployment'
 
 const header = `/* Autogenerated file. Do not edit manually. */\n/* tslint:disable */\n/* eslint-disable */\n\n`
@@ -543,7 +543,7 @@ function genToDeployments(contracts: string[], optionalContracts: string[], allS
   const contractInstances = contracts.map((taskId) => {
     const typeName = getTypeFromTaskId(taskId)
     return `
-    ${convertToVariableName(taskId)}: {
+    ${taskIdToVariable(taskId)}: {
       ...json.contracts['${taskId}'],
       contractInstance: ${typeName}.at(json.contracts['${taskId}'].contractInstance.address)
     }
@@ -552,13 +552,13 @@ function genToDeployments(contracts: string[], optionalContracts: string[], allS
   const optionalContractInstances = optionalContracts.map((taskId) => {
     const typeName = getTypeFromTaskId(taskId)
     return `
-    ${convertToVariableName(taskId)}: json.contracts['${taskId}'] === undefined ? undefined : {
+    ${taskIdToVariable(taskId)}: json.contracts['${taskId}'] === undefined ? undefined : {
       ...json.contracts['${taskId}'],
       contractInstance: ${typeName}.at(json.contracts['${taskId}'].contractInstance.address)
     }
     `
   })
-  const scripts = allScripts.map((taskId) => `${convertToVariableName(taskId)}: json.scripts['${taskId}']`).join(',')
+  const scripts = allScripts.map((taskId) => `${taskIdToVariable(taskId)}: json.scripts['${taskId}']`).join(',')
   const allContractInstances = contractInstances.concat(optionalContractInstances).join(',')
   return `
     function toDeployments(json: any): Deployments {
@@ -572,18 +572,14 @@ function genToDeployments(contracts: string[], optionalContracts: string[], allS
   `
 }
 
-function convertToVariableName(taskId: string): string {
-  return taskId.replace(/[:\-]/g, '_')
-}
-
 function genContractField(taskId: string, optional: boolean): string {
   const typeName = getTypeFromTaskId(taskId)
-  const varName = convertToVariableName(taskId)
+  const varName = taskIdToVariable(taskId)
   return `${varName}${optional ? '?' : ''}: DeployContractExecutionResult<${typeName}Instance>`
 }
 
 function genScriptField(taskId: string, optional: boolean): string {
-  const varName = convertToVariableName(taskId)
+  const varName = taskIdToVariable(taskId)
   return `${varName}${optional ? '?' : ''}: RunScriptResult`
 }
 

packages/cli/src/deployment.ts

@@ -59,6 +59,7 @@ import {
   getNetwork,
   loadConfig,
   retryFetch,
+  taskIdToVariable,
   waitTxConfirmed,
   waitUserConfirmation
 } from './utils'
@@ -644,11 +645,21 @@ async function deployInParallel<Settings = unknown>(
   }
 }
 
-export async function deployToDevnet(): Promise<Deployments> {
+export async function deployToDevnet() {
   const deployments = Deployments.empty()
   const configuration = loadConfig(getConfigFile())
   await deploy(configuration, 'devnet', deployments)
-  return deployments
+  return deployments.deployments.map((d) => {
+    const contracts: Record<string, DeployContractExecutionResult> = {}
+    Array.from(d.contracts.entries()).forEach(([taskId, result]) => {
+      contracts[taskIdToVariable(taskId)] = result
+    })
+    const scripts: Record<string, RunScriptResult> = {}
+    Array.from(d.scripts.entries()).forEach(([taskId, result]) => {
+      scripts[taskIdToVariable(taskId)] = result
+    })
+    return { deployerAddress: d.deployerAddress, contracts, scripts }
+  })
 }
 
 async function deployToGroup<Settings = unknown>(

packages/cli/src/utils.ts

@@ -152,3 +152,7 @@ export function waitUserConfirmation(msg: string): Promise<boolean> {
     })
   })
 }
+
+export function taskIdToVariable(taskId: string): string {
+  return taskId.replace(/[:\-]/g, '_')
+}