chore: improved program deployments

Author: troykessler

typescript/aleo-sdk/scripts/generate-artifacts.js

@@ -76,7 +76,11 @@ export const programRegistry: Record<string, string> = {
   validator_announce,
 };
 
-export function loadProgramsInDeployOrder(programName: string): Program[] {
+export function loadProgramsInDeployOrder(
+  programName: string,
+  coreSalt: string,
+  warpSalt?: string,
+): { id: string, program: string }[] {
   const visited = new Set<string>();
   const programs: Program[] = [];
 
@@ -98,7 +102,20 @@ export function loadProgramsInDeployOrder(programName: string): Program[] {
   }
 
   visit(programName);
-  return programs;
+
+  return programs.map((p) => ({
+    id: p.id(),
+    program: p
+      .toString()
+      .replaceAll(
+        /(mailbox|dispatch_proxy|validator_announce).aleo/g,
+        (_, p1) => \`\${p1}_\${coreSalt}.aleo\`,
+      )
+      .replaceAll(
+        /(hyp_native|hyp_collateral|hyp_synthetic).aleo/g,
+        (_, p1) => \`\${p1}_\${warpSalt || coreSalt}.aleo\`,
+      ),
+  }));
 }
 `;
 

typescript/aleo-sdk/src/artifacts.ts

@@ -24,7 +24,11 @@ export const programRegistry: Record<string, string> = {
   validator_announce,
 };
 
-export function loadProgramsInDeployOrder(programName: string): Program[] {
+export function loadProgramsInDeployOrder(
+  programName: string,
+  coreSalt: string,
+  warpSalt?: string,
+): { id: string; program: string }[] {
   const visited = new Set<string>();
   const programs: Program[] = [];
 
@@ -46,5 +50,18 @@ export function loadProgramsInDeployOrder(programName: string): Program[] {
   }
 
   visit(programName);
-  return programs;
+
+  return programs.map((p) => ({
+    id: p.id(),
+    program: p
+      .toString()
+      .replaceAll(
+        /(mailbox|dispatch_proxy|validator_announce).aleo/g,
+        (_, p1) => `${p1}_${coreSalt}.aleo`,
+      )
+      .replaceAll(
+        /(hyp_native|hyp_collateral|hyp_synthetic).aleo/g,
+        (_, p1) => `${p1}_${warpSalt || coreSalt}.aleo`,
+      ),
+  }));
 }

typescript/aleo-sdk/src/clients/base.ts

@@ -58,10 +58,6 @@ export class AleoBase {
       : new AleoMainnetNetworkClient(rpcUrls[0]);
   }
 
-  protected get Program() {
-    return this.chainId ? TestnetProgram : MainnetProgram;
-  }
-
   protected get Plaintext() {
     return this.chainId ? TestnetPlaintext : MainnetPlaintext;
   }

typescript/aleo-sdk/src/clients/signer.ts

@@ -42,42 +42,27 @@ export class AleoSigner
     coreSalt: string,
     warpSalt?: string,
   ): Promise<string[]> {
-    let programs = loadProgramsInDeployOrder(programName);
-
-    programs = programs.map((p) => {
-      return this.Program.fromString(
-        p
-          .toString()
-          .replaceAll(
-            /(mailbox|dispatch_proxy|validator_announce)\.aleo/g,
-            (_, p1) => `${p1}_${coreSalt}.aleo`,
-          )
-          .replaceAll(
-            /(hyp_native|hyp_collateral|hyp_synthetic)\.aleo/g,
-            (_, p1) => `${p1}_${warpSalt || coreSalt}.aleo`,
-          ),
-      );
-    });
-
-    for (const program of programs) {
-      const isDeployed = await this.isProgramDeployed(program.id());
-
-      // if the program is already deployed (which can be the case for some imports)
-      // we simply skip it
-      if (isDeployed) {
-        continue;
+    const programs = loadProgramsInDeployOrder(programName, coreSalt, warpSalt);
+
+    for (const { id, program } of programs) {
+      try {
+        const txId = await this.programManager.deploy(program, 0, false);
+
+        await this.aleoClient.waitForTransactionConfirmation(txId);
+      } catch (err) {
+        if (
+          err instanceof Error &&
+          err.message ===
+            `Error validating program: Program ${id} already exists on the network, please rename your program`
+        ) {
+          continue;
+        }
+
+        throw err;
       }
-
-      const txId = await this.programManager.deploy(
-        program.toString(),
-        0,
-        false,
-      );
-
-      await this.aleoClient.waitForTransactionConfirmation(txId);
     }
 
-    return programs.map((p) => p.id());
+    return programs.map((p) => p.id);
   }
 
   getSignerAddress(): string {
@@ -109,15 +94,6 @@ export class AleoSigner
 
   // ### TX CORE ###
 
-  private async isProgramDeployed(program: string) {
-    try {
-      await this.aleoClient.getProgram(program);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
   async createMailbox(
     req: Omit<AltVM.ReqCreateMailbox, 'signer'>,
   ): Promise<AltVM.ResCreateMailbox> {

typescript/aleo-sdk/src/deploy.ts

@@ -26,13 +26,10 @@ const main = async () => {
     });
     console.log('signer credits balance: ', balance);
 
-    // const { mailboxAddress } = await signer.createMailbox({
-    //   domainId: 1337,
-    //   defaultIsmAddress: '',
-    // });
-    // console.log('mailboxAddress', mailboxAddress);
-
-    const mailboxAddress = 'mailbox_ympq4slu6xiq.aleo';
+    const { mailboxAddress } = await signer.createMailbox({
+      domainId: 1337,
+    });
+    console.log('mailboxAddress', mailboxAddress);
 
     const { tokenAddress } = await signer.createSyntheticToken({
       mailboxAddress,