status-im
/
js-waku
mirror of https://github.com/status-im/js-waku.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove `Buffer` from `clearEncode`

This commit is contained in:
Franck Royer 2022-05-19 16:16:56 +10:00
parent 564fee29eb
commit 6929805425
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/waku_message/version_1.ts
View File

@ -36,9 +36,9 @@ export async function clearEncode(
messagePayload: Uint8Array,
sigPrivKey?: Uint8Array
): Promise<{ payload: Uint8Array; sig?: Signature }> {
let envelope = Buffer.from([0]); // No flags
envelope = Buffer.from(addPayloadSizeField(envelope, messagePayload));
envelope = Buffer.concat([envelope, Buffer.from(messagePayload)]);
let envelope = new Uint8Array([0]); // No flags
envelope = addPayloadSizeField(envelope, messagePayload);
envelope = concat([envelope, messagePayload]);
// Calculate padding:
let rawSize =
@ -52,29 +52,26 @@ export async function clearEncode(
const remainder = rawSize % PaddingTarget;
const paddingSize = PaddingTarget - remainder;
const pad = Buffer.from(randomBytes(paddingSize));
const pad = randomBytes(paddingSize);
if (!validateDataIntegrity(pad, paddingSize)) {
throw new Error("failed to generate random padding of size " + paddingSize);
}
envelope = Buffer.concat([envelope, pad]);
envelope = concat([envelope, pad]);
let sig;
if (sigPrivKey) {
envelope[0] |= IsSignedMask;
const hash = keccak256(envelope);
const [signature, recid] = await secp.sign(hash, sigPrivKey, {
const [hexSignature, recid] = await secp.sign(hash, sigPrivKey, {
recovered: true,
der: false,
});
envelope = Buffer.concat([
envelope,
hexToBytes(signature),
Buffer.from([recid]),
]);
const bytesSignature = hexToBytes(hexSignature);
envelope = concat([envelope, bytesSignature, [recid]]);
sig = {
signature: Buffer.from(signature),
signature: bytesSignature,
publicKey: getPublicKey(sigPrivKey),
};
}