fix merge

proto/autogenerated/ts/nostr_client.ts

@@ -5,10 +5,10 @@ export type ResultError = { status: 'ERROR', reason: string }
 
 export type NostrClientParams = {
     pubDestination: string
-    retrieveNostrUserAuth: () => Promise<string | null>
-    retrieveNostrGuestWithPubAuth: () => Promise<string | null>
     retrieveNostrAdminAuth: () => Promise<string | null>
     retrieveNostrMetricsAuth: () => Promise<string | null>
+    retrieveNostrUserAuth: () => Promise<string | null>
+    retrieveNostrGuestWithPubAuth: () => Promise<string | null>
     checkResult?: true
 }
 export default (params: NostrClientParams,  send: (to:string, message: NostrRequest) => Promise<any>, subscribe: (to:string, message: NostrRequest, cb:(res:any)=> void) => void) => ({

proto/autogenerated/ts/nostr_transport.ts

@@ -16,10 +16,10 @@ export type NostrOptions = {
     logger?: Logger
     throwErrors?: true
     metricsCallback: (metrics: Types.RequestMetric[]) => void
-    NostrUserAuthGuard: (appId?:string, identifier?: string) => Promise<Types.UserContext>
-    NostrGuestWithPubAuthGuard: (appId?:string, identifier?: string) => Promise<Types.GuestWithPubContext>
     NostrAdminAuthGuard: (appId?:string, identifier?: string) => Promise<Types.AdminContext>
     NostrMetricsAuthGuard: (appId?:string, identifier?: string) => Promise<Types.MetricsContext>
+    NostrUserAuthGuard: (appId?:string, identifier?: string) => Promise<Types.UserContext>
+    NostrGuestWithPubAuthGuard: (appId?:string, identifier?: string) => Promise<Types.GuestWithPubContext>
 }
 const logErrorAndReturnResponse = (error: Error, response: string, res: NostrResponse, logger: Logger, metric: Types.RequestMetric, metricsCallback: (metrics: Types.RequestMetric[]) => void) => { 
     logger.error(error.message || error); metricsCallback([{ ...metric, error: response }]); res({ status: 'ERROR', reason: response })