chore: created helpers

Author: troykessler

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

@@ -2,7 +2,12 @@ import { BigNumber } from 'bignumber.js';
 
 import { AltVM, assert, ensure0x, strip0x } from '@hyperlane-xyz/utils';
 
-import { ALEO_NULL_ADDRESS, formatAddress } from '../utils/helper.js';
+import {
+  ALEO_NULL_ADDRESS,
+  arrayToPlaintext,
+  fillArray,
+  formatAddress,
+} from '../utils/helper.js';
 import { AleoTransaction } from '../utils/types.js';
 
 import { AleoBase } from './base.js';
@@ -750,23 +755,21 @@ export class AleoProvider extends AleoBase implements AltVM.IProvider {
       throw new Error(`maximum ${MAXIMUM_VALIDATORS} validators allowed`);
     }
 
-    const validators = Array(MAXIMUM_VALIDATORS).fill({
-      bytes: Array(20).fill(`0u8`),
-    });
-
-    req.validators
-      .map((v) => ({
+    const validators = fillArray(
+      req.validators.map((v) => ({
         bytes: [...Buffer.from(strip0x(v), 'hex')].map((b) => `${b}u8`),
-      }))
-      .forEach((v, i) => (validators[i] = v));
+      })),
+      MAXIMUM_VALIDATORS,
+      Array(20).fill(`0u8`),
+    );
 
     return {
       programName: 'ism_manager.aleo',
       functionName: 'init_message_id_multisig',
       priorityFee: 0,
       privateFee: false,
       inputs: [
-        JSON.stringify(validators).replaceAll('"', ''),
+        arrayToPlaintext(validators),
         `${req.validators.length}u8`,
         `${req.threshold}u8`,
       ],
@@ -1026,16 +1029,14 @@ export class AleoProvider extends AleoBase implements AltVM.IProvider {
       ...Buffer.from(strip0x(req.remoteRouter.receiverAddress), 'hex'),
     ].map((b) => `${b}u8`);
 
-    console.log(JSON.stringify(bytes).replaceAll('"', ''));
-
     return {
       programName: req.tokenAddress,
       functionName: 'enroll_remote_router',
       priorityFee: 0,
       privateFee: false,
       inputs: [
         `${req.remoteRouter.receiverDomainId}u32`,
-        JSON.stringify(bytes).replaceAll('"', ''),
+        arrayToPlaintext(bytes),
         `${req.remoteRouter.gas}u128`,
       ],
       // skipProof: this.skipProof,
@@ -1153,7 +1154,7 @@ export class AleoProvider extends AleoBase implements AltVM.IProvider {
       const hookMetadata = Array(256).fill(`0u8`);
 
       if (req.customHookMetadata) {
-        Buffer.from(req.customHookMetadata, 'hex').forEach((b, i) => {
+        Buffer.from(strip0x(req.customHookMetadata), 'hex').forEach((b, i) => {
           hookMetadata[i] = `${b}u8`;
         });
       }
@@ -1170,9 +1171,9 @@ export class AleoProvider extends AleoBase implements AltVM.IProvider {
           `${req.destinationDomainId}u8`,
           recipient,
           `${req.amount}u128`,
-          JSON.stringify(creditAllowance).replaceAll('"', ''),
+          arrayToPlaintext(creditAllowance),
           req.customHookAddress,
-          JSON.stringify(hookMetadata).replaceAll('"', ''),
+          arrayToPlaintext(hookMetadata),
         ],
         // skipProof: this.skipProof,
       };
@@ -1190,7 +1191,7 @@ export class AleoProvider extends AleoBase implements AltVM.IProvider {
         `${req.destinationDomainId}u8`,
         recipient,
         `${req.amount}u128`,
-        JSON.stringify(creditAllowance).replaceAll('"', ''),
+        arrayToPlaintext(creditAllowance),
       ],
       // skipProof: this.skipProof,
     };

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

@@ -1,6 +1,7 @@
 import { AltVM, assert } from '@hyperlane-xyz/utils';
 
 import { loadProgramsInDeployOrder } from '../artifacts.js';
+import { programIdToPlaintext } from '../utils/helper.js';
 import { AleoReceipt, AleoTransaction } from '../utils/types.js';
 
 import { AnyProgramManager } from './base.js';
@@ -587,14 +588,7 @@ export class AleoSigner
     const tokenAddress = programs[programs.length - 1];
     tx.programName = tokenAddress;
 
-    let programId = Array(128).fill(`0u8`);
-    Array.from(tokenAddress)
-      .map((c) => `${c.charCodeAt(0)}u8`)
-      .forEach((c, i) => {
-        programId[i] = c;
-      });
-
-    tx.inputs = [JSON.stringify(programId).replaceAll('"', ''), ...tx.inputs];
+    tx.inputs = [programIdToPlaintext(tokenAddress), ...tx.inputs];
 
     const txId = await this.programManager.execute(tx);
     await this.aleoClient.waitForTransactionConfirmation(txId);
@@ -626,14 +620,7 @@ export class AleoSigner
     const tokenAddress = programs[programs.length - 1];
     tx.programName = tokenAddress;
 
-    let programId = Array(128).fill(`0u8`);
-    Array.from(tokenAddress)
-      .map((c) => `${c.charCodeAt(0)}u8`)
-      .forEach((c, i) => {
-        programId[i] = c;
-      });
-
-    tx.inputs = [JSON.stringify(programId).replaceAll('"', ''), ...tx.inputs];
+    tx.inputs = [programIdToPlaintext(tokenAddress), ...tx.inputs];
 
     const txId = await this.programManager.execute(tx);
     await this.aleoClient.waitForTransactionConfirmation(txId);
@@ -663,14 +650,7 @@ export class AleoSigner
     const tokenAddress = programs[programs.length - 1];
     tx.programName = tokenAddress;
 
-    let programId = Array(128).fill(`0u8`);
-    Array.from(tokenAddress)
-      .map((c) => `${c.charCodeAt(0)}u8`)
-      .forEach((c, i) => {
-        programId[i] = c;
-      });
-
-    tx.inputs = [JSON.stringify(programId).replaceAll('"', ''), ...tx.inputs];
+    tx.inputs = [programIdToPlaintext(tokenAddress), ...tx.inputs];
 
     const txId = await this.programManager.execute(tx);
     await this.aleoClient.waitForTransactionConfirmation(txId);

typescript/aleo-sdk/src/utils/helper.ts

@@ -4,3 +4,18 @@ export const ALEO_NULL_ADDRESS =
 export function formatAddress(address: string): string {
   return address === ALEO_NULL_ADDRESS ? '' : address;
 }
+
+export function fillArray(array: any[], length: number, fillValue: any): any[] {
+  return array.length < length
+    ? [...array, ...Array(length - array.length).fill(fillValue)]
+    : array.slice(0, length);
+}
+
+export function arrayToPlaintext(array: string[]): string {
+  return `[${array.join(',')}]`;
+}
+
+export function programIdToPlaintext(programId: string): string {
+  const bytes = Array.from(programId).map((c) => `${c.charCodeAt(0)}u8`);
+  return arrayToPlaintext(fillArray(bytes, 128, `u8`));
+}