@xyo-network/module-abstract 2.92.7 → 2.92.9

package/src/AbstractModuleInstance.ts

@@ -1,4 +1,5 @@
 import { assertEx } from '@xylabs/assert'
+import { Address } from '@xylabs/hex'
 import { AccountInstance } from '@xyo-network/account-model'
 import { ModuleManifestPayload } from '@xyo-network/manifest-model'
 import { AddressPreviousHashPayload, Module, ModuleDescriptionPayload, ModuleEventData, ModuleParams } from '@xyo-network/module-model'
@@ -11,7 +12,7 @@ export abstract class AbstractModuleInstance<TParams extends ModuleParams = Modu
   implements Module<TParams, TEventData>
 {
   constructor(privateConstructorKey: string, params: TParams, account: AccountInstance) {
-    assertEx(AbstractModule.privateConstructorKey === privateConstructorKey, 'Use create function instead of constructor')
+    assertEx(AbstractModule.privateConstructorKey === privateConstructorKey, () => 'Use create function instead of constructor')
     // Clone params to prevent mutation of the incoming object
     const mutatedParams = { ...params } as TParams
     super(privateConstructorKey, mutatedParams, account)
@@ -33,7 +34,7 @@ export abstract class AbstractModuleInstance<TParams extends ModuleParams = Modu
     })
   }
 
-  manifest(maxDepth?: number, ignoreAddresses?: string[]): Promise<ModuleManifestPayload> {
+  manifest(maxDepth?: number, ignoreAddresses?: Address[]): Promise<ModuleManifestPayload> {
     this._checkDead()
     return this.busy(async () => {
       return await this.manifestHandler(maxDepth, ignoreAddresses)

package/src/determineAccount.ts

@@ -18,7 +18,7 @@ export interface DetermineRandomParams {}
 export type DetermineAccountParams = DetermineAccountFromAccountParams | DetermineAccountFromWalletParams | DetermineRandomParams
 
 const isDetermineAccountFromAccountParams = (params: DetermineAccountParams): params is DetermineAccountFromAccountParams => {
-  assertEx(!(params as DetermineAccountFromWalletParams).accountPath, 'accountPath may not be provided when account is provided')
+  assertEx(!(params as DetermineAccountFromWalletParams).accountPath, () => 'accountPath may not be provided when account is provided')
   return !!(params as DetermineAccountFromAccountParams).account
 }
 
@@ -29,14 +29,17 @@ const isDetermineAccountFromWalletParams = (params: DetermineAccountParams): par
 export async function determineAccount(params: DetermineAccountParams, allowRandomAccount = true): Promise<AccountInstance> {
   if (isDetermineAccountFromAccountParams(params)) {
     if (params.account === 'random') {
-      assertEx(allowRandomAccount, 'Random address not allowed')
+      assertEx(allowRandomAccount, () => 'Random address not allowed')
       return Account.randomSync()
     }
     return params.account
   }
 
   if (isDetermineAccountFromWalletParams(params)) {
-    return assertEx(params.accountPath ? await params.wallet.derivePath(params.accountPath) : params.wallet, 'Failed to derive account from path')
+    return assertEx(
+      params.accountPath ? await params.wallet.derivePath(params.accountPath) : params.wallet,
+      () => 'Failed to derive account from path',
+    )
   }
 
   //this should eventually be removed/thrown