diff --git a/src/features/nostr/keys.ts b/src/features/nostr/keyring.ts similarity index 69% rename from src/features/nostr/keys.ts rename to src/features/nostr/keyring.ts index e13d3b054..6ae33502a 100644 --- a/src/features/nostr/keys.ts +++ b/src/features/nostr/keyring.ts @@ -1,6 +1,6 @@ import { NKeyring } from './NKeyring'; -export const NKeys = new NKeyring( +export const keyring = new NKeyring( localStorage, 'soapbox:nostr:keys', ); diff --git a/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx b/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx index 486afbe77..44f5b8cf7 100644 --- a/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx +++ b/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx @@ -6,7 +6,7 @@ import { logInNostr } from 'soapbox/actions/nostr'; import EmojiGraphic from 'soapbox/components/emoji-graphic'; import { Button, Stack, Modal, Input, FormGroup, Form, Divider } from 'soapbox/components/ui'; import { useNostr } from 'soapbox/contexts/nostr-context'; -import { NKeys } from 'soapbox/features/nostr/keys'; +import { keyring } from 'soapbox/features/nostr/keyring'; import { useAppDispatch } from 'soapbox/hooks'; import NostrExtensionIndicator from '../components/nostr-extension-indicator'; @@ -33,7 +33,7 @@ const KeyAddStep: React.FC = ({ onClose }) => { const result = nip19.decode(nsec); if (result.type === 'nsec') { const seckey = result.data; - const signer = NKeys.add(seckey); + const signer = keyring.add(seckey); dispatch(logInNostr(signer, relay)); onClose(); return; diff --git a/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx b/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx index ae50f6a9f..7ae2e6164 100644 --- a/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx +++ b/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx @@ -8,7 +8,7 @@ import { closeSidebar } from 'soapbox/actions/sidebar'; import EmojiGraphic from 'soapbox/components/emoji-graphic'; import { Button, Stack, Modal, FormGroup, Text, Tooltip, HStack, Input } from 'soapbox/components/ui'; import { useNostr } from 'soapbox/contexts/nostr-context'; -import { NKeys } from 'soapbox/features/nostr/keys'; +import { keyring } from 'soapbox/features/nostr/keyring'; import { useAppDispatch, useInstance } from 'soapbox/hooks'; import { useIsMobile } from 'soapbox/hooks/useIsMobile'; import { download } from 'soapbox/utils/download'; @@ -45,7 +45,7 @@ const KeygenStep: React.FC = ({ onClose }) => { const handleNext = async () => { if (!relay) return; - const signer = NKeys.add(secretKey); + const signer = keyring.add(secretKey); const now = Math.floor(Date.now() / 1000); const [kind0, ...events] = await Promise.all([ diff --git a/src/hooks/nostr/useSigner.ts b/src/hooks/nostr/useSigner.ts index a91422006..fdae1c2a7 100644 --- a/src/hooks/nostr/useSigner.ts +++ b/src/hooks/nostr/useSigner.ts @@ -2,7 +2,7 @@ import { NSecSigner } from '@nostrify/nostrify'; import { useQuery } from '@tanstack/react-query'; import { useMemo } from 'react'; -import { NKeys } from 'soapbox/features/nostr/keys'; +import { keyring } from 'soapbox/features/nostr/keyring'; import { useAppSelector } from 'soapbox/hooks'; import { useBunkerStore } from 'soapbox/hooks/nostr/useBunkerStore'; @@ -23,7 +23,7 @@ export function useSigner() { queryFn: async () => { if (!pubkey) return null; - const signer = NKeys.get(pubkey); + const signer = keyring.get(pubkey); if (signer) return signer; if (window.nostr && await window.nostr.getPublicKey() === pubkey) { diff --git a/src/reducers/auth.ts b/src/reducers/auth.ts index a0f66eeba..9d55a1520 100644 --- a/src/reducers/auth.ts +++ b/src/reducers/auth.ts @@ -2,7 +2,7 @@ import { AxiosError } from 'axios'; import { produce } from 'immer'; import { z } from 'zod'; -import { NKeys } from 'soapbox/features/nostr/keys'; +import { keyring } from 'soapbox/features/nostr/keyring'; import { useBunkerStore } from 'soapbox/hooks/nostr/useBunkerStore'; import { Account, accountSchema } from 'soapbox/schemas'; import { Application, applicationSchema } from 'soapbox/schemas/application'; @@ -131,7 +131,7 @@ function revokeNostr(accessToken: string): void { // Revoke the private key, if it exists. if (pubkey) { - NKeys.delete(pubkey); + keyring.delete(pubkey); } }