commit 252f2eb7169389cc3db9860b7819f4f30a388ef9
parent 4934b63c27233abba2ffe7fded0204ed722de554
Author: triesap <triesap@radroots.dev>
Date: Mon, 22 Dec 2025 20:35:22 +0000
deps: update workspace packages
- add rimraf dev dependency across packages
- add types and tooling deps for themes and geocoder
- refresh nostr utils deps and add zod
- adjust trade markers and nostr-tools types
Diffstat:
12 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/apps-lib-pwa/package.json b/apps-lib-pwa/package.json
@@ -70,6 +70,7 @@
"@sveltejs/vite-plugin-svelte": "^6.0.0",
"@types/node": "^22.5.0",
"publint": "^0.3.2",
+ "rimraf": "^6.0.1",
"svelte": "^5.0.0",
"svelte-check": "^4.0.0",
"typescript": "5.8.3",
@@ -96,4 +97,4 @@
"sveltekit-search-params": "^3.0.0",
"zod": "^4.0.5"
}
-}
-\ No newline at end of file
+}
diff --git a/apps-lib/package.json b/apps-lib/package.json
@@ -42,6 +42,7 @@
"@sveltejs/vite-plugin-svelte": "^6.0.0",
"@types/node": "^22.5.0",
"publint": "^0.3.2",
+ "rimraf": "^6.0.1",
"svelte": "^5.0.0",
"svelte-check": "^4.0.0",
"typescript": "5.8.3",
@@ -64,4 +65,4 @@
"sveltekit-search-params": "^3.0.0",
"zod": "^4.0.5"
}
-}
-\ No newline at end of file
+}
diff --git a/client/package.json b/client/package.json
@@ -88,9 +88,10 @@
},
"devDependencies": {
"@types/debug": "^4.1.12",
+ "rimraf": "^6.0.1",
"typescript": "^5.3.3"
},
"publishConfig": {
"access": "public"
}
-}
-\ No newline at end of file
+}
diff --git a/geocoder/package.json b/geocoder/package.json
@@ -24,7 +24,10 @@
"watch": "tsc -w"
},
"devDependencies": {
+ "@radroots/tsconfig": "workspace:*",
+ "@types/node": "^22.13.1",
"@types/sql.js": "^1.4.9",
+ "rimraf": "^6.0.1",
"tsup": "^6.2.3",
"typescript": "5.8.3"
},
@@ -37,4 +40,4 @@
"@radroots/types-bindings": "workspace:*",
"sql.js": "1.13.0"
}
-}
-\ No newline at end of file
+}
diff --git a/locales/package.json b/locales/package.json
@@ -26,9 +26,10 @@
"devDependencies": {
"@radroots/tsconfig": "workspace:*",
"@types/node": "^22.15.3",
+ "rimraf": "^6.0.1",
"typescript": "5.8.3"
},
"publishConfig": {
"access": "public"
}
-}
-\ No newline at end of file
+}
diff --git a/themes/package.json b/themes/package.json
@@ -34,8 +34,13 @@
},
"devDependencies": {
"@radroots/tsconfig": "workspace:*",
+ "@types/node": "^25.0.3",
+ "@types/yargs": "^17.0.35",
+ "rimraf": "^6.0.1",
"tsx": "^4.20.6",
- "typescript": "5.8.3"
+ "typescript": "5.8.3",
+ "yargs": "^18.0.0",
+ "zod": "^4.2.1"
},
"publishConfig": {
"access": "public"
@@ -44,4 +49,4 @@
"dist",
"css"
]
-}
-\ No newline at end of file
+}
diff --git a/utils-nostr/package.json b/utils-nostr/package.json
@@ -28,17 +28,20 @@
},
"devDependencies": {
"@radroots/tsconfig": "workspace:*",
+ "@types/node": "^22.13.1",
"rimraf": "^6.0.1",
"typescript": "5.8.3"
},
"dependencies": {
- "@radroots/events-bindings": "workspace:*",
- "@radroots/trade-bindings": "workspace:*",
- "@radroots/utils": "workspace:*",
"@noble/curves": "^1.6.0",
"@noble/hashes": "^1.4.0",
"@nostr-dev-kit/ndk": "2.14.33",
- "nostr-geotags": "workspace:*",
- "nostr-tools": "^2.10.4"
+ "@radroots/core-bindings": "workspace:*",
+ "@radroots/events-bindings": "workspace:*",
+ "@radroots/trade-bindings": "workspace:*",
+ "@radroots/utils": "workspace:*",
+ "nostr-geotags": "^0.7.2",
+ "nostr-tools": "^2.10.4",
+ "zod": "^4.2.1"
}
-}
-\ No newline at end of file
+}
diff --git a/utils-nostr/src/domain/trade/listing/accept/lib.ts b/utils-nostr/src/domain/trade/listing/accept/lib.ts
@@ -1,6 +1,6 @@
import { NDKEvent } from "@nostr-dev-kit/ndk";
import { RadrootsJobInput } from "@radroots/events-bindings";
-import { KIND_TRADE_LISTING_ACCEPT_REQ, KIND_TRADE_LISTING_ACCEPT_RES, MARKER_LISTING, MARKER_PREVIOUS, TradeListingAcceptRequest, TradeListingAcceptResult } from "@radroots/trade-bindings";
+import { KIND_TRADE_LISTING_ACCEPT_REQ, KIND_TRADE_LISTING_ACCEPT_RES, MARKER_LISTING, MARKER_ORDER_RESULT, TradeListingAcceptRequest, TradeListingAcceptResult } from "@radroots/trade-bindings";
import { ndk_event } from "../../../../events/lib.js";
import { NDKEventFigure } from "../../../../types/ndk.js";
import {
@@ -18,7 +18,7 @@ export const ndk_event_trade_listing_accept_request = async (
const { ndk, ndk_user, data, options } = opts;
const inputs: RadrootsJobInput[] = [
- make_event_input(data.order_result_event_id, MARKER_PREVIOUS),
+ make_event_input(data.order_result_event_id, MARKER_ORDER_RESULT),
make_event_input(data.listing_event_id, MARKER_LISTING),
];
diff --git a/utils-nostr/src/domain/trade/listing/fulfillment/lib.ts b/utils-nostr/src/domain/trade/listing/fulfillment/lib.ts
@@ -1,6 +1,6 @@
import { NDKEvent } from "@nostr-dev-kit/ndk";
import { RadrootsJobInput } from "@radroots/events-bindings";
-import { KIND_TRADE_LISTING_FULFILL_REQ, KIND_TRADE_LISTING_FULFILL_RES, MARKER_PREVIOUS, TradeListingFulfillmentRequest, TradeListingFulfillmentState } from "@radroots/trade-bindings";
+import { KIND_TRADE_LISTING_FULFILL_REQ, KIND_TRADE_LISTING_FULFILL_RES, MARKER_PAYMENT_RESULT, TradeListingFulfillmentRequest, TradeListingFulfillmentResult } from "@radroots/trade-bindings";
import { ndk_event } from "../../../../events/lib.js";
import { NDKEventFigure } from "../../../../types/ndk.js";
import {
@@ -18,7 +18,7 @@ export const ndk_event_trade_listing_fulfillment_request = async (
const { ndk, ndk_user, data, options } = opts;
const inputs: RadrootsJobInput[] = [
- make_event_input(data.payment_result_event_id, MARKER_PREVIOUS),
+ make_event_input(data.payment_result_event_id, MARKER_PAYMENT_RESULT),
];
const tags = build_request_tags(KIND_TRADE_LISTING_FULFILL_REQ, inputs, options);
@@ -35,7 +35,7 @@ export const ndk_event_trade_listing_fulfillment_request = async (
export const ndk_event_trade_listing_fulfillment_result = async (
opts: NDKEventFigure<{
request_event_id: string;
- content: TradeListingFulfillmentState | string;
+ content: TradeListingFulfillmentResult | string;
options?: CommonResultOpts;
}>
): Promise<NDKEvent | undefined> => {
@@ -58,4 +58,4 @@ export const ndk_event_trade_listing_fulfillment_result = async (
client: opts.client,
date_published: opts.date_published,
});
-};
-\ No newline at end of file
+};
diff --git a/utils-nostr/src/domain/trade/listing/order/lib.ts b/utils-nostr/src/domain/trade/listing/order/lib.ts
@@ -19,7 +19,7 @@ export const ndk_event_trade_listing_order_request = async (
const { ndk, ndk_user, data, options } = opts;
const inputs: RadrootsJobInput[] = [
- make_event_input(data.event.id, MARKER_LISTING),
+ make_event_input(data.event.id, MARKER_LISTING, data.event.relays ?? undefined),
make_text_input(data.payload, MARKER_PAYLOAD),
];
diff --git a/utils-nostr/src/events/lib.ts b/utils-nostr/src/events/lib.ts
@@ -2,7 +2,7 @@ import { schnorr } from "@noble/curves/secp256k1";
import { hexToBytes } from "@noble/hashes/utils";
import { NDKEvent, NDKTag } from "@nostr-dev-kit/ndk";
import { time_now_ms, time_now_s, uuidv4 } from "@radroots/utils";
-import { finalizeEvent, getEventHash, nip19, type NostrEvent as NostrToolsEvent } from "nostr-tools";
+import { finalizeEvent, getEventHash, nip19, type NostrEvent } from "nostr-tools";
import { ILibNostrEventSign, ILibNostrNeventEncode, NostrEventTags } from "../types/lib.js";
import { NDKEventFigure } from "../types/ndk.js";
import { tag_client } from "../utils/tags.js";
@@ -16,18 +16,18 @@ export const parse_nostr_event_basis = <T extends number>(event: NDKEvent, kind:
return { id: event.id, published_at: event.created_at, author: event.pubkey, kind: event.kind as T };
};
-export const lib_nostr_event_verify = (event: NostrToolsEvent): boolean => {
+export const lib_nostr_event_verify = (event: NostrEvent): boolean => {
const hash = getEventHash(event);
if (hash !== event.id) return false
const valid = schnorr.verify(event.sig, hash, event.pubkey);
return valid;
};
-export const lib_nostr_event_sign = (opts: ILibNostrEventSign): NostrToolsEvent => {
+export const lib_nostr_event_sign = (opts: ILibNostrEventSign): NostrEvent => {
return finalizeEvent(opts.event, hexToBytes(opts.secret_key))
};
-export const lib_nostr_event_sign_attest = (secret_key: string): NostrToolsEvent => {
+export const lib_nostr_event_sign_attest = (secret_key: string): NostrEvent => {
return lib_nostr_event_sign({
secret_key,
event: {
@@ -85,4 +85,4 @@ export const ndk_event = async (opts: NDKEventFigure<{
} catch (e) {
console.log(`(error) ndk_event `, e);
};
-};
-\ No newline at end of file
+};
diff --git a/utils-nostr/src/types/lib.ts b/utils-nostr/src/types/lib.ts
@@ -1,4 +1,4 @@
-import { type EventTemplate as NostrToolsEventTemplate } from "nostr-tools";
+import { type EventTemplate } from "nostr-tools";
import { z } from 'zod';
import { nostr_tag_client_schema } from "../schemas/lib.js";
@@ -90,5 +90,5 @@ export type ILibNostrNeventEncode = {
export type ILibNostrEventSign = {
secret_key: string;
- event: NostrToolsEventTemplate;
-};
-\ No newline at end of file
+ event: EventTemplate;
+};
