edge-core-js 2.41.2 → 2.42.0

package/ios/EdgeCoreModule.swift

@@ -7,9 +7,24 @@ class EdgeCoreModule: NSObject {
   @objc static func requiresMainQueueSetup() -> Bool { return false }
 
   @objc func constantsToExport() -> [AnyHashable: Any]! {
+    // Derive the app root URI using the same two-level Bundle lookup that
+    // plugin native modules use: find a .bundle resource, create a sub-Bundle,
+    // then call url(forResource:) on the sub-Bundle. This produces file:// URLs
+    // without /private, matching the plugin sourceUri values.
+    var rootBaseUri = Bundle.main.bundleURL.absoluteString
+    if let bundleUrl = Bundle.main.url(forResource: "edge-core-js", withExtension: "bundle"),
+      let bundle = Bundle(url: bundleUrl),
+      let coreUrl = bundle.url(forResource: "edge-core", withExtension: "js")
+    {
+      // Go up two levels: edge-core.js -> edge-core-js.bundle/ -> Edge.app/
+      rootBaseUri = coreUrl
+        .deletingLastPathComponent()
+        .deletingLastPathComponent()
+        .absoluteString
+    }
     return [
       "bundleBaseUri": BUNDLE_BASE_URI,
-      "rootBaseUri": "file://\(Bundle.main.bundlePath)/",
+      "rootBaseUri": rootBaseUri,
     ]
   }
 }

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

@@ -28,6 +28,7 @@ import { AccountSync, fixUsername } from '../../client-side'
 
 
 
