diff --git a/src/utils.ts b/src/utils.ts index 69778ae..34ef121 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -29,24 +29,24 @@ export async function getPayload( earlyData?: bytes, ): Promise { const signedPayload = await signPayload(localPeer, getHandshakePayload(staticPublicKey)); - const signedEarlyDataPayload = await signEarlyDataPayload(localPeer, earlyData || Buffer.alloc(0)); + const earlyDataPayload = earlyData || Buffer.alloc(0); return await createHandshakePayload( localPeer.marshalPubKey(), signedPayload, - signedEarlyDataPayload + earlyDataPayload ); } export async function createHandshakePayload( libp2pPublicKey: bytes, signedPayload: bytes, - signedEarlyData?: EarlyDataPayload, + earlyData?: bytes, ): Promise { const NoiseHandshakePayload = await loadPayloadProto(); - const earlyDataPayload = signedEarlyData ? + const earlyDataPayload = earlyData ? { - data: signedEarlyData.libp2pData, + data: earlyData, } : {}; const payloadInit = NoiseHandshakePayload.create({ @@ -63,25 +63,8 @@ export async function signPayload(peerId: PeerId, payload: bytes): Promise { - const payload = getEarlyDataPayload(earlyData); - const signedPayload = await signPayload(peerId, payload); - - return { - libp2pData: payload, - libp2pDataSignature: signedPayload, - } -} - export const getHandshakePayload = (publicKey: bytes ) => Buffer.concat([Buffer.from("noise-libp2p-static-key:"), publicKey]); -export const getEarlyDataPayload = (earlyData: bytes) => Buffer.concat([Buffer.from("noise-libp2p-early-data:"), earlyData]); - async function isValidPeerId(peerId: bytes, publicKeyProtobuf: bytes) { const generatedPeerId = await PeerId.createFromPubKey(publicKeyProtobuf); return generatedPeerId.id.equals(peerId);