chore: refactored aleo helpers

Author: troykessler

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

@@ -23,7 +23,7 @@ import {
   getOrInitConsensusVersionTestHeights,
 } from '@provablehq/sdk/testnet.js';
 
-import { assert } from '@hyperlane-xyz/utils';
+import { assert, strip0x } from '@hyperlane-xyz/utils';
 
 import { mailbox } from '../artifacts.js';
 
@@ -66,10 +66,6 @@ export class AleoBase {
     return this.chainId ? TestnetPlaintext : MainnetPlaintext;
   }
 
-  protected get U128() {
-    return this.chainId ? TestnetU128 : MainnetU128;
-  }
-
   protected get BHP256() {
     return this.chainId ? TestnetBHP256 : MainnetBHP256;
   }
@@ -129,4 +125,37 @@ export class AleoBase {
       .address()
       .to_string();
   }
+
+  protected stringToU128String(input: string): string {
+    if (input.length > 16) {
+      throw new Error(`string "${input}" is too long to convert it into U128`);
+    }
+
+    const encoded = new TextEncoder().encode(input);
+    const bytes = new Uint8Array(16);
+    bytes.set(encoded.subarray(0, 16));
+
+    const U128 = this.chainId ? TestnetU128 : MainnetU128;
+    return U128.fromBytesLe(bytes).toString();
+  }
+
+  protected U128StringToString(input: string): string {
+    const U128 = this.chainId ? TestnetU128 : MainnetU128;
+    return new TextDecoder().decode(
+      U128.fromString(input)
+        .toBytesLe()
+        .filter((b) => b > 0),
+    );
+  }
+
+  protected bytes32ToU128String(input: string): string {
+    const bytes = Buffer.from(strip0x(input), 'hex');
+
+    // Split into two 128-bit chunks
+    const lowBytes = Uint8Array.from(bytes.subarray(0, 16));
+    const highBytes = Uint8Array.from(bytes.subarray(16, 32));
+
+    const U128 = this.chainId ? TestnetU128 : MainnetU128;
+    return `[${U128.fromBytesLe(lowBytes).toString()},${U128.fromBytesLe(highBytes).toString()}]`;
+  }
 }

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

@@ -2,13 +2,7 @@ import { BigNumber } from 'bignumber.js';
 
 import { AltVM, assert, ensure0x, strip0x } from '@hyperlane-xyz/utils';
 
-import {
-  ALEO_NULL_ADDRESS,
-  U128ToString,
-  formatAddress,
-  splitToU128,
-  stringToU128,
-} from '../utils/helper.js';
+import { ALEO_NULL_ADDRESS, formatAddress } from '../utils/helper.js';
 import { AleoTransaction } from '../utils/types.js';
 
 import { AleoBase } from './base.js';
@@ -151,12 +145,12 @@ export class AleoProvider extends AleoBase implements AltVM.IProvider {
   async isMessageDelivered(req: AltVM.ReqIsMessageDelivered): Promise<boolean> {
     try {
       // Message key needs to be separated into [u128, u128] using Little Endian.
-      const messageKey = splitToU128(req.messageId);
+      const messageKey = this.bytes32ToU128String(req.messageId);
 
       const res = await this.aleoClient.getProgramMappingPlaintext(
         req.mailboxAddress,
         'deliveries',
-        `{id:[${messageKey[0].toString()},${messageKey[1].toString()}]}`,
+        `{id:${messageKey}}`,
       );
 
       const obj = res.toObject();
@@ -462,15 +456,11 @@ export class AleoProvider extends AleoBase implements AltVM.IProvider {
       const metadata = tokenMetadata.toObject();
 
       return {
-        name: U128ToString(
-          this.U128.fromString(
-            `${tokenMetadata.toObject()['name'].toString()}u128`,
-          ),
+        name: this.U128StringToString(
+          `${tokenMetadata.toObject()['name'].toString()}u128`,
         ),
-        symbol: U128ToString(
-          this.U128.fromString(
-            `${tokenMetadata.toObject()['symbol'].toString()}u128`,
-          ),
+        symbol: this.U128StringToString(
+          `${tokenMetadata.toObject()['symbol'].toString()}u128`,
         ),
         decimals: metadata['decimals'],
       };
@@ -982,8 +972,8 @@ export class AleoProvider extends AleoBase implements AltVM.IProvider {
       priorityFee: 0,
       privateFee: false,
       inputs: [
-        stringToU128(req.name).toString(),
-        stringToU128(req.denom).toString(),
+        this.stringToU128String(req.name),
+        this.stringToU128String(req.denom),
         `${req.decimals}u8`,
         `${req.decimals}u8`,
       ],
@@ -1097,9 +1087,7 @@ export class AleoProvider extends AleoBase implements AltVM.IProvider {
       );
     }
 
-    const recipient = `[${splitToU128(req.recipient)
-      .map((u) => u.toString())
-      .join(',')}]`;
+    const recipient = this.bytes32ToU128String(req.recipient);
 
     const creditAllowance = Array(4).fill(
       `{spender:${ALEO_NULL_ADDRESS},amount:0u8}`,

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

@@ -1,36 +1,6 @@
-import { U128 } from '@provablehq/wasm';
-
-import { strip0x } from '@hyperlane-xyz/utils';
-
 export const ALEO_NULL_ADDRESS =
   'aleo1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq3ljyzc';
 
-export function splitToU128(messageId: string): [U128, U128] {
-  const bytes = Buffer.from(strip0x(messageId), 'hex');
-
-  // Split into two 128-bit chunks
-  const lowBytes = Uint8Array.from(bytes.subarray(0, 16));
-  const highBytes = Uint8Array.from(bytes.subarray(16, 32));
-
-  return [U128.fromBytesLe(lowBytes), U128.fromBytesLe(highBytes)];
-}
-
 export function formatAddress(address: string): string {
   return address === ALEO_NULL_ADDRESS ? '' : address;
 }
-
-export function stringToU128(input: string): U128 {
-  if (input.length > 16) {
-    throw new Error(`string "${input}" is too long to convert it into U128`);
-  }
-
-  const encoded = new TextEncoder().encode(input);
-  const bytes = new Uint8Array(16);
-  bytes.set(encoded.subarray(0, 16));
-
-  return U128.fromBytesLe(bytes);
-}
-
-export function U128ToString(input: U128): string {
-  return new TextDecoder().decode(input.toBytesLe().filter((b) => b > 0));
-}