Merge pull request #657 from EdgeApp/sam/ecs-updates

Extend onSubscribeAddresses to include checkpoints

Author: samholmes

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- changed: Extended `onSubscribeAddresses` callback to optionally include checkpoints.
 - fixed: Disabling pin-login while in duress mode disables pin-login for the main login.
 - fixed: `loginWithPassword` bug disabled duress mode when doing an online login.
 - fixed: Properly fake duress mode settings while in duress mode.

src/core/currency/wallet/currency-wallet-callbacks.ts

@@ -291,14 +291,27 @@ export function makeCurrencyWalletCallbacks(
       })
     },
 
-    onSubscribeAddresses(addresses: string[]) {
+    onSubscribeAddresses(
+      paramsOrAddresses:
+        | Array<{ address: string; checkpoint?: string }>
+        | string[]
+    ) {
+      const params = paramsOrAddresses.map(param =>
+        typeof param === 'string'
+          ? {
+              address: param,
+              checkpoint: undefined
+            }
+          : param
+      )
       const changeServiceSubscriptions =
         input.props.state.currency.wallets[walletId].changeServiceSubscriptions
       const subscriptions: ChangeServiceSubscription[] = [
         ...changeServiceSubscriptions,
-        ...addresses.map(address => ({
+        ...params.map(({ address, checkpoint }) => ({
           address,
-          status: 'subscribing' as const
+          status: 'subscribing' as const,
+          checkpoint
         }))
       ]
       // TODO: We currently have no way to remove addresses from this list.

src/types/types.ts

@@ -918,7 +918,12 @@ export interface EdgeCurrencyEngineCallbacks {
   readonly onNewTokens: (tokenIds: string[]) => void
   readonly onSeenTxCheckpoint: (checkpoint: string) => void
   readonly onStakingStatusChanged: (status: EdgeStakingStatus) => void
-  readonly onSubscribeAddresses: (addresses: string[]) => void
+  readonly onSubscribeAddresses: (
+    paramsOrAddresses:
+      | Array<{ address: string; checkpoint?: string }>
+      /** @deprecated Use the array of param objects instead. */
+      | string[]
+  ) => void
   readonly onTokenBalanceChanged: (
     tokenId: EdgeTokenId,
     balance: string