updated based on PR suggestions

src/common/initializeEntropy.ts

@@ -17,18 +17,9 @@ const keyrings = {
   default: undefined // this is the "selected account" keyring
 }
 
-export function getKeyring (address?: string, seed?: string) {
+export function getKeyring (address?: string) {
 
-  if (!address && !seed && keyrings.default) return keyrings.default
-  if (!address && seed && keyrings.default && Object.keys(keyrings).length > 1) {
-    const [keyring] = Object.keys(keyrings)
-      .filter(kr => {
-
-        return keyrings[kr]?.admin?.seed === seed
-      })
-
-    return keyring
-  }
+  if (!address && keyrings.default) return keyrings.default
   if (address && keyrings[address]) return keyrings[address]
   // explicitly return undefined so there is no confusion around what is selected
   return undefined
@@ -75,7 +66,7 @@ export const initializeEntropy = async ({ keyMaterial, password, endpoint, confi
     }
 
     let selectedAccount
-    const storedKeyring = getKeyring(accountData?.admin?.address, accountData.seed)
+    const storedKeyring = getKeyring(accountData.admin.address)
 
     if(!storedKeyring) {
       const keyring = new Keyring({ ...accountData, debug: true })

src/flows/entropyTransfer/types.ts

@@ -1,5 +1,7 @@
+// @ts-ignore
+import { Pair } from '@entropyxyz/sdk/keys'
 export interface TransferOptions { 
-  from?: any
+  from: Pair
   to: string
-  amount: number | string | bigint 
+  amount: bigint 
 }

tests/testing-utils/setup-test.ts

@@ -2,6 +2,8 @@ import { Test } from 'tape'
 import { Entropy, wasmGlobalsReady } from '@entropyxyz/sdk'
 // @ts-ignore
 import { spinNetworkUp, spinNetworkDown, } from "@entropyxyz/sdk/testing"
+// @ts-ignore
+import Keyring from '@entropyxyz/sdk/keys'
 
 import { initializeEntropy } from '../../src/common/initializeEntropy'
 import * as config from '../../src/config'
@@ -38,9 +40,11 @@ export async function setupTest (t: Test, opts?: SetupTestOpts): Promise<{ entro
 
   // TODO: remove this after new SDK is published
   await sleep(process.env.GITHUB_WORKSPACE ? 30_000 : 5_000)
-
+  // To follow the same way we initiate entropy within the cli we must go through the same process of creating an initial keyring
+  // as done in src/flows/manage-accounts/new-key.ts
+  const keyring = new Keyring({ seed, debug: true })
   const entropy = await initializeEntropy({
-    keyMaterial: { seed, debug: true },
+    keyMaterial: keyring.getAccount(),
     endpoint: 'ws://127.0.0.1:9944',
     configPath
   })

tests/transfer.test.ts

@@ -1,7 +1,8 @@
 import test from 'tape'
-import Entropy, { wasmGlobalsReady } from '@entropyxyz/sdk'
+import { wasmGlobalsReady } from '@entropyxyz/sdk'
 // WIP: I'm seeing problems importing this?
-import Keyring from '@entropyxyz/sdk/dist/keys/index'
+// @ts-ignore
+import Keyring from '@entropyxyz/sdk/keys'
 import { 
   makeSeed,
   promiseRunner,
@@ -33,8 +34,11 @@ test('Transfer', async (t) => {
   await sleep(process.env.GITHUB_WORKSPACE ? 30_000 : 5_000)
 
   const naynaySeed = makeSeed()
-  const entropy = await initializeEntropy({ keyMaterial: { seed: naynaySeed, debug: true }, endpoint: 'ws://127.0.0.1:9944', })
-  const charlieEntropy = await initializeEntropy({ keyMaterial: { seed: charlieStashSeed, debug: true }, endpoint: 'ws://127.0.0.1:9944', })
+  const naynayKeyring = new Keyring({ seed: naynaySeed, debug: true })
+  const charlieKeyring = new Keyring({ seed: charlieStashSeed, debug: true })
+
+  const entropy = await initializeEntropy({ keyMaterial: naynayKeyring.getAccount(), endpoint: 'ws://127.0.0.1:9944', })
+  const charlieEntropy = await initializeEntropy({ keyMaterial: charlieKeyring.getAccount(), endpoint: 'ws://127.0.0.1:9944', })
   await run('entropy ready', entropy.ready)
   await run('charlie ready', charlieEntropy.ready)