From 98f7763d69dd7d35ad80e61c4e749838564f2aa1 Mon Sep 17 00:00:00 2001 From: zmeyer44 Date: Wed, 18 Oct 2023 16:29:05 -0400 Subject: [PATCH] test --- components/Modals/CreateList.tsx | 4 ++-- lib/actions/create.ts | 8 ++++++-- lib/actions/zap.ts | 1 + lib/nostr/index.ts | 15 ++++----------- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/components/Modals/CreateList.tsx b/components/Modals/CreateList.tsx index de95aca..37f8842 100644 --- a/components/Modals/CreateList.tsx +++ b/components/Modals/CreateList.tsx @@ -3,7 +3,7 @@ import FormModal from "./FormModal"; import { z } from "zod"; import { useModal } from "@/app/_providers/modal/provider"; import { toast } from "sonner"; -import { generateRandomString, randomId } from "@/lib/nostr"; +import { generateRandomStringLength } from "@/lib/nostr"; import { satsToBtc } from "@/lib/utils"; import useCurrentUser from "@/lib/hooks/useCurrentUser"; import { useNDK } from "@/app/_providers/ndk"; @@ -34,7 +34,7 @@ export default function CreateList() { const { getSigner } = useSigner()!; async function handleSubmit(data: CreateListType) { setIsLoading(true); - const random = randomId(); + const random = generateRandomStringLength(8); const tags = [ ["title", data.title], ["name", data.title], diff --git a/lib/actions/create.ts b/lib/actions/create.ts index 62e8382..d407d14 100644 --- a/lib/actions/create.ts +++ b/lib/actions/create.ts @@ -7,7 +7,11 @@ import NDK, { type NostrEvent, NDKUser, } from "@nostr-dev-kit/ndk"; -import { generateRandomString, encryptMessage, randomId } from "@/lib/nostr"; +import { + generateRandomString, + encryptMessage, + generateRandomStringLength, +} from "@/lib/nostr"; import { unixTimeNowInSeconds } from "@/lib/nostr/dates"; import { getTagsValues } from "@/lib/nostr/utils"; @@ -155,7 +159,7 @@ export async function createList( tags: [ ["name", title], ["description", description ?? ""], - ["d", randomId()], + ["d", generateRandomStringLength(8)], ], }); } diff --git a/lib/actions/zap.ts b/lib/actions/zap.ts index 212f1c4..58a00c1 100644 --- a/lib/actions/zap.ts +++ b/lib/actions/zap.ts @@ -24,6 +24,7 @@ export async function sendZap( ) { console.log("sendzap called", amount); const event = await new NDKEvent(ndk, _event); + console.log("Event", event); const pr = await event.zap(amount * 1000, comment); if (!pr) { console.log("No PR"); diff --git a/lib/nostr/index.ts b/lib/nostr/index.ts index bdcd98f..1e4887c 100644 --- a/lib/nostr/index.ts +++ b/lib/nostr/index.ts @@ -142,17 +142,10 @@ function create32ByteBuffer(inputString: string) { const buffer = Buffer.from(hash, "hex"); return buffer; } -export function randomId() { - // @ts-ignore - return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11) - .replace(/[018]/g, (c: any) => - ( - c ^ - (crypto.getRandomValues(new Uint8Array(1))[0]! & (15 >> (c / 4))) - ).toString(16), - ) - .slice(0, 8) as string; -} + export function generateRandomString() { return crypto.randomBytes(32).toString("hex"); } +export function generateRandomStringLength(length: number) { + return crypto.randomBytes(length).toString("hex"); +}