@aztec/p2p 0.0.1-commit.7b97ef96e → 0.0.1-commit.7cbc774

package/src/util.ts

@@ -1,13 +1,13 @@
 import { SecretValue } from '@aztec/foundation/config';
-import type { Logger } from '@aztec/foundation/log';
+import { type Logger, createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncSingleton } from '@aztec/kv-store';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 
 import type { GossipSub } from '@chainsafe/libp2p-gossipsub';
 import { generateKeyPair, marshalPrivateKey, unmarshalPrivateKey } from '@libp2p/crypto/keys';
 import type { Identify } from '@libp2p/identify';
 import type { PeerId, PrivateKey } from '@libp2p/interface';
-import type { ConnectionManager } from '@libp2p/interface-internal';
+import type { AddressManager, ConnectionManager } from '@libp2p/interface-internal';
 import { createFromPrivKey } from '@libp2p/peer-id-factory';
 import { resolve } from 'dns/promises';
 import { promises as fs } from 'fs';
@@ -15,7 +15,7 @@ import type { Libp2p } from 'libp2p';
 import net from 'net';
 import path from 'path';
 
-import type { P2PConfig } from './config.js';
+import { DEFAULT_PUBLIC_IP_SERVICES, type P2PConfig } from './config.js';
 
 const PEER_ID_DATA_DIR_FILE = 'p2p-private-key';
 
@@ -31,6 +31,9 @@ export interface PubSubLibp2p extends Pick<Libp2p, 'status' | 'start' | 'stop' |
       | 'direct'
       | 'getMeshPeers'
     > & { score: Pick<GossipSub['score'], 'score'> };
+    components: {
+      addressManager: Pick<AddressManager, 'addObservedAddr' | 'confirmObservedAddr' | 'removeObservedAddr'>;
+    };
   };
 }
 
@@ -39,6 +42,7 @@ export type FullLibp2p = Libp2p<{
   pubsub: GossipSub;
   components: {
     connectionManager: ConnectionManager;
+    addressManager: AddressManager;
   };
 }>;
 
@@ -60,16 +64,25 @@ export function convertToMultiaddr(address: string, port: number, protocol: 'tcp
 }
 
 /**
- * Queries the public IP address of the machine.
+ * Queries the public IP address of the machine, trying multiple services in order.
+ * @param services - HTTPS URLs to try; defaults to {@link DEFAULT_PUBLIC_IP_SERVICES}.
  */
