now it works.
This commit is contained in:
parent
65e6f22a00
commit
13dcdf39e3
|
@ -14,7 +14,7 @@ pool.setPrivateKey('<hex>') // optional
|
|||
pool.addRelay('ws://some.relay.com', {read: true, write: true})
|
||||
pool.addRelay('ws://other.relay.cool', {read: true, write: true})
|
||||
|
||||
pool.onEvent((context, event, relay) => {
|
||||
pool.onEvent((event, context, relay) => {
|
||||
console.log(`got a relay with context ${context} from ${relay.url} which is already validated.`, event)
|
||||
})
|
||||
|
||||
|
|
6
event.js
6
event.js
|
@ -8,7 +8,7 @@ export function serializeEvent(evt) {
|
|||
evt.pubkey,
|
||||
evt.created_at,
|
||||
evt.kind,
|
||||
evt.tags,
|
||||
evt.tags || [],
|
||||
evt.content
|
||||
])
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ export async function getEventHash(event) {
|
|||
|
||||
export async function verifySignature(event) {
|
||||
return await secp256k1.schnorr.verify(
|
||||
event.signature,
|
||||
event.sig,
|
||||
await getEventHash(event),
|
||||
event.pubkey
|
||||
)
|
||||
|
@ -28,5 +28,5 @@ export async function verifySignature(event) {
|
|||
|
||||
export async function signEvent(event, key) {
|
||||
let eventHash = await getEventHash(event)
|
||||
return await secp256k1.schnorr.sign(key, eventHash)
|
||||
return await secp256k1.schnorr.sign(eventHash, key)
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "nostr-tools",
|
||||
"version": "0.1.1",
|
||||
"version": "0.1.2",
|
||||
"description": "Tools for making a Nostr client.",
|
||||
"main": "index.js",
|
||||
"repository": {
|
||||
|
|
6
pool.js
6
pool.js
|
@ -8,10 +8,10 @@ export function relayPool(globalPrivateKey) {
|
|||
const eventCallbacks = []
|
||||
const noticeCallbacks = []
|
||||
|
||||
function propagateEvent(context, event, relayURL) {
|
||||
function propagateEvent(event, context, relayURL) {
|
||||
for (let i = 0; i < eventCallbacks.length; i++) {
|
||||
let {relay} = relays[relayURL]
|
||||
eventCallbacks[i](context, event, relay)
|
||||
eventCallbacks[i](event, context, relay)
|
||||
}
|
||||
}
|
||||
function propagateNotice(notice, relayURL) {
|
||||
|
@ -33,7 +33,7 @@ export function relayPool(globalPrivateKey) {
|
|||
if (policyFilter.write && policy.write) {
|
||||
await fn(relay)
|
||||
} else if (policyFilter.read && policy.read) {
|
||||
await fn(relays)
|
||||
await fn(relay)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
6
relay.js
6
relay.js
|
@ -38,11 +38,11 @@ export function relayConnect(url, onEvent, onNotice) {
|
|||
console.log('message from relay ' + url + ': ' + data[1])
|
||||
onNotice(data[1])
|
||||
} else if (typeof data[0] === 'object') {
|
||||
let context = data[0]
|
||||
let event = data[1]
|
||||
let event = data[0]
|
||||
let context = data[1]
|
||||
|
||||
if (await verifySignature(event)) {
|
||||
onEvent(context, event)
|
||||
onEvent(event, context)
|
||||
} else {
|
||||
console.warn(
|
||||
'got event with invalid signature from ' + url,
|
||||
|
|
Loading…
Reference in New Issue