nostr-tools 0.11.0 → 0.12.0

package/event.js

@@ -1,7 +1,6 @@
 import {Buffer} from 'buffer'
-import * as secp256k1 from '@noble/secp256k1'
-
-import {sha256} from './utils'
+import createHash from 'create-hash'
+import {signSchnorr, verifySchnorr} from 'tiny-secp256k1'
 
 export function getBlankEvent() {
   return {
@@ -25,19 +24,22 @@ export function serializeEvent(evt) {
 }
 
 export async function getEventHash(event) {
-  let eventHash = await sha256(Buffer.from(serializeEvent(event)))
+  let eventHash = createHash('sha256')
+    .update(Buffer.from(serializeEvent(event)))
+    .digest()
   return Buffer.from(eventHash).toString('hex')
 }
 
-export async function verifySignature(event) {
-  return await secp256k1.schnorr.verify(
-    event.sig,
-    await getEventHash(event),
-    event.pubkey
+export function verifySignature(event) {
+  if (event.id !== getEventHash(event)) return false
+  return verifySchnorr(
+    Buffer.from(event.sig, 'hex'),
+    Buffer.from(event.id, 'hex'),
+    Buffer.from(event.pubkey, 'hex')
   )
 }
 
-export async function signEvent(event, key) {
-  let eventHash = await getEventHash(event)
-  return await secp256k1.schnorr.sign(eventHash, key)
+export function signEvent(event, key) {
+  let eventHash = getEventHash(event)
+  return signSchnorr(Buffer.from(eventHash, 'hex'), Buffer.from(key, 'hex'))
 }

package/index.js

@@ -1,3 +1,4 @@
+import {generatePrivateKey, getPublicKey} from './keys'
 import {relayConnect} from './relay'
 import {relayPool} from './pool'
 import {
@@ -8,7 +9,6 @@ import {
   getEventHash
 } from './event'
 import {matchFilter, matchFilters} from './filter'
-import {makeRandom32, sha256, getPublicKey} from './utils'
 
 export {
   relayConnect,
@@ -17,8 +17,6 @@ export {
   verifySignature,
   serializeEvent,
   getEventHash,
-  makeRandom32,
-  sha256,
   getPublicKey,
   getBlankEvent,
   matchFilter,

package/keys.js

@@ -0,0 +1,17 @@
+import randomBytes from 'randombytes'
+import {isPrivate, pointFromScalar} from 'tiny-secp256k1'
+
+export function generatePrivateKey() {
+  let i = 8
+  while (i--) {
+    let r32 = Buffer.from(randomBytes(32))
+    if (isPrivate(r32)) return r32.toString('hex')
+  }
+  throw new Error(
+    'Valid private key was not found in 8 iterations. PRNG is broken'
+  )
+}
+
+export function getPublicKey(privateKey) {
+  return pointFromScalar(Buffer.from(privateKey, 'hex'), true).toString('hex')
+}

package/nip06.js

@@ -1,17 +1,28 @@
 import createHmac from 'create-hmac'
-import randomBytes from 'randombytes'
-import * as bip39 from 'bip39'
+import {wordlist} from 'micro-bip39/wordlists/english'
+import {
+  generateMnemonic,
+  mnemonicToSeedSync,
+  validateMnemonic
+} from 'micro-bip39'
+import BIP32Factory from 'bip32'
+import * as ecc from 'tiny-secp256k1'
+
+const bip32 = BIP32Factory(ecc)
 
 export function privateKeyFromSeed(seed) {
-  let hmac = createHmac('sha512', Buffer.from('Nostr seed', 'utf8'))
-  hmac.update(seed)
-  return hmac.digest().slice(0, 32).toString('hex')
+  let root = bip32.fromSeed(seed)
+  return root.derivePath(`m/44'/1237'/0'/0'`).privateKey.toString('hex')
 }
 
 export function seedFromWords(mnemonic) {
-  return bip39.mnemonicToSeedSync(mnemonic)
+  return mnemonicToSeedSync(mnemonic, wordlist)
 }
 
 export function generateSeedWords() {
-  return bip39.entropyToMnemonic(randomBytes(16).toString('hex'))
+  return generateMnemonic(wordlist)
+}
+
+export function validateWords(words) {
+  return validateMnemonic(words, wordlist)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nostr-tools",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",
@@ -8,12 +8,15 @@
   },
   "dependencies": {
     "@noble/secp256k1": "^1.3.0",
-    "bip39": "^3.0.4",
+    "bip32": "^3.0.1",
     "browserify-cipher": ">=1",
     "buffer": ">=5",
+    "create-hash": "^1.2.0",
     "create-hmac": ">=1",
     "dns-packet": "^5.2.4",
+    "micro-bip39": "^0.1.3",
     "randombytes": ">=2",
+    "tiny-secp256k1": "^2.1.2",
     "websocket-polyfill": "^0.0.3"
   },
   "keywords": [

package/pool.js

@@ -95,11 +95,12 @@ export function relayPool(globalPrivateKey) {
       if (index !== -1) noticeCallbacks.splice(index, 1)
     },
     async publish(event, statusCallback = (status, relayURL) => {}) {
+      event.id = await getEventHash(event)
+
       if (!event.sig) {
         event.tags = event.tags || []
 
         if (globalPrivateKey) {
-          event.id = await getEventHash(event)
           event.sig = await signEvent(event, globalPrivateKey)
         } else {
           throw new Error(

package/utils.js

@@ -1,6 +0,0 @@
-import * as secp256k1 from '@noble/secp256k1'
-
-export const makeRandom32 = () => secp256k1.utils.randomPrivateKey()
-export const sha256 = m => secp256k1.utils.sha256(Uint8Array.from(m))
-export const getPublicKey = privateKey =>
-  secp256k1.schnorr.getPublicKey(privateKey)