From 7937fa006a833c0d78d989dd79ea2d90336411b9 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Mon, 3 Jul 2023 07:18:51 -0700
Subject: [PATCH] Upgrade nostr-tools

---
 package-lock.json  | 19 +------------------
 package.json       |  3 +--
 src/agent/index.ts |  1 -
 src/agent/keys.ts  |  4 ++--
 tsconfig.json      | 14 ++++----------
 5 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 src/agent/index.ts

diff --git a/package-lock.json b/package-lock.json
index 7aec7cde..56e232f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,6 @@
         "@capacitor/core": "^4.7.3",
         "@capacitor/ios": "^4.7.3",
         "@fortawesome/fontawesome-free": "^6.2.1",
-        "@noble/secp256k1": "^1.7.0",
         "@nostr-dev-kit/ndk": "^0.7.0",
         "@scure/base": "^1.1.1",
         "@tsconfig/svelte": "^3.0.0",
@@ -26,7 +25,7 @@
         "lokijs": "^1.5.12",
         "lru-cache": "^7.18.3",
         "marked": "^5.1.0",
-        "nostr-tools": "^1.7.4",
+        "nostr-tools": "^1.12.1",
         "npm-run-all": "^4.1.5",
         "paravel": "^0.1.15",
         "qr-scanner": "^1.4.2",
@@ -2656,17 +2655,6 @@
         }
       ]
     },
-    "node_modules/@noble/secp256k1": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz",
-      "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ]
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -12687,11 +12675,6 @@
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz",
       "integrity": "sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg=="
     },
-    "@noble/secp256k1": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz",
-      "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw=="
-    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
diff --git a/package.json b/package.json
index 6ca6ba89..3e3fc901 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,6 @@
     "@capacitor/core": "^4.7.3",
     "@capacitor/ios": "^4.7.3",
     "@fortawesome/fontawesome-free": "^6.2.1",
-    "@noble/secp256k1": "^1.7.0",
     "@nostr-dev-kit/ndk": "^0.7.0",
     "@scure/base": "^1.1.1",
     "@tsconfig/svelte": "^3.0.0",
@@ -50,7 +49,7 @@
     "lokijs": "^1.5.12",
     "lru-cache": "^7.18.3",
     "marked": "^5.1.0",
-    "nostr-tools": "^1.7.4",
+    "nostr-tools": "^1.12.1",
     "npm-run-all": "^4.1.5",
     "paravel": "^0.1.15",
     "qr-scanner": "^1.4.2",
diff --git a/src/agent/index.ts b/src/agent/index.ts
deleted file mode 100644
index 8b137891..00000000
--- a/src/agent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/agent/keys.ts b/src/agent/keys.ts
index 92e2900f..2e081fbc 100644
--- a/src/agent/keys.ts
+++ b/src/agent/keys.ts
@@ -1,4 +1,4 @@
-import {nip19, nip04, getPublicKey, getEventHash, signEvent, generatePrivateKey} from "nostr-tools"
+import {nip19, nip04, getPublicKey, getEventHash, getSignature, generatePrivateKey} from "nostr-tools"
 import NDK, {NDKEvent, NDKNip46Signer, NDKPrivateKeySigner} from "@nostr-dev-kit/ndk"
 import {get} from "svelte/store"
 import {error} from "src/util/logger"
@@ -82,7 +82,7 @@ const sign = async event => {
 
   if ($method === "privkey") {
     return Object.assign(event, {
-      sig: signEvent(event, get(privkey)),
+      sig: getSignature(event, get(privkey)),
     })
   }
 
diff --git a/tsconfig.json b/tsconfig.json
index 137e0270..3c23d564 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,16 +1,10 @@
 {
   "extends": "@tsconfig/svelte/tsconfig.json",
   "compilerOptions": {
-    "target": "esnext",
-    "useDefineForClassFields": true,
-    "allowSyntheticDefaultImports": true,
-    "module": "esnext",
-    "resolveJsonModule": true,
     "baseUrl": ".",
-    "allowJs": true,
-    "checkJs": true,
-    "isolatedModules": false,
-    "importsNotUsedAsValues": "preserve"
+    "paths": {
+      "src/*": ["src/*"]
+    }
   },
-  "include": ["src/**/*.d.ts", "src/**/*.ts", "src/**/*.js", "src/**/*.svelte"]
+  "include": ["src/**/*"]
 }