-export async function getPublicIp(): Promise<string> {
-  const resp = await fetch('https://checkip.amazonaws.com/');
-  const text = await resp.text();
-  const address = text.trim();
-  if (!isValidIpAddress(address)) {
-    throw new Error(`Received invalid IP address from checkip service: ${address}`);
+export async function getPublicIp(services: string[] = DEFAULT_PUBLIC_IP_SERVICES): Promise<string> {
+  const errors: string[] = [];
+  for (const url of services) {
+    try {
+      const resp = await fetch(url, { signal: AbortSignal.timeout(5000) });
+      const text = await resp.text();
+      const address = text.trim();
+      if (isValidIpAddress(address)) {
+        return address;
+      }
+      errors.push(`${url}: invalid IP "${address}"`);
+    } catch (err: any) {
+      errors.push(`${url}: ${err.message ?? err}`);
+    }
   }
-  return address;
+  throw new Error(`Failed to determine public IP from all services:\n${errors.join('\n')}`);
 }
 
 export function isValidIpAddress(address: string): boolean {
@@ -107,18 +120,20 @@ export async function configureP2PClientAddresses(
 ): Promise<P2PConfig & DataStoreConfig> {
   const config = { ..._config };
   const { p2pIp, queryForIp, p2pBroadcastPort, p2pPort } = config;
+  const logger = createLogger('p2p:config');
 
   // If no broadcast port is provided, use the given p2p port as the broadcast port
   if (!p2pBroadcastPort) {
     config.p2pBroadcastPort = p2pPort;
   }
 
-  // check if no announce IP was provided
-  if (!p2pIp) {
-    if (queryForIp) {
-      const publicIp = await getPublicIp();
-      config.p2pIp = publicIp;
-    }
+  // Resolve the initial public IP so the ENR and announce address are set at startup.
+  // If queryForIp is enabled, discv5 will also track IP changes at runtime via enrUpdate.
+  if (!p2pIp && queryForIp) {
+    config.p2pIp = await getPublicIp(config.publicIpServices);
+    logger.info('Resolved initial public IP for P2P', { ip: config.p2pIp, queryForIp });
+  } else if (p2pIp) {
+    logger.info('Using configured static P2P IP', { ip: p2pIp, queryForIp });
   }
   // TODO(md): guard against setting a local ip address as the announce ip
 

package/src/versioning.ts

@@ -1,33 +1,21 @@
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import type { ChainConfig } from '@aztec/stdlib/config';
-import {
-  type ComponentsVersions,
-  checkCompressedComponentVersion,
-  compressComponentVersions,
-  getComponentsVersionsFromConfig,
-} from '@aztec/stdlib/versioning';
+import { compressComponentVersions, getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 
 import type { SignableENR } from '@nethermindeth/enr';
-import xxhashFactory from 'xxhash-wasm';
 
 import { AZTEC_ENR_CLIENT_VERSION_KEY, AZTEC_ENR_KEY } from './types/index.js';
 
-const USE_XX_HASH = false; // Enable to reduce the size of the ENR record for production
-const XX_HASH_LEN = 8;
-const xxhash = await xxhashFactory();
-
 /** Returns the component versions based on config and this build. */
 export function getVersions(config: ChainConfig) {
   return getComponentsVersionsFromConfig(config, protocolContractsHash, getVKTreeRoot());
 }
 
 /** Sets the aztec key on the ENR record with versioning info. */
-export function setAztecEnrKey(enr: SignableENR, config: ChainConfig, useXxHash = USE_XX_HASH) {
+export function setAztecEnrKey(enr: SignableENR, config: ChainConfig) {
   const versions = getVersions(config);
-  const value = versionsToEnrValue(versions, useXxHash);
-  enr.set(AZTEC_ENR_KEY, value);
+  enr.set(AZTEC_ENR_KEY, Buffer.from(compressComponentVersions(versions)));
   return versions;
 }
 
@@ -37,21 +25,3 @@ export function setAztecClientVersionEnrKey(enr: SignableENR, clientVersion: str
     enr.set(AZTEC_ENR_CLIENT_VERSION_KEY, Buffer.from(clientVersion));
   }
 }
-
-/** Checks the given value from an ENR record against the expected versions. */
-export function checkAztecEnrVersion(enrValue: Buffer, expectedVersions: ComponentsVersions) {
-  if (enrValue.length === XX_HASH_LEN) {
-    const expected = versionsToEnrValue(expectedVersions, true);
-    if (!Buffer.from(enrValue).equals(expected)) {
-      throw new Error(`Expected ENR version ${expected.toString('hex')} but received ${enrValue.toString('hex')}`);
-    }
-  } else {
-    const actual = Buffer.from(enrValue).toString();
-    checkCompressedComponentVersion(actual, expectedVersions);
-  }
-}
-
-function versionsToEnrValue(versions: ComponentsVersions, useXxHash: boolean) {
-  const compressed = compressComponentVersions(versions);
-  return useXxHash ? toBufferBE(xxhash.h64(compressed), XX_HASH_LEN) : Buffer.from(compressed);
-}

package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdHhfY29sbGVjdG9yX3dvcmtlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2NsaWVudC90ZXN0L3R4X3Byb3Bvc2FsX2NvbGxlY3Rvci9wcm9wb3NhbF90eF9jb2xsZWN0b3Jfd29ya2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==

package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"proposal_tx_collector_worker.d.ts","sourceRoot":"","sources":["../../../../src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts"],"names":[],"mappings":""}

package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js

@@ -1,305 +0,0 @@
-import { MockL2BlockSource } from '@aztec/archiver/test';
-import { SecretValue } from '@aztec/foundation/config';
-import { createLogger } from '@aztec/foundation/log';
-import { sleep } from '@aztec/foundation/sleep';
-import { DateProvider, Timer, executeTimeout } from '@aztec/foundation/timer';
-import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
-import { P2PClientType } from '@aztec/stdlib/p2p';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import { peerIdFromString } from '@libp2p/peer-id';
-import { BatchTxRequesterCollector, SendBatchRequestCollector } from '../../../services/index.js';
-import { RateLimitStatus } from '../../../services/reqresp/rate-limiter/rate_limiter.js';
-import { MissingTxsTracker } from '../../../services/tx_collection/missing_txs_tracker.js';
-import { AlwaysTrueCircuitVerifier, BENCHMARK_CONSTANTS, InMemoryAttestationPool, InMemoryTxPool, UNLIMITED_RATE_LIMIT_QUOTA, calculateInternalTimeout, createMockEpochCache, createMockWorldStateSynchronizer } from '../../../test-helpers/index.js';
-import { createP2PClient } from '../../index.js';
-import { deserializeBlockProposal, deserializeTx, deserializeTxHash } from './proposal_tx_collector_worker_protocol.js';
-let client;
-let txPool;
-let attestationPool;
-let logger = createLogger('p2p:proposal-bench');
-let kvStore;
-let ipcDisconnected = false;
-function ensureClient() {
-    if (!client || !txPool) {
-        throw new Error('Worker client not started');
-    }
-    return client;
-}
-function isIpcDisconnectError(err) {
-    const code = err?.code;
-    return code === 'EPIPE' || code === 'ERR_IPC_CHANNEL_CLOSED';
-}
-function sendMessage(message) {
-    const send = process.send;
-    if (!send || !process.connected || ipcDisconnected) {
-        return Promise.resolve();
-    }
-    return new Promise((resolve)=>{
-        const fallbackTimeout = setTimeout(()=>resolve(), 2000);
-        try {
-            send.call(process, message, undefined, undefined, (err)=>{
-                clearTimeout(fallbackTimeout);
-                if (!err) {
-                    resolve();
-                    return;
-                }
-                if (isIpcDisconnectError(err)) {
-                    ipcDisconnected = true;
-                    resolve();
-                    return;
-                }
-                logger.warn('Failed to send IPC message', {
-                    error: err?.message ?? String(err)
-                });
-                resolve();
-            });
-        } catch (err) {
-            clearTimeout(fallbackTimeout);
-            if (isIpcDisconnectError(err)) {
-                ipcDisconnected = true;
-                resolve();
-                return;
-            }
-            logger.warn('Failed to send IPC message', {
-                error: err?.message ?? String(err)
-            });
-            resolve();
-        }
-    });
-}
-async function startClient(config, clientIndex) {
-    txPool = new InMemoryTxPool();
-    attestationPool = new InMemoryAttestationPool();
-    const epochCache = createMockEpochCache();
-    const worldState = createMockWorldStateSynchronizer();
-    const l2BlockSource = new MockL2BlockSource();
-    const proofVerifier = new AlwaysTrueCircuitVerifier();
-    kvStore = await openTmpStore(`proposal-bench-${clientIndex}`, true, BENCHMARK_CONSTANTS.KV_STORE_MAP_SIZE_KB);
-    logger = createLogger(`p2p:proposal-bench:${clientIndex}`);
-    const telemetry = getTelemetryClient();
-    const deps = {
-        txPool,
-        attestationPool,
-        store: kvStore,
-        logger
-    };
-    client = await createP2PClient(P2PClientType.Full, config, l2BlockSource, proofVerifier, worldState, epochCache, 'proposal-tx-collector-bench-worker', new DateProvider(), telemetry, deps);
-    await client.start();
-    installUnlimitedRateLimits();
-    for(let i = 0; i < 120; i++){
-        if (client.isReady()) {
-            return;
-        }
-        await sleep(500);
-    }
-    throw new Error('Timed out waiting for P2P client readiness');
-}
-function installSamplerOverrides(peerList) {
-    const reqResp = ensureClient().p2pService.reqresp;
-    const sampler = reqResp.connectionSampler;
-    sampler.getPeerListSortedByConnectionCountAsc = (excluding)=>{
-        if (!excluding || excluding.size === 0) {
-            return peerList;
-        }
-        return peerList.filter((peerId)=>!excluding.has(peerId.toString()));
-    };
-    sampler.samplePeersBatch = (numberToSample, excluding)=>{
-        const filtered = peerList.filter((peerId)=>!excluding?.has(peerId.toString()));
-        return filtered.slice(0, Math.min(numberToSample, filtered.length));
-    };
-    sampler.getPeer = (excluding)=>{
-        const filtered = peerList.filter((peerId)=>!excluding?.has(peerId.toString()));
-        return filtered[0];
-    };
-}
-function installUnlimitedRateLimits() {
-    const reqResp = ensureClient().p2pService.reqresp;
-    const rateLimiter = reqResp.rateLimiter;
-    rateLimiter.getRateLimits = ()=>UNLIMITED_RATE_LIMIT_QUOTA;
-    rateLimiter.allow = ()=>RateLimitStatus.Allowed;
-}
-async function runCollector(cmd) {
-    const { collectorType, txHashes, blockProposal, pinnedPeerId, peerIds, timeoutMs } = cmd;
-    const reqResp = ensureClient().p2pService.reqresp;
-    const peerList = peerIds.map((peerId)=>peerIdFromString(peerId));
-    installSamplerOverrides(peerList);
-    installUnlimitedRateLimits();
-    const p2pService = {
-        reqResp,
-        connectionSampler: {
-            getPeerListSortedByConnectionCountAsc: ()=>peerList
-        },
-        txValidatorConfig: {
-            l1ChainId: 1,
-            rollupVersion: 1,
-            proofVerifier: {
-                verifyProof: ()=>Promise.resolve({
-                        valid: true,
-                        durationMs: 0,
-                        totalDurationMs: 0
-                    }),
-                stop: ()=>Promise.resolve()
-            }
-        },
-        peerScoring: {
-            penalizePeer: (_peerId, _penalty)=>{}
-        }
-    };
-    const parsedTxHashes = txHashes.map(deserializeTxHash);
-    const parsedProposal = deserializeBlockProposal(blockProposal);
-    const pinnedPeer = pinnedPeerId ? peerIdFromString(pinnedPeerId) : undefined;
-    const timer = new Timer();
-    let fetchedCount = 0;
-    const internalTimeoutMs = calculateInternalTimeout(timeoutMs);
-    const noopTxValidator = {
-        validateRequestedTx: (_tx)=>Promise.resolve({
-                result: 'valid'
-            }),
-        validateRequestedTxs: (txs)=>Promise.resolve(txs.map(()=>({
-                    result: 'valid'
-                })))
-    };
-    try {
-        if (collectorType === 'batch-requester') {
-            const collector = new BatchTxRequesterCollector(p2pService, logger, new DateProvider(), noopTxValidator);
-            const fetched = await executeTimeout((_signal)=>collector.collectTxs(MissingTxsTracker.fromArray(parsedTxHashes), parsedProposal, pinnedPeer, internalTimeoutMs), timeoutMs, ()=>new Error(`Collector timed out after ${timeoutMs}ms`));
-            fetchedCount = fetched.length;
-        } else {
-            const collector = new SendBatchRequestCollector(p2pService, BENCHMARK_CONSTANTS.FIXED_MAX_PEERS, BENCHMARK_CONSTANTS.FIXED_MAX_RETRY_ATTEMPTS);
-            const fetched = await executeTimeout((_signal)=>collector.collectTxs(MissingTxsTracker.fromArray(parsedTxHashes), parsedProposal, pinnedPeer, internalTimeoutMs), timeoutMs, ()=>new Error(`Collector timed out after ${timeoutMs}ms`));
-            fetchedCount = fetched.length;
-        }
-    } catch (err) {
-        logger.warn(`Collector error: ${err?.message ?? String(err)}`);
-    }
-    return {
-        durationMs: timer.ms(),
-        fetchedCount
-    };
-}
-async function stopClient() {
-    if (!client) {
-        return;
-    }
-    await client.stop();
-    if (kvStore?.close) {
-        await kvStore.close();
-    }
-    client = undefined;
-    txPool = undefined;
-    attestationPool = undefined;
-}
-process.on('disconnect', ()=>{
-    ipcDisconnected = true;
-    void stopClient().finally(()=>process.exit(0));
-});
-process.on('error', (err)=>{
-    if (isIpcDisconnectError(err)) {
-        ipcDisconnected = true;
-        return;
-    }
-    logger.warn('Worker process error', {
-        error: err?.message ?? String(err)
-    });
-});
-process.on('message', (msg)=>{
-    void (async ()=>{
-        if (!msg || typeof msg !== 'object') {
-            return;
-        }
-        const requestId = msg.requestId;
-        try {
-            switch(msg.type){
-                case 'START':
-                    {
-                        const rawConfig = msg.config;
-                        const config = {
-                            ...rawConfig,
-                            peerIdPrivateKey: rawConfig.peerIdPrivateKey ? new SecretValue(rawConfig.peerIdPrivateKey) : undefined
-                        };
-                        await startClient(config, msg.clientIndex);
-                        const peerId = ensureClient().p2pService.node.peerId.toString();
-                        await sendMessage({
-                            type: 'READY',
-                            requestId,
-                            peerId
-                        });
-                        break;
-                    }
-                case 'SET_TXS':
-                    {
-                        if (!txPool) {
-                            throw new Error('Tx pool not initialized');
-                        }
-                        const txs = msg.txs.map(deserializeTx);
-                        const count = msg.mode === 'append' ? txPool.appendTxs(txs) : txPool.setTxs(txs);
-                        await sendMessage({
-                            type: 'TXS_SET',
-                            requestId,
-                            count
-                        });
-                        break;
-                    }
-                case 'SET_BLOCK_PROPOSAL':
-                    {
-                        if (!attestationPool) {
-                            throw new Error('Attestation pool not initialized');
-                        }
-                        const proposal = deserializeBlockProposal(msg.blockProposal);
-                        await attestationPool.tryAddBlockProposal(proposal);
-                        await sendMessage({
-                            type: 'BLOCK_PROPOSAL_SET',
-                            requestId,
-                            archiveRoot: proposal.archive.toString()
-                        });
-                        break;
-                    }
-                case 'RUN_COLLECTOR':
-                    {
-                        const { durationMs, fetchedCount } = await runCollector(msg);
-                        await sendMessage({
-                            type: 'COLLECTOR_RESULT',
-                            requestId,
-                            durationMs,
-                            fetchedCount
-                        });
-                        break;
-                    }
-                case 'GET_PEER_COUNT':
-                    {
-                        const peers = await ensureClient().getPeers();
-                        await sendMessage({
-                            type: 'PEER_COUNT',
-                            requestId,
-                            count: peers.length
-                        });
-                        break;
-                    }
-                case 'STOP':
-                    {
-                        await stopClient();
-                        await sendMessage({
-                            type: 'STOPPED',
-                            requestId
-                        });
-                        process.exit(0);
-                        break;
-                    }
-                default:
-                    {
-                        const _exhaustive = msg;
-                        throw new Error(`Unknown command: ${msg.type}`);
-                    }
-            }
-        } catch (err) {
-            await sendMessage({
-                type: 'ERROR',
-                requestId,
-                error: err?.message ?? String(err)
-            });
-            if (msg.type === 'START') {
-                process.exit(1);
-            }
-        }
-    })();
-});

package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts

@@ -1,73 +0,0 @@
-import { BlockProposal } from '@aztec/stdlib/p2p';
-import { Tx, TxHash } from '@aztec/stdlib/tx';
-import type { P2PConfig } from '../../../config.js';
-export type SerializedP2PConfig = Omit<P2PConfig, 'peerIdPrivateKey'> & {
-    peerIdPrivateKey?: string;
-};
-export type CollectorType = 'batch-requester' | 'send-batch-request';
-export type WorkerCommand = {
-    type: 'START';
-    requestId: string;
-    clientIndex: number;
-    config: SerializedP2PConfig;
-} | {
-    type: 'SET_TXS';
-    requestId: string;
-    txs: string[];
-    mode?: 'replace' | 'append';
-} | {
-    type: 'SET_BLOCK_PROPOSAL';
-    requestId: string;
-    blockProposal: string;
-} | {
-    type: 'RUN_COLLECTOR';
-    requestId: string;
-    collectorType: CollectorType;
-    txHashes: string[];
-    blockProposal: string;
-    pinnedPeerId?: string;
-    peerIds: string[];
-    timeoutMs: number;
-} | {
-    type: 'GET_PEER_COUNT';
-    requestId: string;
-} | {
-    type: 'STOP';
-    requestId: string;
-};
-export type WorkerResponse = {
-    type: 'READY';
-    requestId: string;
-    peerId: string;
-} | {
-    type: 'TXS_SET';
-    requestId: string;
-    count: number;
-} | {
-    type: 'BLOCK_PROPOSAL_SET';
-    requestId: string;
-    archiveRoot: string;
-} | {
-    type: 'COLLECTOR_RESULT';
-    requestId: string;
-    durationMs: number;
-    fetchedCount: number;
-} | {
-    type: 'PEER_COUNT';
-    requestId: string;
-    count: number;
-} | {
-    type: 'STOPPED';
-    requestId: string;
-} | {
-    type: 'ERROR';
-    requestId: string;
-    error: string;
-};
-export declare const serializeTx: (tx: Tx) => string;
-export declare const deserializeTx: (hex: string) => Tx;
-export declare const serializeTxHash: (txHash: TxHash) => `0x${string}`;
-export declare const deserializeTxHash: (hex: string) => TxHash;
-export declare const serializeBlockProposal: (proposal: BlockProposal) => string;
-export declare const deserializeBlockProposal: (hex: string) => BlockProposal;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdHhfY29sbGVjdG9yX3dvcmtlcl9wcm90b2NvbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2NsaWVudC90ZXN0L3R4X3Byb3Bvc2FsX2NvbGxlY3Rvci9wcm9wb3NhbF90eF9jb2xsZWN0b3Jfd29ya2VyX3Byb3RvY29sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELE1BQU0sTUFBTSxtQkFBbUIsR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLGtCQUFrQixDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLENBQUM7QUFFdEcsTUFBTSxNQUFNLGFBQWEsR0FBRyxpQkFBaUIsR0FBRyxvQkFBb0IsQ0FBQztBQUVyRSxNQUFNLE1BQU0sYUFBYSxHQUNyQjtJQUFFLElBQUksRUFBRSxPQUFPLENBQUM7SUFBQyxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUFDLE1BQU0sRUFBRSxtQkFBbUIsQ0FBQTtDQUFFLEdBQ3RGO0lBQUUsSUFBSSxFQUFFLFNBQVMsQ0FBQztJQUFDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxTQUFTLEdBQUcsUUFBUSxDQUFBO0NBQUUsR0FDbEY7SUFBRSxJQUFJLEVBQUUsb0JBQW9CLENBQUM7SUFBQyxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQ3hFO0lBQ0UsSUFBSSxFQUFFLGVBQWUsQ0FBQztJQUN0QixTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLGFBQWEsRUFBRSxhQUFhLENBQUM7SUFDN0IsUUFBUSxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ25CLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLE9BQU8sRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNsQixTQUFTLEVBQUUsTUFBTSxDQUFDO0NBQ25CLEdBQ0Q7SUFBRSxJQUFJLEVBQUUsZ0JBQWdCLENBQUM7SUFBQyxTQUFTLEVBQUUsTUFBTSxDQUFBO0NBQUUsR0FDN0M7SUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQTtDQUFFLENBQUM7QUFFeEMsTUFBTSxNQUFNLGNBQWMsR0FDdEI7SUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDO0lBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUFDLE1BQU0sRUFBRSxNQUFNLENBQUE7Q0FBRSxHQUNwRDtJQUFFLElBQUksRUFBRSxTQUFTLENBQUM7SUFBQyxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQ3JEO0lBQUUsSUFBSSxFQUFFLG9CQUFvQixDQUFDO0lBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUFDLFdBQVcsRUFBRSxNQUFNLENBQUE7Q0FBRSxHQUN0RTtJQUFFLElBQUksRUFBRSxrQkFBa0IsQ0FBQztJQUFDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFBQyxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQ3pGO0lBQUUsSUFBSSxFQUFFLFlBQVksQ0FBQztJQUFDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFBQyxLQUFLLEVBQUUsTUFBTSxDQUFBO0NBQUUsR0FDeEQ7SUFBRSxJQUFJLEVBQUUsU0FBUyxDQUFDO0lBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQ3RDO0lBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQztJQUFDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFBQyxLQUFLLEVBQUUsTUFBTSxDQUFBO0NBQUUsQ0FBQztBQUV4RCxlQUFPLE1BQU0sV0FBVyxvQkFBNEMsQ0FBQztBQUNyRSxlQUFPLE1BQU0sYUFBYSxxQkFBMEQsQ0FBQztBQUVyRixlQUFPLE1BQU0sZUFBZSxtQ0FBd0MsQ0FBQztBQUNyRSxlQUFPLE1BQU0saUJBQWlCLHlCQUEwQyxDQUFDO0FBRXpFLGVBQU8sTUFBTSxzQkFBc0IscUNBQW1FLENBQUM7QUFDdkcsZUFBTyxNQUFNLHdCQUF3QixnQ0FBcUUsQ0FBQyJ9

package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"proposal_tx_collector_worker_protocol.d.ts","sourceRoot":"","sources":["../../../../src/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtG,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,oBAAoB,CAAC;AAErE,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAA;CAAE,GACtF;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAE,GAClF;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GACxE;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,CAAC;IAC7B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,GACD;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACpD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACtE;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACzF;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACxD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACtC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD,eAAO,MAAM,WAAW,oBAA4C,CAAC;AACrE,eAAO,MAAM,aAAa,qBAA0D,CAAC;AAErF,eAAO,MAAM,eAAe,mCAAwC,CAAC;AACrE,eAAO,MAAM,iBAAiB,yBAA0C,CAAC;AAEzE,eAAO,MAAM,sBAAsB,qCAAmE,CAAC;AACvG,eAAO,MAAM,wBAAwB,gCAAqE,CAAC"}

package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.js

@@ -1,8 +0,0 @@
-import { BlockProposal } from '@aztec/stdlib/p2p';
-import { Tx, TxHash } from '@aztec/stdlib/tx';
-export const serializeTx = (tx)=>tx.toBuffer().toString('hex');
-export const deserializeTx = (hex)=>Tx.fromBuffer(Buffer.from(hex, 'hex'));
-export const serializeTxHash = (txHash)=>txHash.toString();
-export const deserializeTxHash = (hex)=>TxHash.fromString(hex);
-export const serializeBlockProposal = (proposal)=>proposal.toBuffer().toString('hex');
-export const deserializeBlockProposal = (hex)=>BlockProposal.fromBuffer(Buffer.from(hex, 'hex'));