LumeWeb
/
libweb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: need to use CID.decode

This commit is contained in:
Derrick Hammer 2023-09-08 13:22:19 -04:00
parent dbbd4c16ec
commit ab1ad68fcb
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/download.ts
View File

@ -1,5 +1,5 @@
import { getActivePortals } from "#portal.js"; import { getActivePortals } from "#portal.js";
import { decodeCid, getVerifiableStream } from "@lumeweb/libportal"; import { getVerifiableStream } from "@lumeweb/libportal";
import { import {
readableStreamToUint8Array, readableStreamToUint8Array,
uint8ArrayToReadableStream, uint8ArrayToReadableStream,
@ -7,6 +7,7 @@ import {
import { equalBytes } from "@noble/curves/abstract/utils"; import { equalBytes } from "@noble/curves/abstract/utils";
import { blake3 } from "@noble/hashes/blake3"; import { blake3 } from "@noble/hashes/blake3";
import { NO_PORTALS_ERROR } from "#types.js"; import { NO_PORTALS_ERROR } from "#types.js";
import { CID } from "@lumeweb/libs5";
export async function downloadObject(cid: string): Promise<ReadableStream> { export async function downloadObject(cid: string): Promise<ReadableStream> {
const activePortals = getActivePortals(); const activePortals = getActivePortals();
@ -33,7 +34,11 @@ export async function downloadObject(cid: string): Promise<ReadableStream> {
continue; continue;
} }
return await getVerifiableStream(decodeCid(cid).hash, proof, stream); return await getVerifiableStream(
CID.decode(cid).hash.hashBytes,
proof,
stream,
);
} }
throw NO_PORTALS_ERROR; throw NO_PORTALS_ERROR;
@ -65,10 +70,9 @@ export async function downloadSmallObject(
continue; continue;
} }
const CID = decodeCid(cid);
const data = await readableStreamToUint8Array(stream); const data = await readableStreamToUint8Array(stream);
if (!equalBytes(blake3(data), CID.hash)) { if (!equalBytes(blake3(data), CID.decode(cid).hash.hashBytes)) {
throw new Error("cid verification failed"); throw new Error("cid verification failed");
} }