Use random private key for bunker connection

packages/app/src/Hooks/useLoginHandler.tsx

@@ -45,12 +45,11 @@ export default function useLoginHandler() {
       }
       LoginStore.loginWithPrivateKey(key);
     } else if (key.startsWith("bunker://")) {
-      const inner = new Nip7Signer();
-      const nip46 = new Nip46Signer(key, inner);
+      const nip46 = new Nip46Signer(key);
       await nip46.init();
 
       const loginPubkey = await nip46.getPubKey();
-      LoginStore.loginWithPubkey(loginPubkey, LoginSessionType.Nip46, undefined, nip46.relays);
+      LoginStore.loginWithPubkey(loginPubkey, LoginSessionType.Nip46, undefined, nip46.relays, nip46.privateKey);
       nip46.close();
     } else {
       throw new Error("INVALID PRIVATE KEY");

packages/app/src/Login/MultiAccountStore.ts

@@ -1,7 +1,7 @@
 import * as secp from "@noble/curves/secp256k1";
 import * as utils from "@noble/curves/abstract/utils";
 
-import { HexKey, RelaySettings, EventPublisher, Nip46Signer, Nip7Signer } from "@snort/system";
+import { HexKey, RelaySettings, EventPublisher, Nip46Signer, Nip7Signer, PrivateKeySigner } from "@snort/system";
 import { deepClone, sanitizeRelayUrl, unwrap, ExternalStore } from "@snort/shared";
 
 import { DefaultRelays } from "Const";
@@ -94,7 +94,8 @@ export class MultiAccountStore extends ExternalStore<LoginSession> {
     key: HexKey,
     type: LoginSessionType,
     relays?: Record<string, RelaySettings>,
-    remoteSignerRelays?: Array<string>
+    remoteSignerRelays?: Array<string>,
+    privateKey?: string
   ) {
     if (this.#accounts.has(key)) {
       throw new Error("Already logged in with this pubkey");
@@ -110,6 +111,7 @@ export class MultiAccountStore extends ExternalStore<LoginSession> {
       },
       preferences: deepClone(DefaultPreferences),
       remoteSignerRelays,
+      privateKey,
     } as LoginSession;
     newSession.publisher = this.#createPublisher(newSession);
 
@@ -183,7 +185,7 @@ export class MultiAccountStore extends ExternalStore<LoginSession> {
       }
       case LoginSessionType.Nip46: {
         const relayArgs = (l.remoteSignerRelays ?? []).map(a => `relay=${encodeURIComponent(a)}`);
-        const inner = new Nip7Signer();
+        const inner = new PrivateKeySigner(unwrap(l.privateKey));
         const nip46 = new Nip46Signer(`bunker://${unwrap(l.publicKey)}?${[...relayArgs].join("&")}`, inner);
         return new EventPublisher(nip46, unwrap(l.publicKey));
       }
@@ -240,12 +242,8 @@ export class MultiAccountStore extends ExternalStore<LoginSession> {
 
     // update session types
     for (const [, v] of this.#accounts) {
-      if (v.privateKey) {
-        v.type = LoginSessionType.PrivateKey;
-        didMigrate = true;
-      }
       if (!v.type) {
-        v.type = LoginSessionType.Nip7;
+        v.type = v.privateKey ? LoginSessionType.PrivateKey : LoginSessionType.Nip7;
         didMigrate = true;
       }
     }

packages/system/src/event-publisher.ts

@@ -43,6 +43,10 @@ export class PrivateKeySigner implements EventSigner {
     this.#publicKey = getPublicKey(this.#privateKey);
   }
 
+  get privateKey() {
+    return this.#privateKey;
+  }
+
   init(): Promise<void> {
     return Promise.resolve();
   }

packages/system/src/impl/nip46.ts

@@ -67,6 +67,12 @@ export class Nip46Signer implements EventSigner {
         return [this.#relay];
     }
 
+    get privateKey() {
+        if(this.#insideSigner instanceof PrivateKeySigner) {
+            return this.#insideSigner.privateKey;
+        }
+    }
+
     async init() {
         const isBunker = this.#proto === "bunker:";
         if (isBunker) {