diff --git a/lib/fully-remote-proof.js b/lib/fully-remote-proof.js index 757b5a6f..27585132 100644 --- a/lib/fully-remote-proof.js +++ b/lib/fully-remote-proof.js @@ -22,13 +22,10 @@ class SlimSession { } } -module.exports = { verify, proof } +module.exports = { verify, proof, encode: encodeProof, decode: decodeProof } async function verify(storage, buffer, { referrer = null } = {}) { - const state = { buffer, start: 0, end: buffer.byteLength } - - const discoveryKey = c.fixed32.decode(state) - const proof = messages.wire.data.decode(state) + const { discoveryKey, proof } = decodeProof(buffer) const result = { key: null, @@ -109,29 +106,46 @@ async function verify(storage, buffer, { referrer = null } = {}) { return result } -async function proof(sender, { index, block = null, upgrade = null } = {}) { - const proof = await sender.proof({ - block: block ? { index, nodes: 0 } : null, - upgrade: upgrade ? upgrade : { start: 0, length: sender.length } - }) +function decodeProof(buffer) { + const state = { buffer, start: 0, end: buffer.byteLength } - if (block) proof.block.value = block - proof.manifest = sender.core.header.manifest + const discoveryKey = c.fixed32.decode(state) + const proof = messages.wire.data.decode(state) + + return { discoveryKey, proof } +} +function encodeProof({ discoveryKey, proof }) { const state = { buffer: null, start: 0, end: 0 } - const data = { request: 0, ...proof } - c.fixed32.preencode(state, sender.discoveryKey) - messages.wire.data.preencode(state, data) + c.fixed32.preencode(state, discoveryKey) + messages.wire.data.preencode(state, proof) state.buffer = b4a.allocUnsafe(state.end) - c.fixed32.encode(state, sender.discoveryKey) - messages.wire.data.encode(state, data) + c.fixed32.encode(state, discoveryKey) + messages.wire.data.encode(state, proof) return state.buffer } +async function proof(sender, { index, block = null, upgrade = null, encode = true } = {}) { + const proof = await sender.proof({ + block: block ? { index, nodes: 0 } : null, + upgrade: upgrade ? upgrade : { start: 0, length: sender.length } + }) + + if (block) proof.block.value = block + proof.manifest = sender.core.header.manifest + + const result = { + discoveryKey: sender.discoveryKey, + proof: { request: 0, ...proof } + } + + return encode ? encodeProof(result) : result +} + function isNull(x) { return x === null }