all Uint8Array output in base64

src/cli.ts

@@ -10,6 +10,7 @@ import { cliGetBalance } from './flows/balance/cli'
 import { cliListAccounts } from './flows/manage-accounts/cli'
 import { cliEntropyTransfer } from './flows/entropyTransfer/cli'
 import { cliSign } from './flows/sign/cli'
+import { stringify } from './common/utils'
 
 const program = new Command()
 
@@ -112,9 +113,7 @@ program.command('sign')
   })
 
 function writeOut (result) {
-  const prettyResult = typeof result === 'object'
-    ? JSON.stringify(result, null, 2)
-    : result
+  const prettyResult = stringify(result)
   process.stdout.write(prettyResult)
 }
 

src/common/utils.ts

@@ -6,6 +6,12 @@ export function stripHexPrefix (str: string): string {
   return str
 }
 
+export function stringify (thing, indent = 2) {
+  return (typeof thing === 'object')
+    ? JSON.stringify(thing, replacer, indent)
+    : thing
+}
+
 export function replacer (key, value) {
   if (value instanceof Uint8Array) {
     return Buffer.from(value).toString('base64')
@@ -14,7 +20,7 @@ export function replacer (key, value) {
 }
 
 export function print (...args) {
-  console.log(...args)
+  console.log(...args.map(arg => stringify(arg)))
 }
 
 // hardcoding for now instead of querying chain

src/flows/entropyTransfer/index.ts

@@ -53,12 +53,12 @@ export async function entropyTransfer ({ accounts, selectedAccount: selectedAcco
     )
     if (transferStatus.isFinalized) stopProgress()
 
-    print(
-      `\nTransaction successful: Sent ${amount} to ${recipientAddress}`
-    )
-    print('\nPress enter to return to main menu')
+    print('')
+    print(`Transaction successful: Sent ${amount} to ${recipientAddress}`)
+    print('')
+    print('Press enter to return to main menu')
   } catch (error) {
     stopProgress()
     console.error('ERR:::', error);
   }
-}
+}

src/flows/manage-accounts/new-account.ts

@@ -64,7 +64,8 @@ export async function newAccount ({ accounts }, logger: EntropyLogger) {
 
   const newAccount = await createAccount({ name, seed, path }, logger)
 
-  print(`New account:\n{\n\tname: ${newAccount.name}\n\taddress: ${newAccount.address}\n}`)
+  print('New account:')
+  print({ name: newAccount.name, address: newAccount.address })
 
   accounts.push(newAccount)
   return { accounts, selectedAccount: newAccount.address }

src/flows/sign/index.ts

@@ -50,8 +50,7 @@ async function signWithAdaptersInOrder (entropy, msg?: string, signingAttempts =
     print('msg to be signed:', msg)
     print('verifying key:', entropy.signingManager.verifyingKey)
     const signature = await signWithAdapters(entropy, { msg })
-    const signatureHexString = u8aToHex(signature)
-    print('signature:', signatureHexString)
+    print('signature:', u8aToHex(signature))
   } catch (error) {
     const { message } = error
     // See https://github.com/entropyxyz/sdk/issues/367 for reasoning behind adding this retry mechanism

src/flows/user-program-management/helpers/utils.ts

@@ -2,10 +2,29 @@ import { print } from "src/common/utils"
 
 export function displayPrograms (programs): void {
   programs.forEach((program, index) => {
-    print(
-      `${index + 1}. Pointer: ${
-        program.program_pointer
-      }, Config: ${JSON.stringify(program.program_config)}`
-    )
+    print(`${index + 1}.`)
+    print({
+      pointer: program.program_pointer,
+      config: parseProgramConfig(program.program_config)
+    })
+    print('')
   })
-}
+}
+
+function parseProgramConfig (rawConfig: unknown) {
+  if (typeof rawConfig !== 'string') return rawConfig
+  if (!rawConfig.startsWith('0x')) return rawConfig
+
+  const hex = rawConfig.slice(2)
+  const utf8 = Buffer.from(hex, 'hex').toString()
+  const output = JSON.parse(utf8)
+  Object.keys(output).forEach(key => {
+    output[key] = output[key].map(base64toHex)
+  })
+
+  return output
+}
+
+function base64toHex (base64: string): string {
+  return Buffer.from(base64, 'base64').toString('hex')
+}

src/flows/user-program-management/index.ts

@@ -111,3 +111,4 @@ export async function userPrograms ({ accounts, selectedAccount: selectedAccount
     return 'exit'
   }
 }
+