Merge pull request #693 from EdgeApp/sam/v2corerollup

Sam/v2corerollup

Author: samholmes

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- added: Add `appVersion`, `osType`, and `osVersion` to `EdgeContextOptions` for v2 coreRollup endpoint support.
+- changed: Use `/v2/coreRollup` endpoint when device info is available, with `/v1/coreRollup` as fallback.
+
 ## 2.38.4 (2026-01-12)
 
 - fixed: Allow duplicate sync keys when performing a wallet split, in case a previous failed attempt left a repo behind.

src/core/actions.ts

@@ -369,6 +369,9 @@ export type RootAction =
         apiKey: string
         apiSecret?: Uint8Array
         appId: string
+        appVersion?: string
+        osType?: string
+        osVersion?: string
         changeServers: string[]
         infoCache: InfoCacheFile
         infoServers: string[]

src/core/context/context-pixie.ts

@@ -59,9 +59,25 @@ export const context: TamePixie<RootProps> = combinePixies({
     (input: ApiInput) => {
       async function doInfoSync(): Promise<void> {
         const { dispatch, io } = input.props
+        const { contextAppId, deviceInfo } = input.props.state.login
+        const { appVersion, osType, osVersion } = deviceInfo
 
         const [infoServerUri] = shuffle(input.props.state.infoServers)
-        const response = await fetch(`${infoServerUri}/v1/coreRollup`, {
+
+        // Use v2 endpoint if we have the required device info, otherwise fall back to v1
+        let url: string
+        if (osType != null && osVersion != null && appVersion != null) {
+          const params = new URLSearchParams()
+          params.set('appId', contextAppId !== '' ? contextAppId : 'edge')
+          params.set('os', osType)
+          params.set('osVersion', osVersion)
+          params.set('appVersion', appVersion)
+          url = `${infoServerUri}/v2/coreRollup?${params.toString()}`
+        } else {
+          url = `${infoServerUri}/v1/coreRollup`
+        }
+
+        const response = await fetch(url, {
           headers: { accept: 'application/json' }
         })
         if (!response.ok) return

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

@@ -600,8 +600,9 @@ export function makeCurrencyWalletApi(
       if (swapData != null) tx.swapData = asEdgeTxSwap(swapData)
       if (savedAction != null) tx.savedAction = asEdgeTxAction(savedAction)
       if (assetAction != null) tx.assetAction = asEdgeAssetAction(assetAction)
-      if (input.props.state.login.deviceDescription != null)
-        tx.deviceDescription = input.props.state.login.deviceDescription
+      if (input.props.state.login.deviceInfo.deviceDescription != null)
+        tx.deviceDescription =
+          input.props.state.login.deviceInfo.deviceDescription
 
       return tx
     },

src/core/login/login-delete.ts

@@ -12,7 +12,7 @@ export async function deleteLogin(
   login: LoginTree
 ): Promise<void> {
   const { stashTree } = getStashById(ai, login.loginId)
-  const { deviceDescription } = ai.props.state.login
+  const { deviceDescription } = ai.props.state.login.deviceInfo
 
   const request = makeAuthJson(stashTree, login)
   if (deviceDescription != null) request.deviceDescription = deviceDescription

src/core/login/login-reducer.ts

@@ -10,11 +10,18 @@ import { findDuressStash, LoginStash } from './login-stash'
 import { WalletInfoFullMap } from './login-types'
 import { findPin2Stash } from './pin2'
 
+export interface DeviceInfo {
+  readonly deviceDescription?: string
+  readonly osType?: string
+  readonly osVersion?: string
+  readonly appVersion?: string
+}
+
 export interface LoginState {
   readonly apiKey: string
   readonly apiSecret: Uint8Array | null
   readonly contextAppId: string
-  readonly deviceDescription: string | null
+  readonly deviceInfo: DeviceInfo
   readonly loginServers: string[]
   readonly stashes: LoginStash[]
   readonly localUsers: EdgeUserInfo[]
@@ -34,8 +41,18 @@ export const login = buildReducer<LoginState, RootAction, RootState>({
     return action.type === 'INIT' ? action.payload.appId : state
   },
 
-  deviceDescription(state = null, action): string | null {
-    return action.type === 'INIT' ? action.payload.deviceDescription : state
+  deviceInfo(state: DeviceInfo = {}, action): DeviceInfo {
+    if (action.type === 'INIT') {
+      const { appVersion, deviceDescription, osType, osVersion } =
+        action.payload
+      return {
+        deviceDescription: deviceDescription ?? undefined,
+        osType,
+        osVersion,
+        appVersion
+      }
+    }
+    return state
   },
 
   localUsers: memoizeReducer(

src/core/login/login.ts

@@ -349,7 +349,7 @@ export async function serverLogin(
   decrypt: (reply: LoginPayload) => Promise<Uint8Array>
 ): Promise<SessionKey> {
   const { now = new Date() } = opts
-  const { deviceDescription } = ai.props.state.login
+  const { deviceDescription } = ai.props.state.login.deviceInfo
 
   const request: LoginRequestBody = {
     challengeId: opts.challengeId,
@@ -427,7 +427,7 @@ export async function applyKit(
   const { serverMethod = 'POST', serverPath } = kit
 
   const { stashTree } = getStashById(ai, kit.loginId)
-  const { deviceDescription } = ai.props.state.login
+  const { deviceDescription } = ai.props.state.login.deviceInfo
 
   const newStashTree = updateTree<LoginStash, LoginStash>(
     stashTree,

src/core/login/vouchers.ts

@@ -19,7 +19,7 @@ export async function changeVoucherStatus(
   vouchers: ChangeVouchersPayload
 ): Promise<void> {
   const { stashTree } = getStashById(ai, login.loginId)
-  const { deviceDescription } = ai.props.state.login
+  const { deviceDescription } = ai.props.state.login.deviceInfo
 
   const request = makeAuthJson(stashTree, login)
   if (deviceDescription != null) request.deviceDescription = deviceDescription

src/core/root-reducer.ts

@@ -15,7 +15,6 @@ export interface RootState {
   readonly accountIds: string[]
   readonly accounts: { [accountId: string]: AccountState }
   readonly changeServers: string[]
-  readonly contextAppId: string
   readonly clientInfo: ClientInfo
   readonly hideKeys: boolean
   readonly infoCache: InfoCacheFile
@@ -105,10 +104,6 @@ export const reducer = buildReducer<RootState, RootAction, RootState>({
     return state
   },
 
-  contextAppId: (state = '', action): string => {
-    return action.type === 'LOGIN' ? action.payload.appId : state
-  },
-
   hideKeys(state = true, action): boolean {
     return action.type === 'INIT' ? action.payload.hideKeys : state
   },

src/core/root.ts

@@ -37,12 +37,15 @@ export async function makeContext(
     airbitzSupport = false,
     apiSecret,
     appId = '',
+    appVersion,
     authServer,
     deviceDescription = null,
     changeServer,
     hideKeys = false,
     infoServer,
     loginServer,
+    osType,
+    osVersion,
     plugins: pluginsInit = {},
     skipBlockHeight = false,
     syncServer
@@ -132,6 +135,9 @@ export async function makeContext(
       apiKey,
       apiSecret,
       appId,
+      appVersion,
+      osType,
+      osVersion,
       changeServers,
       loginServers,
       infoCache,