edge-core-js 2.1.0 → 2.2.0

package/lib/core/account/account-api.js

@@ -517,7 +517,7 @@ export function makeAccountApi(ai, accountId) {
       return await Promise.all(
         walletInfos.map(
           async (info, i) =>
-            await catchResult(
+            await makeEdgeResult(
               finishWalletCreation(ai, accountId, info.id, createWallets[i])
             )
         )
@@ -596,10 +596,14 @@ export function makeAccountApi(ai, accountId) {
           `getActivationAssets unsupported by walletId ${activateWalletId}`
         )
 
-      return await engine.engineGetActivationAssets({
+      const out = await engine.engineGetActivationAssets({
         currencyWallets,
         activateTokenIds
       })
+
+      // Added for backward compatibility for plugins using core 1.x
+      out.assetOptions.forEach(asset => (asset.tokenId = _nullishCoalesce(asset.tokenId, () => ( null))))
+      return out
     },
 
     async activateWallet(
@@ -632,8 +636,18 @@ export function makeAccountApi(ai, accountId) {
                 wallet,
                 tokenId: paymentInfo.tokenId
               }
-            : undefined
+            : undefined,
+
+        // Added for backward compatibility for plugins using core 1.x
+        // @ts-expect-error
+        paymentTokenId: _optionalChain([paymentInfo, 'optionalAccess', _2 => _2.tokenId]),
+        paymentWallet: wallet
       })
+
+      // Added for backward compatibility for plugins using core 1.x
+      // @ts-expect-error
+      if (out.networkFee.tokenId === undefined) out.networkFee.tokenId = null
+
       return bridgifyObject(out)
     },
 
@@ -687,7 +701,7 @@ function getRawPrivateKey(
   return info
 }
 
-async function catchResult(promise) {
+async function makeEdgeResult(promise) {
   try {
     return { ok: true, result: await promise }
   } catch (error) {

package/lib/core/login/keys.js

@@ -287,7 +287,7 @@ export async function finishWalletCreation(
   walletId,
   opts
 ) {
-  const { migratedFromWalletId, name, fiatCurrencyCode } = opts
+  const { enabledTokenIds, fiatCurrencyCode, migratedFromWalletId, name } = opts
   const wallet = await waitForCurrencyWallet(ai, walletId)
 
   // Write ancillary files to disk:
@@ -302,6 +302,9 @@ export async function finishWalletCreation(
   if (fiatCurrencyCode != null) {
     await wallet.setFiatCurrencyCode(fiatCurrencyCode)
   }
+  if (enabledTokenIds != null && enabledTokenIds.length > 0) {
+    await wallet.changeEnabledTokenIds(enabledTokenIds)
+  }
 
   return wallet
 }

package/lib/flow/types.js

@@ -1384,6 +1384,7 @@ export type ChangeUsernameOptions = {
 // currencies ----------------------------------------------------------
 
 export type EdgeCreateCurrencyWalletOptions = {
+  enabledTokenIds?: string[];
   fiatCurrencyCode?: string;
   name?: string;
 

package/lib/node/index.js

@@ -2171,9 +2171,10 @@ async function makeCurrencyWalletKeys(ai, walletType, opts) {
 }
 async function finishWalletCreation(ai, accountId, walletId, opts) {
   const {
+    enabledTokenIds,
+    fiatCurrencyCode,
     migratedFromWalletId,
-    name,
-    fiatCurrencyCode
+    name
   } = opts;
   const wallet = await waitForCurrencyWallet(ai, walletId);
 
@@ -2191,6 +2192,9 @@ async function finishWalletCreation(ai, accountId, walletId, opts) {
   if (fiatCurrencyCode != null) {
     await wallet.setFiatCurrencyCode(fiatCurrencyCode);
   }
+  if (enabledTokenIds != null && enabledTokenIds.length > 0) {
+    await wallet.changeEnabledTokenIds(enabledTokenIds);
+  }
   return wallet;
 }
 
@@ -9160,7 +9164,7 @@ function makeAccountApi(ai, accountId) {
       await applyKit(ai, loginTree, makeKeysKit(ai, login, walletInfos));
 
       // Set up options:
-      return await Promise.all(walletInfos.map(async (info, i) => await catchResult(finishWalletCreation(ai, accountId, info.id, createWallets[i]))));
+      return await Promise.all(walletInfos.map(async (info, i) => await makeEdgeResult(finishWalletCreation(ai, accountId, info.id, createWallets[i]))));
     },
     async waitForCurrencyWallet(walletId) {
       return await new Promise((resolve, reject) => {
@@ -9213,10 +9217,14 @@ function makeAccountApi(ai, accountId) {
       } = walletOutput;
       if (engine == null) throw new Error(`Invalid wallet: ${activateWalletId} not found`);
       if (engine.engineGetActivationAssets == null) throw new Error(`getActivationAssets unsupported by walletId ${activateWalletId}`);
-      return await engine.engineGetActivationAssets({
+      const out = await engine.engineGetActivationAssets({
         currencyWallets,
         activateTokenIds
       });
+
+      // Added for backward compatibility for plugins using core 1.x
+      out.assetOptions.forEach(asset => asset.tokenId = asset.tokenId ?? null);
+      return out;
     },
     async activateWallet(opts) {
       const {
@@ -9243,8 +9251,16 @@ function makeAccountApi(ai, accountId) {
         paymentInfo: paymentInfo != null ? {
           wallet,
           tokenId: paymentInfo.tokenId
-        } : undefined
+        } : undefined,
+        // Added for backward compatibility for plugins using core 1.x
+        // @ts-expect-error
+        paymentTokenId: paymentInfo?.tokenId,
+        paymentWallet: wallet
       });
+
+      // Added for backward compatibility for plugins using core 1.x
+      // @ts-expect-error
+      if (out.networkFee.tokenId === undefined) out.networkFee.tokenId = null;
       return yaob.bridgifyObject(out);
     },
     // ----------------------------------------------------------------
@@ -9278,7 +9294,7 @@ function getRawPrivateKey(ai, accountId, walletId) {
   }
   return info;
 }
-async function catchResult(promise) {
+async function makeEdgeResult(promise) {
   try {
     return {
       ok: true,

package/lib/types/types.js

@@ -1896,5 +1896,6 @@ export * from './server-types'
 
 
 
+
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-core-js",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Edge account & wallet management library",
   "keywords": [
     "bitcoin",

package/src/types/types.ts

@@ -1378,6 +1378,7 @@ export interface ChangeUsernameOptions {
 // currencies ----------------------------------------------------------
 
 export interface EdgeCreateCurrencyWalletOptions {
+  enabledTokenIds?: string[]
   fiatCurrencyCode?: string
   name?: string