@aztec/p2p 0.0.1-commit.b655e406 → 0.0.1-commit.c0b82b2

package/dest/mem_pools/attestation_pool/index.d.ts

@@ -1,3 +1,2 @@
-export * from './attestation_pool.js';
-export * from './memory_attestation_pool.js';
-//# sourceMappingURL=index.d.ts.map
+export { AttestationPool, type AttestationPoolApi, type TryAddResult, createTestAttestationPool, MAX_CHECKPOINT_PROPOSALS_PER_SLOT, MAX_BLOCK_PROPOSALS_PER_POSITION, MAX_ATTESTATIONS_PER_SLOT_AND_SIGNER, } from './attestation_pool.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvYXR0ZXN0YXRpb25fcG9vbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsZUFBZSxFQUNmLEtBQUssa0JBQWtCLEVBQ3ZCLEtBQUssWUFBWSxFQUNqQix5QkFBeUIsRUFDekIsaUNBQWlDLEVBQ2pDLGdDQUFnQyxFQUNoQyxvQ0FBb0MsR0FDckMsTUFBTSx1QkFBdUIsQ0FBQyJ9

package/dest/mem_pools/attestation_pool/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,KAAK,kBAAkB,EACvB,KAAK,YAAY,EACjB,yBAAyB,EACzB,iCAAiC,EACjC,gCAAgC,EAChC,oCAAoC,GACrC,MAAM,uBAAuB,CAAC"}

package/dest/mem_pools/attestation_pool/index.js

@@ -1,2 +1 @@
-export * from './attestation_pool.js';
-export * from './memory_attestation_pool.js';
+export { AttestationPool, createTestAttestationPool, MAX_CHECKPOINT_PROPOSALS_PER_SLOT, MAX_BLOCK_PROPOSALS_PER_POSITION, MAX_ATTESTATIONS_PER_SLOT_AND_SIGNER } from './attestation_pool.js';

package/dest/mem_pools/attestation_pool/mocks.d.ts

