refactor: drop WALLET_PROVIDER_USER_URL and derive the URL default from the port

.env.example

@@ -9,7 +9,6 @@ NETWORK=canton:localnet
 WALLET_PROVIDER_ID=wallet-service
 WALLET_PROVIDER_VERSION=0.1.0
 WALLET_PROVIDER_URL=http://localhost:3010
-WALLET_PROVIDER_USER_URL=http://localhost:3010
 
 # Splice LocalNet app-user participant, as reachable from the host.
 CANTON_JSON_API_URL=http://localhost:2975

src/config.ts

@@ -27,7 +27,6 @@ export interface WalletServiceConfig {
     id: string
     version: string
     url?: string
-    userUrl?: string
   }
   canton: CantonEndpoints & CantonCredentials
   splice: SpliceEndpoints
@@ -186,8 +185,9 @@ export const loadConfig = (): WalletServiceConfig => {
       (name) => name.startsWith(OAUTH_PREFIX) && optional(name) !== undefined,
     )
   const { canton, splice } = wantsOAuth ? resolveOAuth(preset) : resolveStatic()
+  const port = optionalNumber('WALLET_SERVICE_PORT', 3010)
   return {
-    port: optionalNumber('WALLET_SERVICE_PORT', 3010),
+    port,
     corsOrigins: (
       optional('WALLET_SERVICE_CORS_ORIGINS') ??
       optional('WALLET_SERVICE_CORS_ORIGIN') ??
@@ -200,8 +200,7 @@ export const loadConfig = (): WalletServiceConfig => {
     provider: {
       id: optional('WALLET_PROVIDER_ID') ?? 'wallet-service',
       version: optional('WALLET_PROVIDER_VERSION') ?? '0.1.0',
-      url: optional('WALLET_PROVIDER_URL') ?? 'http://localhost:3010',
-      userUrl: optional('WALLET_PROVIDER_USER_URL') ?? 'http://localhost:3010',
+      url: optional('WALLET_PROVIDER_URL') ?? `http://localhost:${port}`,
     },
     canton,
     splice,

src/rpc.ts

@@ -335,7 +335,6 @@ export const buildProvider = (p: WalletServiceConfig['provider']): Provider => (
   version: p.version,
   providerType: 'remote',
   ...(p.url === undefined ? {} : { url: p.url }),
-  ...(p.userUrl === undefined ? {} : { userUrl: p.userUrl }),
 })
 
 const firstParty = (params: { partyId?: string; actAs?: string[] }): string => {
@@ -616,7 +615,6 @@ export const createRpc = (config: WalletServiceConfig, deps: RpcDependencies = {
       reason: 'No wallet session/account implementation yet.',
       isNetworkConnected: networkStatus.connected,
       ...(networkStatus.reason === undefined ? {} : { networkReason: networkStatus.reason }),
-      ...(config.provider.userUrl === undefined ? {} : { userUrl: config.provider.userUrl }),
     }
   }
 

src/types.ts

@@ -39,15 +39,13 @@ export type Provider = {
   version?: string
   providerType?: 'browser' | 'desktop' | 'mobile' | 'remote'
   url?: string
-  userUrl?: string
 }
 
 export type ConnectResult = {
   isConnected: boolean
   reason?: string
   isNetworkConnected: boolean
   networkReason?: string
-  userUrl?: string
 }
 
 export type Session = {

test/rpc.test.ts

@@ -11,7 +11,6 @@ const baseConfig = () => ({
     id: 'wallet-service',
     version: '0.1.0',
     url: 'http://localhost:3010',
-    userUrl: 'http://localhost:3010',
   },
   // Credentials are a union, so there is no credential-less config to build: every
   // config loadConfig can produce carries either a static token or OAuth.