pass viewer instead of creating one

Author: jonesmac

src/helloWorldRunner.ts

@@ -1,8 +1,12 @@
 import { type ChildProcess, spawn } from 'node:child_process'
 
 import { HDWallet } from '@xyo-network/wallet'
-import { ADDRESS_INDEX, generateXyoBaseWalletFromPhrase } from '@xyo-network/xl1-protocol-sdk'
+import type { XyoViewer } from '@xyo-network/xl1-protocol-sdk'
+import {
+  ADDRESS_INDEX, generateXyoBaseWalletFromPhrase, XyoViewerMoniker,
+} from '@xyo-network/xl1-protocol-sdk'
 
+import { getLocator } from './getGateway.ts'
 import { helloWorld } from './helloWorld.js'
 import { waitForInitialBlocks } from './waitForInitialBlocks.js'
 
@@ -83,7 +87,12 @@ async function startXl1(): Promise<string> {
       throw error
     })
 
-    await waitForInitialBlocks()
+    // Get the XyoViewer instance
+    const locator = await getLocator()
+    const viewer = await locator.getInstance<XyoViewer>(XyoViewerMoniker)
+
+    // Wait for the initial blocks to be created
+    await waitForInitialBlocks(viewer)
 
     return mnemonic
   } catch (error) {

src/waitForInitialBlocks.ts

@@ -1,12 +1,10 @@
 import { assertEx } from '@xylabs/assert'
 import { delay } from '@xylabs/delay'
 import { isDefined } from '@xylabs/typeof'
-import { HttpRpcXyoConnection } from '@xyo-network/xl1-rpc'
-
-export const waitForInitialBlocks = async (maxAttempts = 10): Promise<void> => {
-  const connection = new HttpRpcXyoConnection({ endpoint: 'http://localhost:8080/rpc' })
-  const viewer = assertEx(connection.viewer, () => 'Connection viewer is undefined')
+import type { XyoViewer } from '@xyo-network/xl1-sdk'
 
+export const waitForInitialBlocks = async (viewer: XyoViewer, maxAttempts = 10): Promise<void> => {
+  assertEx(viewer, () => 'Connection viewer is undefined')
   console.log('\n⏳ Waiting for genesis block creation...')
   let attempts = 0
   while (attempts < maxAttempts) {