diff --git a/extension/background.js b/extension/background.js index bd18738..f789dea 100644 --- a/extension/background.js +++ b/extension/background.js @@ -1,5 +1,4 @@ import browser from 'webextension-polyfill' -import {Buffer} from 'buffer' import {validateEvent, signEvent, getEventHash, getPublicKey} from 'nostr-tools' import {encrypt, decrypt} from 'nostr-tools/nip04' @@ -56,7 +55,7 @@ async function handleContentScriptMessage({type, params, host}) { try { switch (type) { case 'getPublicKey': { - return Buffer.from(getPublicKey(sk)).toString('hex') + return getPublicKey(sk) } case 'getRelays': { let results = await browser.storage.local.get('relays') @@ -65,14 +64,13 @@ async function handleContentScriptMessage({type, params, host}) { case 'signEvent': { let {event} = params - if (!event.pubkey) - event.pubkey = Buffer.from(getPublicKey(sk)).toString('hex') + if (!event.pubkey) event.pubkey = getPublicKey(sk) if (!event.id) event.id = getEventHash(event) if (!validateEvent(event)) return {error: 'invalid event'} let signature = await signEvent(event, sk) - return Buffer.from(signature).toString('hex') + return signature } case 'nip04.encrypt': { let {peer, plaintext} = params diff --git a/extension/popup.jsx b/extension/popup.jsx index 54fec4f..fd1ed68 100644 --- a/extension/popup.jsx +++ b/extension/popup.jsx @@ -1,5 +1,4 @@ import browser from 'webextension-polyfill' -import {Buffer} from 'buffer' import {render} from 'react-dom' import {getPublicKey} from 'nostr-tools' import React, {useState, useEffect} from 'react' @@ -10,7 +9,7 @@ function Popup() { useEffect(() => { browser.storage.local.get('private_key').then(results => { if (results.private_key) { - setKey(Buffer.from(getPublicKey(results.private_key)).toString('hex')) + setKey(getPublicKey(results.private_key)) } else { setKey(null) } diff --git a/package.json b/package.json index c0afab9..9f758b6 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "eslint-plugin-babel": "^5.3.1", "eslint-plugin-react": "^7.28.0", "events": "^3.3.0", - "nostr-tools": "^0.21.4", + "nostr-tools": "^0.22.1", "prettier": "^2.5.1", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/yarn.lock b/yarn.lock index e0b8ffb..447862f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -41,11 +41,16 @@ resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-0.5.9.tgz#9f3051a4cc6f7c168022b3b7fbbe9fe2a35cccf0" integrity sha512-7lN1Qh6d8DUGmfN36XRsbN/WcGIPNtTGhkw26vWId/DlCIGsYJJootTtPGghTLcn/AaXPx2Q0b3cacrwXa7OVw== -"@noble/secp256k1@^1.3.0", "@noble/secp256k1@^1.3.4": +"@noble/secp256k1@^1.3.4": version "1.4.0" resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.4.0.tgz#b6b1529552c38e42908a88e39ac691598e741cf9" integrity sha512-cYpUbQ2uitPgf5QuQnpi8Nu+ZmQjSDunFKw6vvxaOSkbMUhCf4K723WLUuuK1K/sf6H/dvqKbmEAeop5i3qTJg== +"@noble/secp256k1@^1.5.2": + version "1.5.3" + resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.5.3.tgz#887fa88d72f5caa1b7300873e8d4c9eaca029cec" + integrity sha512-v11x6HReQymMELBq2fnwVthQMOPB5911fwem9515TLiNlitdOuS2qEMa1BzTcDgB563ql0238JGrpJJA1IaJ8Q== + acorn-jsx@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -1062,13 +1067,13 @@ node-gyp-build@^4.3.0: resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== -nostr-tools@^0.21.4: - version "0.21.4" - resolved "https://registry.yarnpkg.com/nostr-tools/-/nostr-tools-0.21.4.tgz#c9cb88955ee55ab751287aa4e492708221748d86" - integrity sha512-ZCYRMfryb2loOFm3WGG5dXPGCJP3OqanNur6q1moZUMKhzDOzb3d95yVBa752LF9cReTjjxyIoZm0TklEAaeAA== +nostr-tools@^0.22.1: + version "0.22.1" + resolved "https://registry.yarnpkg.com/nostr-tools/-/nostr-tools-0.22.1.tgz#ad4048d8e9b6d3d658bbe2a0753f75a84c860f2b" + integrity sha512-uGSp246JlqjiHQr2RahfOxvSJ4jGPgqKjiyb/YkEM55CriVVF1ISNmpfc7bFchIvPSFhWoWouGqXwqNpoHXdbw== dependencies: "@noble/hashes" "^0.5.7" - "@noble/secp256k1" "^1.3.0" + "@noble/secp256k1" "^1.5.2" browserify-cipher ">=1" buffer ">=5" create-hash "^1.2.0"