+import { makeEdgeResult } from '../../util/edgeResult'
 import { base58 } from '../../util/encoding'
 import { getPublicWalletInfo } from '../currency/wallet/currency-wallet-pixie'
 import {
@@ -502,7 +503,42 @@ export function makeAccountApi(ai, accountId) {
       walletId,
       newWalletType
     ) {
-      return await splitWalletInfo(ai, accountId, walletId, newWalletType)
+      const { allWalletInfosFull } = accountState()
+      const walletInfo = allWalletInfosFull.find(
+        walletInfo => walletInfo.id === walletId
+      )
+      if (walletInfo == null) throw new Error(`Invalid wallet id ${walletId}`)
+      const existingWallet =
+        _optionalChain([ai, 'access', _2 => _2.props, 'access', _3 => _3.output, 'optionalAccess', _4 => _4.currency, 'optionalAccess', _5 => _5.wallets, 'access', _6 => _6[walletInfo.id], 'optionalAccess', _7 => _7.walletApi])
+
+      // The following check has not been needed since about 2021,
+      // when the currency plugins became responsible for listing
+      // their own splittable types, but keep it for safety:
+      if (
+        walletInfo.type === 'wallet:bitcoin' &&
+        walletInfo.keys.format === 'bip49' &&
+        newWalletType === 'wallet:bitcoincash'
+      ) {
+        throw new Error(
+          'Cannot split segwit-format Bitcoin wallets to Bitcoin Cash'
+        )
+      }
+
+      const [result] = await splitWalletInfo(
+        ai,
+        accountId,
+        walletInfo,
+        [
+          {
+            walletType: newWalletType,
+            name: _nullishCoalesce(_optionalChain([existingWallet, 'optionalAccess', _8 => _8.name]), () => ( undefined)),
+            fiatCurrencyCode: _optionalChain([existingWallet, 'optionalAccess', _9 => _9.fiatCurrencyCode])
+          }
+        ],
+        true
+      )
+      if (result.ok) return result.result.id
+      throw result.error
     },
 
     async listSplittableWalletTypes(walletId) {
@@ -750,7 +786,7 @@ export function makeAccountApi(ai, accountId) {
         throw new Error(
           `activateWallet unsupported by walletId ${activateWalletId}`
         )
-      const walletId = _nullishCoalesce(_optionalChain([paymentInfo, 'optionalAccess', _2 => _2.walletId]), () => ( ''))
+      const walletId = _nullishCoalesce(_optionalChain([paymentInfo, 'optionalAccess', _10 => _10.walletId]), () => ( ''))
       const wallet = currencyWallets[walletId]
 
       if (wallet == null) {
@@ -769,7 +805,7 @@ export function makeAccountApi(ai, accountId) {
 
         // Added for backward compatibility for plugins using core 1.x
         // @ts-expect-error
-        paymentTokenId: _optionalChain([paymentInfo, 'optionalAccess', _3 => _3.tokenId]),
+        paymentTokenId: _optionalChain([paymentInfo, 'optionalAccess', _11 => _11.tokenId]),
         paymentWallet: wallet
       })
 
@@ -828,11 +864,3 @@ function getRawPrivateKey(
   }
   return info
 }
-
-async function makeEdgeResult(promise) {
-  try {
-    return { ok: true, result: await promise }
-  } catch (error) {
-    return { ok: false, error }
-  }
-}

package/lib/core/account/memory-wallet.js

@@ -11,6 +11,8 @@ import { bridgifyObject, close, update, watchMethod } from 'yaob'
 
 
 
+
+
 import { makePeriodicTask, } from '../../util/periodic-task'
 import { snooze } from '../../util/snooze'
 import { getMaxSpendableInner } from '../currency/wallet/max-spend'
@@ -43,7 +45,7 @@ export const makeMemoryWalletInner = async (
   const log = makeLog(ai.props.logBackend, `${walletId}-${walletType}`)
   let balanceMap = new Map()
   let detectedTokenIds = []
-  let syncRatio = 0
+  let syncStatus = { totalRatio: 0 }
 
   let needsUpdate = false
   const updateWallet = () => {
@@ -58,51 +60,54 @@ export const makeMemoryWalletInner = async (
   }, 0)
 
   const plugin = ai.props.state.plugins.currency[config.currencyInfo.pluginId]
-  const engine = await plugin.makeCurrencyEngine(walletInfo, {
-    callbacks: {
-      onAddressChanged: () => {},
-      onAddressesChecked: (progressRatio) => {
-        if (out.syncRatio === 1) return
-
-        if (progressRatio === 1) {
-          syncRatio = progressRatio
-          needsUpdate = true
-        }
-      },
-      onNewTokens: (tokenIds) => {
-        const sortedTokenIds = tokenIds.sort((a, b) => a.localeCompare(b))
+  const callbacks = {
+    onAddressChanged: () => {},
+    onAddressesChecked(totalRatio) {
+      callbacks.onSyncStatusChanged({ totalRatio })
+    },
+    onNewTokens: (tokenIds) => {
+      const sortedTokenIds = tokenIds.sort((a, b) => a.localeCompare(b))
 
-        if (detectedTokenIds.length !== sortedTokenIds.length) {
+      if (detectedTokenIds.length !== sortedTokenIds.length) {
+        detectedTokenIds = sortedTokenIds
+        needsUpdate = true
+        return
+      }
+      for (let i = 0; i < sortedTokenIds.length; i++) {
+        if (detectedTokenIds[i] !== sortedTokenIds[i]) {
           detectedTokenIds = sortedTokenIds
           needsUpdate = true
           return
         }
-        for (let i = 0; i < sortedTokenIds.length; i++) {
-          if (detectedTokenIds[i] !== sortedTokenIds[i]) {
-            detectedTokenIds = sortedTokenIds
-            needsUpdate = true
-            return
-          }
-        }
-      },
-      onSeenTxCheckpoint: () => {},
-      onStakingStatusChanged: () => {},
-      onSubscribeAddresses: () => {},
-      onTokenBalanceChanged: (tokenId, balance) => {
-        if (balanceMap.get(tokenId) === balance) return
-
-        balanceMap = new Map(balanceMap)
-        balanceMap.set(tokenId, balance)
+      }
+    },
+    onSeenTxCheckpoint: () => {},
+    onStakingStatusChanged: () => {},
+    onSubscribeAddresses: () => {},
+    onSyncStatusChanged(status) {
+      if (syncStatus.totalRatio === 1) return
+      if (status.totalRatio === 1) {
+        syncStatus = status
         needsUpdate = true
-      },
-      onTransactions: () => {},
-      onTransactionsChanged: () => {},
-      onTxidsChanged: () => {},
-      onUnactivatedTokenIdsChanged: () => {},
-      onWcNewContractCall: () => {},
-      onBlockHeightChanged: () => {},
-      onBalanceChanged: () => {}
+      }
     },
+    onTokenBalanceChanged: (tokenId, balance) => {
+      if (balanceMap.get(tokenId) === balance) return
+
+      balanceMap = new Map(balanceMap)
+      balanceMap.set(tokenId, balance)
+      needsUpdate = true
+    },
+    onTransactions: () => {},
+    onTransactionsChanged: () => {},
+    onTxidsChanged: () => {},
+    onUnactivatedTokenIdsChanged: () => {},
+    onWcNewContractCall: () => {},
+    onBlockHeightChanged: () => {},
+    onBalanceChanged: () => {}
+  }
+  const engine = await plugin.makeCurrencyEngine(walletInfo, {
+    callbacks,
     customTokens: { ...config.customTokens },
     enabledTokenIds: [...Object.keys(config.allTokens)],
     lightMode: true,
@@ -151,7 +156,10 @@ export const makeMemoryWalletInner = async (
       return detectedTokenIds
     },
     get syncRatio() {
-      return syncRatio
+      return syncStatus.totalRatio
+    },
+    get syncStatus() {
+      return syncStatus
     },
     async changeEnabledTokenIds(tokenIds) {
       if (engine.changeEnabledTokenIds != null) {

package/lib/core/actions.js

@@ -451,5 +451,6 @@
 
 
 
+
 
 

package/lib/core/currency/wallet/currency-wallet-api.js

@@ -35,11 +35,15 @@ import {
 
 
 
+
+
+
 
 
 
 
 import { makeMetaTokens } from '../../account/custom-tokens'
+import { splitWalletInfo } from '../../login/splitting'
 import { toApiInput } from '../../root-pixie'
 import { makeStorageWalletApi } from '../../storage/storage-api'
 import { getCurrencyMultiplier } from '../currency-selectors'
@@ -201,7 +205,10 @@ export function makeCurrencyWalletApi(
       return skipBlockHeight ? 0 : input.props.walletState.height
     },
     get syncRatio() {
-      return input.props.walletState.syncRatio
+      return input.props.walletState.syncStatus.totalRatio
+    },
+    get syncStatus() {
+      return input.props.walletState.syncStatus
     },
     get unactivatedTokenIds() {
       return input.props.walletState.unactivatedTokenIds
@@ -727,6 +734,18 @@ export function makeCurrencyWalletApi(
       emit(out, 'transactionsRemoved', undefined)
     },
 
+    async split(
+      splitWallets
+    ) {
+      return await splitWalletInfo(
+        ai,
+        accountId,
+        walletInfo,
+        splitWallets,
+        false
+      )
+    },
+
     // URI handling:
     async encodeUri(options) {
       return await tools.encodeUri(

package/lib/core/currency/wallet/currency-wallet-callbacks.js

@@ -16,6 +16,7 @@ import {
 
 
 
+
 import { compare } from '../../../util/compare'
 import { enableTestMode, pushUpdate } from '../../../util/updateQueue'
 import {
@@ -118,11 +119,11 @@ export function makeCurrencyWalletCallbacks(
     onAddressesChecked(ratio) {
       pushUpdate({
         id: walletId,
-        action: 'onAddressesChecked',
+        action: 'onSyncStatusChanged',
         updateFunc: () => {
           input.props.dispatch({
-            type: 'CURRENCY_ENGINE_CHANGED_SYNC_RATIO',
-            payload: { ratio, walletId }
+            type: 'CURRENCY_ENGINE_CHANGED_SYNC_STATUS',
+            payload: { status: { totalRatio: ratio }, walletId }
           })
         }
       })
@@ -317,6 +318,19 @@ export function makeCurrencyWalletCallbacks(
       })
     },
 
+    onSyncStatusChanged(syncStatus) {
+      pushUpdate({
+        id: walletId,
+        action: 'onSyncStatusChanged',
+        updateFunc: () => {
+          input.props.dispatch({
+            type: 'CURRENCY_ENGINE_CHANGED_SYNC_STATUS',
+            payload: { status: syncStatus, walletId }
+          })
+        }
+      })
+    },
+
     onTransactions(txEvents) {
       const { accountId, currencyInfo, pluginId } = input.props.walletState
       const allTokens =

package/lib/core/currency/wallet/currency-wallet-reducer.js

@@ -14,6 +14,7 @@ import { buildReducer, filterReducer, memoizeReducer } from 'redux-keto'
 
 
 
+
 import { compare } from '../../../util/compare'
 
 import { findCurrencyPluginId } from '../../plugins/plugins-selectors'
@@ -120,6 +121,10 @@ import { uniqueStrings } from './enabled-tokens'
 // Used for detectedTokenIds & enabledTokenIds:
 export const initialTokenIds = []
 
+export const initialSyncStatus = {
+  totalRatio: 0
+}
+
 const currencyWalletInner = buildReducer
 
 
@@ -314,13 +319,13 @@ const currencyWalletInner = buildReducer
     return state
   },
 
-  syncRatio(state = 0, action) {
+  syncStatus(state = initialSyncStatus, action) {
     switch (action.type) {
-      case 'CURRENCY_ENGINE_CHANGED_SYNC_RATIO': {
-        return action.payload.ratio
+      case 'CURRENCY_ENGINE_CHANGED_SYNC_STATUS': {
+        return action.payload.status
       }
       case 'CURRENCY_ENGINE_CLEARED': {
-        return 0
+        return initialSyncStatus
       }
     }
     return state

package/lib/core/login/splitting.js

@@ -1,4 +1,4 @@
-import { asMaybe } from 'cleaners'
+ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }import { asMaybe } from 'cleaners'
 import { base64 } from 'rfc4648'
 
 
@@ -7,7 +7,11 @@ import { base64 } from 'rfc4648'
 
 
 
+
+
+
 import { hmacSha256 } from '../../util/crypto/hashes'
+import { makeEdgeResult } from '../../util/edgeResult'
 import { utf8 } from '../../util/encoding'
 import { changeWalletStates } from '../account/account-files'
 import { waitForCurrencyWallet } from '../currency/currency-selectors'
@@ -102,80 +106,135 @@ export function makeSplitWalletInfo(
 export async function splitWalletInfo(
   ai,
   accountId,
-  walletId,
-  newWalletType
+  walletInfo,
+  splitWallets,
+  rejectDupes
 ) {
   const accountState = ai.props.state.accounts[accountId]
   const { allWalletInfosFull, sessionKey } = accountState
 
-  // Find the wallet we are going to split:
-  const walletInfo = allWalletInfosFull.find(
-    walletInfo => walletInfo.id === walletId
-  )
-  if (walletInfo == null) throw new Error(`Invalid wallet id ${walletId}`)
-
-  // Handle BCH / BTC+segwit special case:
-  if (
-    newWalletType === 'wallet:bitcoincash' &&
-    walletInfo.type === 'wallet:bitcoin' &&
-    walletInfo.keys.format === 'bip49'
-  ) {
-    throw new Error(
-      'Cannot split segwit-format Bitcoin wallets to Bitcoin Cash'
-    )
+  // Validate the wallet types:
+  const plugins = ai.props.state.plugins.currency
+  const splitInfos = new Map()
+  for (const item of splitWallets) {
+    const { walletType } = item
+    const pluginId = maybeFindCurrencyPluginId(plugins, item.walletType)
+    if (pluginId == null) {
+      throw new Error(`Cannot find plugin for wallet type "${walletType}"`)
+    }
+    if (splitInfos.has(walletType)) {
+      throw new Error(`Duplicate wallet type "${walletType}"`)
+    }
+    splitInfos.set(walletType, makeSplitWalletInfo(walletInfo, walletType))
   }
 
-  // Handle BitcoinABC/SV replay protection:
+  // Do we need BitcoinABC/SV replay protection?
   const needsProtection =
-    newWalletType === 'wallet:bitcoinsv' &&
-    walletInfo.type === 'wallet:bitcoincash'
+    walletInfo.type === 'wallet:bitcoincash' &&
+    // We can re-protect a wallet by doing a repeated split,
+    // so don't check if the wallet already exists:
+    splitInfos.has('wallet:bitcoinsv')
   if (needsProtection) {
-    const oldWallet = ai.props.output.currency.wallets[walletId].walletApi
-    if (oldWallet == null) throw new Error('Missing Wallet')
-    await protectBchWallet(oldWallet)
+    const existingWallet =
+      _optionalChain([ai, 'access', _ => _.props, 'access', _2 => _2.output, 'optionalAccess', _3 => _3.currency, 'optionalAccess', _4 => _4.wallets, 'access', _5 => _5[walletInfo.id], 'optionalAccess', _6 => _6.walletApi])
+    if (existingWallet == null) {
+      throw new Error(`Cannot find wallet ${walletInfo.id}`)
+    }
+    await protectBchWallet(existingWallet)
   }
 
-  // See if the wallet has already been split:
-  const newWalletInfo = makeSplitWalletInfo(walletInfo, newWalletType)
-  const existingWalletInfo = allWalletInfosFull.find(
-    walletInfo => walletInfo.id === newWalletInfo.id
-  )
-  if (existingWalletInfo != null) {
-    if (existingWalletInfo.archived || existingWalletInfo.deleted) {
-      // Simply undelete the existing wallet:
-      const walletInfos = {}
-      walletInfos[newWalletInfo.id] = {
-        archived: false,
-        deleted: false,
-        migratedFromWalletId: existingWalletInfo.migratedFromWalletId
+  // Sort the wallet infos into two categories:
+  const toRestore = []
+  const toCreate = []
+  for (const newWalletInfo of splitInfos.values()) {
+    const existingWalletInfo = allWalletInfosFull.find(
+      info => info.id === newWalletInfo.id
+    )
+    if (existingWalletInfo == null) {
+      toCreate.push(newWalletInfo)
+    } else {
+      if (existingWalletInfo.archived || existingWalletInfo.deleted) {
+        toRestore.push(existingWalletInfo)
+      } else if (rejectDupes) {
+        if (
+          // It's OK to re-split if we are adding protection:
+          walletInfo.type !== 'wallet:bitcoincash' ||
+          newWalletInfo.type !== 'wallet:bitcoinsv'
+        ) {
+          throw new Error(
+            `This wallet has already been split (${newWalletInfo.type})`
+          )
+        }
       }
-      await changeWalletStates(ai, accountId, walletInfos)
-      return newWalletInfo.id
     }
-    if (needsProtection) return newWalletInfo.id
-    throw new Error('This wallet has already been split')
+  }
+
+  // Restore anything that has simply been deleted:
+  if (toRestore.length > 0) {
+    const newStates = {}
+    let hasChanges = false
+    for (const existingWalletInfo of toRestore) {
+      if (existingWalletInfo.archived || existingWalletInfo.deleted) {
+        hasChanges = true
+        newStates[existingWalletInfo.id] = {
+          archived: false,
+          deleted: false,
+          migratedFromWalletId: existingWalletInfo.migratedFromWalletId
+        }
+      }
+    }
+    if (hasChanges) await changeWalletStates(ai, accountId, newStates)
   }
 
   // Add the keys to the login:
-  const kit = makeKeysKit(ai, sessionKey, [newWalletInfo], true)
-  await applyKit(ai, sessionKey, kit)
+  if (toCreate.length > 0) {
+    const kit = makeKeysKit(ai, sessionKey, toCreate, true)
+    await applyKit(ai, sessionKey, kit)
+  }
+
+  // Wait for the new wallets to load:
+  const out = await Promise.all(
+    splitWallets.map(async splitInfo => {
+      const walletInfo = splitInfos.get(splitInfo.walletType)
+      if (walletInfo == null) {
+        throw new Error(`Missing wallet info for ${splitInfo.walletType}`)
+      }
+      return await makeEdgeResult(
+        finishWalletSplitting(
+          ai,
+          walletInfo.id,
+          toCreate.find(info => info.type === splitInfo.walletType) != null
+            ? splitInfo
+            : undefined
+        )
+      )
+    })
+  )
+
+  return out
+}
+
+async function finishWalletSplitting(
+  ai,
+  walletId,
+  item
+) {
+  const wallet = await waitForCurrencyWallet(ai, walletId)
 
   // Try to copy metadata on a best-effort basis.
   // In the future we should clone the repo instead:
-  try {
-    const wallet = await waitForCurrencyWallet(ai, newWalletInfo.id)
-    const oldWallet = ai.props.output.currency.wallets[walletId].walletApi
-    if (oldWallet != null) {
-      if (oldWallet.name != null) await wallet.renameWallet(oldWallet.name)
-      if (oldWallet.fiatCurrencyCode != null) {
-        await wallet.setFiatCurrencyCode(oldWallet.fiatCurrencyCode)
-      }
-    }
-  } catch (error) {
-    ai.props.onError(error)
+  if (_optionalChain([item, 'optionalAccess', _7 => _7.name]) != null) {
+    await wallet
+      .renameWallet(item.name)
+      .catch((error) => ai.props.onError(error))
+  }
+  if (_optionalChain([item, 'optionalAccess', _8 => _8.fiatCurrencyCode]) != null) {
+    await wallet
+      .setFiatCurrencyCode(item.fiatCurrencyCode)
+      .catch((error) => ai.props.onError(error))
   }
 
-  return newWalletInfo.id
+  return wallet
 }
 
 async function protectBchWallet(wallet) {