@@ -1,18 +1,242 @@
-import type { Secp256k1Signer } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
-import { BlockAttestation } from '@aztec/stdlib/p2p';
-import { type LocalAccount } from 'viem/accounts';
+import type { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { CheckpointAttestation } from '@aztec/stdlib/p2p';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
 /** Generate Account
  *
  * Create a random signer
  * @returns A random viem signer
  */
-export declare const generateAccount: () => LocalAccount;
-/** Mock Attestation
+export declare const generateAccount: () => {
+    address: `0x${string}`;
+    nonceManager?: import("viem/accounts").NonceManager | undefined;
+    sign?: ((parameters: {
+        hash: `0x${string}`;
+    }) => Promise<`0x${string}`>) | undefined;
+    signAuthorization?: ((parameters: import("viem").AuthorizationRequest) => Promise<import("viem/accounts").SignAuthorizationReturnType>) | undefined;
+    signMessage: ({ message }: {
+        message: import("viem").SignableMessage;
+    }) => Promise<`0x${string}`>;
+    signTransaction: <serializer extends import("viem").SerializeTransactionFn<import("viem").TransactionSerializable> = import("viem").SerializeTransactionFn<import("viem").TransactionSerializable>, transaction extends Parameters<serializer>[0] = Parameters<serializer>[0]>(transaction: transaction, options?: {
+        serializer?: serializer | undefined;
+    } | undefined) => Promise<`0x${string}`>;
+    signTypedData: <const typedData extends Record<string, unknown> | {
+        [x: string]: readonly import("viem").TypedDataParameter[];
+        [x: `address[${string}]`]: undefined;
+        [x: `bool[${string}]`]: undefined;
+        [x: `bytes10[${string}]`]: undefined;
+        [x: `bytes11[${string}]`]: undefined;
+        [x: `bytes12[${string}]`]: undefined;
+        [x: `bytes13[${string}]`]: undefined;
+        [x: `bytes14[${string}]`]: undefined;
+        [x: `bytes15[${string}]`]: undefined;
+        [x: `bytes16[${string}]`]: undefined;
+        [x: `bytes17[${string}]`]: undefined;
+        [x: `bytes18[${string}]`]: undefined;
+        [x: `bytes19[${string}]`]: undefined;
+        [x: `bytes1[${string}]`]: undefined;
+        [x: `bytes20[${string}]`]: undefined;
+        [x: `bytes21[${string}]`]: undefined;
+        [x: `bytes22[${string}]`]: undefined;
+        [x: `bytes23[${string}]`]: undefined;
+        [x: `bytes24[${string}]`]: undefined;
+        [x: `bytes25[${string}]`]: undefined;
+        [x: `bytes26[${string}]`]: undefined;
+        [x: `bytes27[${string}]`]: undefined;
+        [x: `bytes28[${string}]`]: undefined;
+        [x: `bytes29[${string}]`]: undefined;
+        [x: `bytes2[${string}]`]: undefined;
+        [x: `bytes30[${string}]`]: undefined;
+        [x: `bytes31[${string}]`]: undefined;
+        [x: `bytes32[${string}]`]: undefined;
+        [x: `bytes3[${string}]`]: undefined;
+        [x: `bytes4[${string}]`]: undefined;
+        [x: `bytes5[${string}]`]: undefined;
+        [x: `bytes6[${string}]`]: undefined;
+        [x: `bytes7[${string}]`]: undefined;
+        [x: `bytes8[${string}]`]: undefined;
+        [x: `bytes9[${string}]`]: undefined;
+        [x: `bytes[${string}]`]: undefined;
+        [x: `function[${string}]`]: undefined;
+        [x: `int104[${string}]`]: undefined;
+        [x: `int112[${string}]`]: undefined;
+        [x: `int120[${string}]`]: undefined;
+        [x: `int128[${string}]`]: undefined;
+        [x: `int136[${string}]`]: undefined;
+        [x: `int144[${string}]`]: undefined;
+        [x: `int152[${string}]`]: undefined;
+        [x: `int160[${string}]`]: undefined;
+        [x: `int168[${string}]`]: undefined;
+        [x: `int16[${string}]`]: undefined;
+        [x: `int176[${string}]`]: undefined;
+        [x: `int184[${string}]`]: undefined;
+        [x: `int192[${string}]`]: undefined;
+        [x: `int200[${string}]`]: undefined;
+        [x: `int208[${string}]`]: undefined;
+        [x: `int216[${string}]`]: undefined;
+        [x: `int224[${string}]`]: undefined;
+        [x: `int232[${string}]`]: undefined;
+        [x: `int240[${string}]`]: undefined;
+        [x: `int248[${string}]`]: undefined;
+        [x: `int24[${string}]`]: undefined;
+        [x: `int256[${string}]`]: undefined;
+        [x: `int32[${string}]`]: undefined;
+        [x: `int40[${string}]`]: undefined;
+        [x: `int48[${string}]`]: undefined;
+        [x: `int56[${string}]`]: undefined;
+        [x: `int64[${string}]`]: undefined;
+        [x: `int72[${string}]`]: undefined;
+        [x: `int80[${string}]`]: undefined;
+        [x: `int88[${string}]`]: undefined;
+        [x: `int8[${string}]`]: undefined;
+        [x: `int96[${string}]`]: undefined;
+        [x: `int[${string}]`]: undefined;
+        [x: `string[${string}]`]: undefined;
+        [x: `uint104[${string}]`]: undefined;
+        [x: `uint112[${string}]`]: undefined;
+        [x: `uint120[${string}]`]: undefined;
+        [x: `uint128[${string}]`]: undefined;
+        [x: `uint136[${string}]`]: undefined;
+        [x: `uint144[${string}]`]: undefined;
+        [x: `uint152[${string}]`]: undefined;
+        [x: `uint160[${string}]`]: undefined;
+        [x: `uint168[${string}]`]: undefined;
+        [x: `uint16[${string}]`]: undefined;
+        [x: `uint176[${string}]`]: undefined;
+        [x: `uint184[${string}]`]: undefined;
+        [x: `uint192[${string}]`]: undefined;
+        [x: `uint200[${string}]`]: undefined;
+        [x: `uint208[${string}]`]: undefined;
+        [x: `uint216[${string}]`]: undefined;
+        [x: `uint224[${string}]`]: undefined;
+        [x: `uint232[${string}]`]: undefined;
+        [x: `uint240[${string}]`]: undefined;
+        [x: `uint248[${string}]`]: undefined;
+        [x: `uint24[${string}]`]: undefined;
+        [x: `uint256[${string}]`]: undefined;
+        [x: `uint32[${string}]`]: undefined;
+        [x: `uint40[${string}]`]: undefined;
+        [x: `uint48[${string}]`]: undefined;
+        [x: `uint56[${string}]`]: undefined;
+        [x: `uint64[${string}]`]: undefined;
+        [x: `uint72[${string}]`]: undefined;
+        [x: `uint80[${string}]`]: undefined;
+        [x: `uint88[${string}]`]: undefined;
+        [x: `uint8[${string}]`]: undefined;
+        [x: `uint96[${string}]`]: undefined;
+        [x: `uint[${string}]`]: undefined;
+        address?: undefined;
+        bool?: undefined;
+        bytes?: undefined;
+        bytes1?: undefined;
+        bytes10?: undefined;
+        bytes11?: undefined;
+        bytes12?: undefined;
+        bytes13?: undefined;
+        bytes14?: undefined;
+        bytes15?: undefined;
+        bytes16?: undefined;
+        bytes17?: undefined;
+        bytes18?: undefined;
+        bytes19?: undefined;
+        bytes2?: undefined;
+        bytes20?: undefined;
+        bytes21?: undefined;
+        bytes22?: undefined;
+        bytes23?: undefined;
+        bytes24?: undefined;
+        bytes25?: undefined;
+        bytes26?: undefined;
+        bytes27?: undefined;
+        bytes28?: undefined;
+        bytes29?: undefined;
+        bytes3?: undefined;
+        bytes30?: undefined;
+        bytes31?: undefined;
+        bytes32?: undefined;
+        bytes4?: undefined;
+        bytes5?: undefined;
+        bytes6?: undefined;
+        bytes7?: undefined;
+        bytes8?: undefined;
+        bytes9?: undefined;
+        int104?: undefined;
+        int112?: undefined;
+        int120?: undefined;
+        int128?: undefined;
+        int136?: undefined;
+        int144?: undefined;
+        int152?: undefined;
+        int16?: undefined;
+        int160?: undefined;
+        int168?: undefined;
+        int176?: undefined;
+        int184?: undefined;
+        int192?: undefined;
+        int200?: undefined;
+        int208?: undefined;
+        int216?: undefined;
+        int224?: undefined;
+        int232?: undefined;
+        int24?: undefined;
+        int240?: undefined;
+        int248?: undefined;
+        int256?: undefined;
+        int32?: undefined;
+        int40?: undefined;
+        int48?: undefined;
+        int56?: undefined;
+        int64?: undefined;
+        int72?: undefined;
+        int8?: undefined;
+        int80?: undefined;
+        int88?: undefined;
+        int96?: undefined;
+        string?: undefined;
+        uint104?: undefined;
+        uint112?: undefined;
+        uint120?: undefined;
+        uint128?: undefined;
+        uint136?: undefined;
+        uint144?: undefined;
+        uint152?: undefined;
+        uint16?: undefined;
+        uint160?: undefined;
+        uint168?: undefined;
+        uint176?: undefined;
+        uint184?: undefined;
+        uint192?: undefined;
+        uint200?: undefined;
+        uint208?: undefined;
+        uint216?: undefined;
+        uint224?: undefined;
+        uint232?: undefined;
+        uint24?: undefined;
+        uint240?: undefined;
+        uint248?: undefined;
+        uint256?: undefined;
+        uint32?: undefined;
+        uint40?: undefined;
+        uint48?: undefined;
+        uint56?: undefined;
+        uint64?: undefined;
+        uint72?: undefined;
+        uint8?: undefined;
+        uint80?: undefined;
+        uint88?: undefined;
+        uint96?: undefined;
+    }, primaryType extends "EIP712Domain" | keyof typedData = keyof typedData>(parameters: import("viem").TypedDataDefinition<typedData, primaryType>) => Promise<`0x${string}`>;
+    publicKey: `0x${string}`;
+    source: string;
+    type: "local";
+};
+/** Mock Checkpoint Attestation
  *
- * @param signer A viem signer to create a signature
+ * @param signer A Secp256k1Signer to create a signature
  * @param slot The slot number the attestation is for
- * @returns A Block Attestation
+ * @param archive The archive root (defaults to random)
+ * @param header The checkpoint header (defaults to random with given slot)
+ * @returns A Checkpoint Attestation
  */
-export declare const mockAttestation: (signer: Secp256k1Signer, slot?: number, archive?: Fr) => BlockAttestation;
-//# sourceMappingURL=mocks.d.ts.map
+export declare const mockCheckpointAttestation: (signer: Secp256k1Signer, slot?: number, archive?: Fr, header?: CheckpointHeader | undefined, feeAssetPriceModifier?: bigint) => CheckpointAttestation;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvYXR0ZXN0YXRpb25fcG9vbC9tb2Nrcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNqRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUNMLHFCQUFxQixFQUl0QixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBSXhEOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBRzNCLENBQUM7QUFFRjs7Ozs7OztHQU9HO0FBQ0gsZUFBTyxNQUFNLHlCQUF5Qix3SkFvQnJDLENBQUMifQ==

package/dest/mem_pools/attestation_pool/mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,KAAK,YAAY,EAA2C,MAAM,eAAe,CAAC;AAE3F;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAO,YAGlC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,eAAe,EACvB,OAAM,MAAU,EAChB,UAAS,EAAgB,KACxB,gBAYF,CAAC"}
+{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/mocks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EACL,qBAAqB,EAItB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAG3B,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,yBAAyB,wJAoBrC,CAAC"}

package/dest/mem_pools/attestation_pool/mocks.js

@@ -1,6 +1,7 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BlockAttestation, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
-import { makeL2BlockHeader } from '@aztec/stdlib/testing';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { CheckpointAttestation, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 /** Generate Account
  *
@@ -10,18 +11,21 @@ import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
     const privateKey = generatePrivateKey();
     return privateKeyToAccount(privateKey);
 };
-/** Mock Attestation
+/** Mock Checkpoint Attestation
  *
- * @param signer A viem signer to create a signature
+ * @param signer A Secp256k1Signer to create a signature
  * @param slot The slot number the attestation is for
- * @returns A Block Attestation
- */ export const mockAttestation = (signer, slot = 0, archive = Fr.random())=>{
-    // Use arbitrary numbers for all other than slot
-    const header = makeL2BlockHeader(1, 2, slot);
-    const payload = new ConsensusPayload(header.toCheckpointHeader(), archive, header.state);
-    const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
+ * @param archive The archive root (defaults to random)
+ * @param header The checkpoint header (defaults to random with given slot)
+ * @returns A Checkpoint Attestation
+ */ export const mockCheckpointAttestation = (signer, slot = 0, archive = Fr.random(), header, feeAssetPriceModifier = 0n)=>{
+    header = header ?? CheckpointHeader.random({
+        slotNumber: SlotNumber(slot)
+    });
+    const payload = new ConsensusPayload(header, archive, feeAssetPriceModifier);
+    const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.checkpointAttestation);
     const attestationSignature = signer.sign(attestationHash);
-    const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
+    const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.checkpointProposal);
     const proposerSignature = signer.sign(proposalHash);
-    return new BlockAttestation(payload, attestationSignature, proposerSignature);
+    return new CheckpointAttestation(payload, attestationSignature, proposerSignature);
 };

package/dest/mem_pools/index.d.ts

@@ -1,4 +1,5 @@
-export { type AttestationPool } from './attestation_pool/attestation_pool.js';
+export { AttestationPool, type AttestationPoolApi } from './attestation_pool/attestation_pool.js';
 export { type MemPools } from './interface.js';
 export { type TxPool } from './tx_pool/tx_pool.js';
-//# sourceMappingURL=index.d.ts.map
+export { type TxPoolV2, type TxPoolV2Config, type TxPoolV2Events, type AddTxsResult } from './tx_pool_v2/index.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tZW1fcG9vbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGVBQWUsRUFBRSxLQUFLLGtCQUFrQixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDbEcsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFL0MsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFbkQsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFFLEtBQUssY0FBYyxFQUFFLEtBQUssY0FBYyxFQUFFLEtBQUssWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUMifQ==

package/dest/mem_pools/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mem_pools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mem_pools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAClG,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,cAAc,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC"}

package/dest/mem_pools/index.js

@@ -1 +1 @@
-export { };
+export { AttestationPool } from './attestation_pool/attestation_pool.js';

package/dest/mem_pools/instrumentation.d.ts

@@ -1,4 +1,5 @@
 import type { Gossipable } from '@aztec/stdlib/p2p';
+import type { Tx } from '@aztec/stdlib/tx';
 import { type LmdbStatsCallback, type TelemetryClient } from '@aztec/telemetry-client';
 export declare enum PoolName {
     TX_POOL = "TxPool",
@@ -14,13 +15,20 @@ export declare class PoolInstrumentation<PoolObject extends Gossipable> {
     private poolStats;
     /** The number of txs in the mempool */
     private objectsInMempool;
+    private addObjectCounter;
     /** Tracks tx size */
     private objectSize;
+    /** Track delay between transaction added and evicted */
+    private minedDelay;
     private dbMetrics;
     private defaultAttributes;
     private meter;
+    private txAddedTimestamp;
     constructor(telemetry: TelemetryClient, name: PoolName, poolStats: PoolStatsCallback, dbStats?: LmdbStatsCallback);
     recordSize(poolObject: PoolObject): void;
+    incrementAddedObjects(count: number): void;
+    transactionsAdded(transactions: Tx[]): void;
+    transactionsRemoved(hashes: Iterable<bigint> | Iterable<string>): void;
     private observeStats;
 }
-//# sourceMappingURL=instrumentation.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWVtX3Bvb2xzL2luc3RydW1lbnRhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMzQyxPQUFPLEVBS0wsS0FBSyxpQkFBaUIsRUFLdEIsS0FBSyxlQUFlLEVBR3JCLE1BQU0seUJBQXlCLENBQUM7QUFFakMsb0JBQVksUUFBUTtJQUNsQixPQUFPLFdBQVc7SUFDbEIsZ0JBQWdCLG9CQUFvQjtDQUNyQztBQWtDRCxNQUFNLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxPQUFPLENBQUM7SUFDNUMsU0FBUyxFQUFFLE1BQU0sR0FBRyxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0NBQzVDLENBQUMsQ0FBQztBQUVIOztHQUVHO0FBQ0gscUJBQWEsbUJBQW1CLENBQUMsVUFBVSxTQUFTLFVBQVU7SUFtQjFELE9BQU8sQ0FBQyxTQUFTO0lBbEJuQix1Q0FBdUM7SUFDdkMsT0FBTyxDQUFDLGdCQUFnQixDQUFrQjtJQUMxQyxPQUFPLENBQUMsZ0JBQWdCLENBQWdCO0lBQ3hDLHFCQUFxQjtJQUNyQixPQUFPLENBQUMsVUFBVSxDQUFZO0lBQzlCLHdEQUF3RDtJQUN4RCxPQUFPLENBQUMsVUFBVSxDQUFZO0lBRTlCLE9BQU8sQ0FBQyxTQUFTLENBQWM7SUFFL0IsT0FBTyxDQUFDLGlCQUFpQixDQUFDO0lBQzFCLE9BQU8sQ0FBQyxLQUFLLENBQVE7SUFFckIsT0FBTyxDQUFDLGdCQUFnQixDQUFrRDtJQUUxRSxZQUNFLFNBQVMsRUFBRSxlQUFlLEVBQzFCLElBQUksRUFBRSxRQUFRLEVBQ04sU0FBUyxFQUFFLGlCQUFpQixFQUNwQyxPQUFPLENBQUMsRUFBRSxpQkFBaUIsRUF3QjVCO0lBRU0sVUFBVSxDQUFDLFVBQVUsRUFBRSxVQUFVLFFBRXZDO0lBRU0scUJBQXFCLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFekM7SUFFTSxpQkFBaUIsQ0FBQyxZQUFZLEVBQUUsRUFBRSxFQUFFLFFBSzFDO0lBRU0sbUJBQW1CLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxNQUFNLENBQUMsR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLFFBWXJFO0lBRUQsT0FBTyxDQUFDLFlBQVksQ0FZbEI7Q0FDSCJ9

package/dest/mem_pools/instrumentation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/mem_pools/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAKL,KAAK,iBAAiB,EAKtB,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;AAEjC,oBAAY,QAAQ;IAClB,OAAO,WAAW;IAClB,gBAAgB,oBAAoB;CACrC;AA4BD,MAAM,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC;IAC5C,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C,CAAC,CAAC;AAEH;;GAEG;AACH,qBAAa,mBAAmB,CAAC,UAAU,SAAS,UAAU;IAc1D,OAAO,CAAC,SAAS;IAbnB,uCAAuC;IACvC,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,qBAAqB;IACrB,OAAO,CAAC,UAAU,CAAY;IAE9B,OAAO,CAAC,SAAS,CAAc;IAE/B,OAAO,CAAC,iBAAiB,CAAC;IAC1B,OAAO,CAAC,KAAK,CAAQ;gBAGnB,SAAS,EAAE,eAAe,EAC1B,IAAI,EAAE,QAAQ,EACN,SAAS,EAAE,iBAAiB,EACpC,OAAO,CAAC,EAAE,iBAAiB;IA2BtB,UAAU,CAAC,UAAU,EAAE,UAAU;IAIxC,OAAO,CAAC,YAAY,CAYlB;CACH"}
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/mem_pools/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAKL,KAAK,iBAAiB,EAKtB,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,oBAAY,QAAQ;IAClB,OAAO,WAAW;IAClB,gBAAgB,oBAAoB;CACrC;AAkCD,MAAM,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC;IAC5C,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C,CAAC,CAAC;AAEH;;GAEG;AACH,qBAAa,mBAAmB,CAAC,UAAU,SAAS,UAAU;IAmB1D,OAAO,CAAC,SAAS;IAlBnB,uCAAuC;IACvC,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,gBAAgB,CAAgB;IACxC,qBAAqB;IACrB,OAAO,CAAC,UAAU,CAAY;IAC9B,wDAAwD;IACxD,OAAO,CAAC,UAAU,CAAY;IAE9B,OAAO,CAAC,SAAS,CAAc;IAE/B,OAAO,CAAC,iBAAiB,CAAC;IAC1B,OAAO,CAAC,KAAK,CAAQ;IAErB,OAAO,CAAC,gBAAgB,CAAkD;IAE1E,YACE,SAAS,EAAE,eAAe,EAC1B,IAAI,EAAE,QAAQ,EACN,SAAS,EAAE,iBAAiB,EACpC,OAAO,CAAC,EAAE,iBAAiB,EAwB5B;IAEM,UAAU,CAAC,UAAU,EAAE,UAAU,QAEvC;IAEM,qBAAqB,CAAC,KAAK,EAAE,MAAM,QAEzC;IAEM,iBAAiB,CAAC,YAAY,EAAE,EAAE,EAAE,QAK1C;IAEM,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,QAYrE;IAED,OAAO,CAAC,YAAY,CAYlB;CACH"}

package/dest/mem_pools/instrumentation.js

@@ -1,4 +1,4 @@
-import { Attributes, LmdbMetrics, Metrics } from '@aztec/telemetry-client';
+import { Attributes, LmdbMetrics, Metrics, createUpDownCounterWithDefault } from '@aztec/telemetry-client';
 export var PoolName = /*#__PURE__*/ function(PoolName) {
     PoolName["TX_POOL"] = "TxPool";
     PoolName["ATTESTATION_POOL"] = "AttestationPool";
@@ -12,12 +12,16 @@ export var PoolName = /*#__PURE__*/ function(PoolName) {
     if (name === "TxPool") {
         return {
             objectInMempool: Metrics.MEMPOOL_TX_COUNT,
-            objectSize: Metrics.MEMPOOL_TX_SIZE
+            objectSize: Metrics.MEMPOOL_TX_SIZE,
+            itemsAdded: Metrics.MEMPOOL_TX_ADDED_COUNT,
+            itemMinedDelay: Metrics.MEMPOOL_TX_MINED_DELAY
         };
     } else if (name === "AttestationPool") {
         return {
             objectInMempool: Metrics.MEMPOOL_ATTESTATIONS_COUNT,
-            objectSize: Metrics.MEMPOOL_ATTESTATIONS_SIZE
+            objectSize: Metrics.MEMPOOL_ATTESTATIONS_SIZE,
+            itemsAdded: Metrics.MEMPOOL_ATTESTATIONS_ADDED_COUNT,
+            itemMinedDelay: Metrics.MEMPOOL_ATTESTATIONS_MINED_DELAY
         };
     }
     throw new Error('Invalid pool type');
@@ -27,12 +31,16 @@ export var PoolName = /*#__PURE__*/ function(PoolName) {
  */ export class PoolInstrumentation {
     poolStats;
     /** The number of txs in the mempool */ objectsInMempool;
+    addObjectCounter;
     /** Tracks tx size */ objectSize;
+    /** Track delay between transaction added and evicted */ minedDelay;
     dbMetrics;
     defaultAttributes;
     meter;
+    txAddedTimestamp;
     constructor(telemetry, name, poolStats, dbStats){
         this.poolStats = poolStats;
+        this.txAddedTimestamp = new Map();
         this.observeStats = async (observer)=>{
             const { itemCount } = await this.poolStats();
             if (typeof itemCount === 'number') {
@@ -51,16 +59,13 @@ export var PoolName = /*#__PURE__*/ function(PoolName) {
             [Attributes.POOL_NAME]: name
         };
         const metricsLabels = getMetricsLabels(name);
-        this.objectsInMempool = this.meter.createObservableGauge(metricsLabels.objectInMempool, {
-            description: 'The current number of transactions in the mempool'
-        });
-        this.objectSize = this.meter.createHistogram(metricsLabels.objectSize, {
-            unit: 'By',
-            description: 'The size of transactions in the mempool'
-        });
+        this.objectsInMempool = this.meter.createObservableGauge(metricsLabels.objectInMempool);
+        this.objectSize = this.meter.createHistogram(metricsLabels.objectSize);
         this.dbMetrics = new LmdbMetrics(this.meter, {
             [Attributes.DB_DATA_TYPE]: 'tx-pool'
         }, dbStats);
+        this.addObjectCounter = createUpDownCounterWithDefault(this.meter, metricsLabels.itemsAdded);
+        this.minedDelay = this.meter.createHistogram(metricsLabels.itemMinedDelay);
         this.meter.addBatchObservableCallback(this.observeStats, [
             this.objectsInMempool
         ]);
@@ -68,5 +73,27 @@ export var PoolName = /*#__PURE__*/ function(PoolName) {
     recordSize(poolObject) {
         this.objectSize.record(poolObject.getSize());
     }
+    incrementAddedObjects(count) {
+        this.addObjectCounter.add(count);
+    }
+    transactionsAdded(transactions) {
+        const timestamp = Date.now();
+        for (const transaction of transactions){
+            this.txAddedTimestamp.set(transaction.txHash.toBigInt(), timestamp);
+        }
+    }
+    transactionsRemoved(hashes) {
+        const timestamp = Date.now();
+        for (const hash of hashes){
+            const key = BigInt(hash);
+            const addedAt = this.txAddedTimestamp.get(key);
+            if (addedAt !== undefined) {
+                this.txAddedTimestamp.delete(key);
+                if (addedAt < timestamp) {
+                    this.minedDelay.record(timestamp - addedAt);
+                }
+            }
+        }
+    }
     observeStats;
 }

package/dest/mem_pools/interface.d.ts

@@ -1,11 +1,10 @@
-import type { P2PClientType } from '@aztec/stdlib/p2p';
-import type { AttestationPool } from './attestation_pool/attestation_pool.js';
-import type { TxPool } from './tx_pool/tx_pool.js';
+import type { AttestationPoolApi } from './attestation_pool/attestation_pool.js';
+import type { TxPoolV2 } from './tx_pool_v2/interfaces.js';
 /**
  * A interface the combines all mempools
  */
-export type MemPools<T extends P2PClientType = P2PClientType.Full> = {
-    txPool: TxPool;
-    attestationPool?: T extends P2PClientType.Full ? AttestationPool : undefined;
+export type MemPools = {
+    txPool: TxPoolV2;
+    attestationPool: AttestationPoolApi;
 };
-//# sourceMappingURL=interface.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWVtX3Bvb2xzL2ludGVyZmFjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdDQUF3QyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRTNEOztHQUVHO0FBQ0gsTUFBTSxNQUFNLFFBQVEsR0FBRztJQUNyQixNQUFNLEVBQUUsUUFBUSxDQUFDO0lBQ2pCLGVBQWUsRUFBRSxrQkFBa0IsQ0FBQztDQUNyQyxDQUFDIn0=

package/dest/mem_pools/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/mem_pools/interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAAC,IAAI,IAAI;IACnE,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,CAAC,SAAS,aAAa,CAAC,IAAI,GAAG,eAAe,GAAG,SAAS,CAAC;CAC9E,CAAC"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/mem_pools/interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,QAAQ,CAAC;IACjB,eAAe,EAAE,kBAAkB,CAAC;CACrC,CAAC"}