Resolve ENV VARs once

Author: JoelBCarter

src/getGateway.ts

@@ -8,14 +8,14 @@ import { getLocator } from './getLocator.ts'
 
 let gateway: SimpleXyoGatewayRunner | undefined
 
-export const getGateway = async (walletMnemonic: string, rpcUrl: string) => {
+export const getGateway = async () => {
   // If existing gateway, return it
   if (isDefined(gateway)) return gateway
 
   // Otherwise, build a new gateway
 
   // Get locator
-  const locator = await getLocator(walletMnemonic, rpcUrl)
+  const locator = await getLocator()
 
   // Use locator to get connection and signer
   const connection = await locator.getInstance<XyoConnection>(XyoConnectionMoniker)

src/getLocator.ts

@@ -7,16 +7,16 @@ import { getTransportFactory } from './getTransportFactory.ts'
 
 let locator: ProviderFactoryLocator
 
-export const getLocator = async (walletMnemonic: string, rpcUrl: string) => {
+export const getLocator = async () => {
   // If existing locator, return it
   if (isDefined(locator)) return locator
 
   // Build a new locator
-  const transportFactory = getTransportFactory(rpcUrl)
+  const transportFactory = getTransportFactory()
   locator = await buildJsonRpcProviderLocator({ transportFactory })
 
   // Register the signer with the locator
-  const account = await getSignerAccount(walletMnemonic)
+  const account = await getSignerAccount()
   locator.register(SimpleXyoSigner.factory<SimpleXyoSigner>(SimpleXyoSigner.dependencies, { account }))
 
   // Return the locator

src/getSignerAccount.ts

@@ -2,18 +2,20 @@ import { isDefined } from '@xylabs/typeof'
 import type { AccountInstance } from '@xyo-network/account-model'
 import { ADDRESS_INDEX, generateXyoBaseWalletFromPhrase } from '@xyo-network/xl1-sdk'
 
+import { getWalletMnemonic } from './getWalletMnemonic.ts'
+
 let signerAccount: AccountInstance | undefined
 
 /**
  * Retrieves the signer account derived from the provided mnemonic.
- * @param walletMnemonic The mnemonic to use for deriving the account.
  * @returns The derived account
  */
-export const getSignerAccount = async (walletMnemonic: string) => {
+export const getSignerAccount = async () => {
   // If existing signer account, return it
   if (isDefined (signerAccount)) return signerAccount
 
   // Create new signer account
+  const walletMnemonic = getWalletMnemonic()
   const wallet = await generateXyoBaseWalletFromPhrase(walletMnemonic)
   signerAccount = await wallet.derivePath(ADDRESS_INDEX.XYO)
   console.log('Using signer account:', signerAccount.address)

src/getTransportFactory.ts

@@ -2,18 +2,20 @@ import { isDefined } from '@xylabs/typeof'
 import type { RpcSchemaMap, TransportFactory } from '@xyo-network/xl1-sdk'
 import { HttpRpcTransport } from '@xyo-network/xl1-sdk'
 
+import { getRpcUrl } from './getRpcUrl.ts'
+
 let transportFactory: TransportFactory | undefined
 
 /**
  * Retrieves a transport factory for the given RPC URL.
- * @param rpcUrl The RPC endpoint to use for interacting with the chain
  * @returns A transport factory for the given RPC URL
  */
-export const getTransportFactory = (rpcUrl: string) => {
+export const getTransportFactory = () => {
   // If existing transport factory, return it
   if (isDefined(transportFactory)) return transportFactory
 
   // Build a new transport factory
+  const rpcUrl = getRpcUrl()
   console.log('Using rpcUrl:', rpcUrl)
   transportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(rpcUrl, schemas)
   return transportFactory

src/getMnemonic.ts src/getWalletMnemonic.tssrc/getMnemonic.ts renamed to src/getWalletMnemonic.ts

@@ -11,4 +11,4 @@ const mnemonic = process.env.XYO_WALLET_MNEMONIC ?? HDWallet.generateMnemonic()
  * Gets the mnemonic to use for the signer
  * @returns The mnemonic to use for the signer
  */
-export const getMnemonic = (): string => mnemonic
+export const getWalletMnemonic = (): string => mnemonic

src/helloWorld.ts

@@ -9,18 +9,16 @@ const logger = console
 
 /**
  * Runs a simple "Hello World" transaction on the XL1 network.
- * @param mnemonic The mnemonic to use for signing transactions
- * @param rpcUrl The RPC URL to connect to the XL1 network
  */
-export async function helloWorld(mnemonic: string, rpcUrl: string): Promise<void> {
+export async function helloWorld(): Promise<void> {
   try {
     console.log('\n**** Starting XL1 Hello World NodeJs Sample ****\n')
 
     // Generate random data to send in the transaction
     const { onChainData, offChainData } = await getRandomTransactionData()
 
     // Get gateway to interact with the chain
-    const gateway = await getGateway(mnemonic, rpcUrl)
+    const gateway = await getGateway()
 
     // Send the transaction to the network
     const [txHash] = await gateway.addPayloadsToChain(onChainData, offChainData)

src/helloWorldRunner.ts

@@ -4,15 +4,13 @@ import type { XyoViewer } from '@xyo-network/xl1-protocol-sdk'
 import { XyoViewerMoniker } from '@xyo-network/xl1-protocol-sdk'
 
 import { getLocator } from './getLocator.ts'
-import { getMnemonic } from './getMnemonic.ts'
-import { getRpcUrl } from './getRpcUrl.ts'
 import { getSignerAccount } from './getSignerAccount.ts'
+import { getWalletMnemonic } from './getWalletMnemonic.ts'
 import { helloWorld } from './helloWorld.js'
 import { waitForInitialBlocks } from './waitForInitialBlocks.js'
 
 // Parse the relevant ENV VARs or use defaults
-const mnemonic = getMnemonic()
-const rpcUrl = getRpcUrl()
+const mnemonic = getWalletMnemonic()
 
 /**
  * Starts the XL1 node using command in a child process
@@ -52,7 +50,7 @@ async function startXl1(): Promise<string> {
 
   try {
     // Log out the mnemonic and signer address in case random was generated
-    const account = await getSignerAccount(mnemonic)
+    const account = await getSignerAccount()
     console.log('Using signer mnemonic:', mnemonic)
     console.log('Using producer address:', account.address)
 
@@ -88,7 +86,7 @@ async function startXl1(): Promise<string> {
     })
 
     // Get the XyoViewer instance
-    const locator = await getLocator(mnemonic, rpcUrl)
+    const locator = await getLocator()
     const viewer = await locator.getInstance<XyoViewer>(XyoViewerMoniker)
 
     // Wait for the initial blocks to be created
@@ -112,7 +110,7 @@ try {
 console.log('XL1 is ready, starting sample...')
 
 try {
-  await helloWorld(mnemonic, rpcUrl)
+  await helloWorld()
 } catch (error) {
   console.error('Error importing application:', error)
 }

src/index.ts

@@ -1,9 +1,3 @@
-import { getMnemonic } from './getMnemonic.ts'
-import { getRpcUrl } from './getRpcUrl.ts'
 import { helloWorld } from './helloWorld.js'
 
-// Parse the relevant ENV VARs or use defaults
-const mnemonic = getMnemonic()
-const rpcUrl = getRpcUrl()
-
-await helloWorld(mnemonic, rpcUrl)
+await helloWorld()