@aztec/p2p 0.69.0 → 0.69.1-devnet
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/client/p2p_client.d.ts +6 -0
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +13 -3
- package/dest/mem_pools/attestation_pool/mocks.js +2 -2
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +65 -49
- package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/memory_tx_pool.js +6 -2
- package/dest/mem_pools/tx_pool/priority.d.ts +8 -0
- package/dest/mem_pools/tx_pool/priority.d.ts.map +1 -0
- package/dest/mem_pools/tx_pool/priority.js +12 -0
- package/dest/mem_pools/tx_pool/tx_pool.d.ts +1 -1
- package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +19 -3
- package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +2 -3
- package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +16 -17
- package/dest/msg_validators/tx_validator/block_header_validator.d.ts +11 -0
- package/dest/msg_validators/tx_validator/block_header_validator.d.ts.map +1 -0
- package/dest/msg_validators/tx_validator/block_header_validator.js +21 -0
- package/dest/msg_validators/tx_validator/data_validator.d.ts +2 -3
- package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/data_validator.js +5 -17
- package/dest/msg_validators/tx_validator/double_spend_validator.d.ts +4 -6
- package/dest/msg_validators/tx_validator/double_spend_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/double_spend_validator.js +16 -45
- package/dest/msg_validators/tx_validator/index.d.ts +1 -0
- package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/index.js +2 -1
- package/dest/msg_validators/tx_validator/metadata_validator.d.ts +2 -3
- package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/metadata_validator.js +9 -18
- package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts +2 -3
- package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/tx_proof_validator.js +8 -17
- package/dest/services/libp2p/libp2p_service.d.ts +1 -2
- package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
- package/dest/services/libp2p/libp2p_service.js +12 -11
- package/package.json +7 -7
- package/src/client/p2p_client.ts +20 -3
- package/src/mem_pools/attestation_pool/mocks.ts +2 -2
- package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +68 -46
- package/src/mem_pools/tx_pool/memory_tx_pool.ts +5 -1
- package/src/mem_pools/tx_pool/priority.ts +13 -0
- package/src/mem_pools/tx_pool/tx_pool.ts +1 -1
- package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +27 -5
- package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +16 -20
- package/src/msg_validators/tx_validator/block_header_validator.ts +25 -0
- package/src/msg_validators/tx_validator/data_validator.ts +7 -22
- package/src/msg_validators/tx_validator/double_spend_validator.ts +9 -45
- package/src/msg_validators/tx_validator/index.ts +1 -0
- package/src/msg_validators/tx_validator/metadata_validator.ts +9 -22
- package/src/msg_validators/tx_validator/tx_proof_validator.ts +12 -18
- package/src/services/libp2p/libp2p_service.ts +14 -11
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { __esDecorate, __runInitializers } from "tslib";
|
|
2
|
-
import { BlockAttestation, BlockProposal, EpochProofQuote, MerkleTreeId, PeerErrorSeverity, TopicTypeMap, Tx, TxHash, getTopicTypeForClientType, metricsTopicStrToLabels, } from '@aztec/circuit-types';
|
|
3
|
-
import { P2PClientType } from '@aztec/circuit-types';
|
|
2
|
+
import { BlockAttestation, BlockProposal, EpochProofQuote, MerkleTreeId, P2PClientType, PeerErrorSeverity, TopicTypeMap, Tx, TxHash, getTopicTypeForClientType, metricsTopicStrToLabels, } from '@aztec/circuit-types';
|
|
4
3
|
import { Fr } from '@aztec/circuits.js';
|
|
5
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
5
|
import { SerialQueue } from '@aztec/foundation/queue';
|
|
@@ -406,7 +405,7 @@ let LibP2PService = (() => {
|
|
|
406
405
|
this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
|
|
407
406
|
return false;
|
|
408
407
|
}
|
|
409
|
-
if (
|
|
408
|
+
if (validProof.result === 'invalid') {
|
|
410
409
|
// If the proof is invalid, but the txHash is correct, then this is an active attack and we severly punish
|
|
411
410
|
this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
|
|
412
411
|
return false;
|
|
@@ -516,9 +515,10 @@ let LibP2PService = (() => {
|
|
|
516
515
|
},
|
|
517
516
|
doubleSpendValidator: {
|
|
518
517
|
validator: new DoubleSpendTxValidator({
|
|
519
|
-
|
|
518
|
+
nullifiersExist: async (nullifiers) => {
|
|
520
519
|
const merkleTree = this.worldStateSynchronizer.getCommitted();
|
|
521
|
-
|
|
520
|
+
const indices = await merkleTree.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, nullifiers);
|
|
521
|
+
return indices.map(index => index !== undefined);
|
|
522
522
|
},
|
|
523
523
|
}),
|
|
524
524
|
severity: PeerErrorSeverity.HighToleranceError,
|
|
@@ -533,8 +533,8 @@ let LibP2PService = (() => {
|
|
|
533
533
|
*/
|
|
534
534
|
async runValidations(tx, messageValidators) {
|
|
535
535
|
const validationPromises = Object.entries(messageValidators).map(async ([name, { validator, severity }]) => {
|
|
536
|
-
const
|
|
537
|
-
return { name, isValid, severity };
|
|
536
|
+
const { result } = await validator.validateTx(tx);
|
|
537
|
+
return { name, isValid: result === 'valid', severity };
|
|
538
538
|
});
|
|
539
539
|
// A promise that resolves when all validations have been run
|
|
540
540
|
const allValidations = Promise.all(validationPromises);
|
|
@@ -567,13 +567,14 @@ let LibP2PService = (() => {
|
|
|
567
567
|
return false;
|
|
568
568
|
}
|
|
569
569
|
const snapshotValidator = new DoubleSpendTxValidator({
|
|
570
|
-
|
|
570
|
+
nullifiersExist: async (nullifiers) => {
|
|
571
571
|
const merkleTree = this.worldStateSynchronizer.getSnapshot(blockNumber - this.config.severePeerPenaltyBlockLength);
|
|
572
|
-
|
|
572
|
+
const indices = await merkleTree.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, nullifiers);
|
|
573
|
+
return indices.map(index => index !== undefined);
|
|
573
574
|
},
|
|
574
575
|
});
|
|
575
576
|
const validSnapshot = await snapshotValidator.validateTx(tx);
|
|
576
|
-
if (
|
|
577
|
+
if (validSnapshot.result !== 'valid') {
|
|
577
578
|
this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
|
|
578
579
|
return false;
|
|
579
580
|
}
|
|
@@ -694,4 +695,4 @@ let LibP2PService = (() => {
|
|
|
694
695
|
_a;
|
|
695
696
|
})();
|
|
696
697
|
export { LibP2PService };
|
|
697
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"libp2p_service.js","sourceRoot":"","sources":["../../../src/services/libp2p/libp2p_service.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,gBAAgB,EAChB,aAAa,EAEb,eAAe,EAGf,YAAY,EACZ,iBAAiB,EAGjB,YAAY,EACZ,EAAE,EACF,MAAM,EAEN,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAwB,UAAU,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGtH,OAAO,EAIL,SAAS,GACV,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAClG,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAA6B,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,EAAE,wBAAwB,EAAE,MAAM,2DAA2D,CAAC;AACrG,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC7F,OAAO,EACL,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAqB,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EACL,6BAA6B,EAC7B,+BAA+B,EAC/B,aAAa,EAGb,eAAe,EAEf,eAAe,GAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAiB7C;;GAEG;IACU,aAAa;;sBAAkC,UAAU;;;;;;;;;;sBAAzD,aAAuC,SAAQ,WAAU;YAoBpE,YACU,UAAa,EACb,MAAiB,EACjB,IAAkB,EAClB,oBAA0C,EAC1C,QAAqB,EACrB,aAA4B,EAC5B,UAAsB,EACtB,aAA4C,EAC5C,sBAA8C,EAC9C,SAA0B,EAC1B,0BAAsD,6BAA6B,EACnF,SAAS,YAAY,CAAC,oBAAoB,CAAC;gBAEnD,KAAK,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;gBAb1B,eAAU,IArBT,mDAAa,EAqBd,UAAU,EAAG;gBACb,WAAM,GAAN,MAAM,CAAW;gBACjB,SAAI,GAAJ,IAAI,CAAc;gBAClB,yBAAoB,GAApB,oBAAoB,CAAsB;gBAC1C,aAAQ,GAAR,QAAQ,CAAa;gBACrB,kBAAa,GAAb,aAAa,CAAe;gBAC5B,eAAU,GAAV,UAAU,CAAY;gBACtB,kBAAa,GAAb,aAAa,CAA+B;gBAC5C,2BAAsB,GAAtB,sBAAsB,CAAwB;gBAC9C,cAAS,GAAT,SAAS,CAAiB;gBAC1B,4BAAuB,GAAvB,uBAAuB,CAA4D;gBACnF,WAAM,GAAN,MAAM,CAAqC;gBA/B7C,aAAQ,GAAgB,IAAI,WAAW,EAAE,CAAC;gBAmChD,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,EAAE,oBAAoB,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;gBAC1F,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,GAAG,CAAC,MAAc,EAAE,EAAE;oBAC3E,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;gBAC/C,CAAC,CAAC;gBACF,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,GAAG,EAAE,CAAC;gBAC9D,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;gBAE3D,IAAI,CAAC,oBAAoB,GAAG,IAAI,oBAAoB,CAAC,UAAU,CAAC,CAAC;gBACjE,IAAI,CAAC,sBAAsB,GAAG,IAAI,sBAAsB,CAAC,UAAU,CAAC,CAAC;gBACrE,IAAI,CAAC,wBAAwB,GAAG,IAAI,wBAAwB,CAAC,UAAU,CAAC,CAAC;gBAEzE,IAAI,CAAC,qBAAqB,GAAG,CAAC,KAAoB,EAAyC,EAAE;oBAC3F,IAAI,CAAC,MAAM,CAAC,OAAO,CACjB,yFAAyF,KAAK,CAAC,oBAAoB,EAAE,aAAa,CACnI,CAAC;oBACF,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACpC,CAAC,CAAC;YACJ,CAAC;YAED;;;eAGG;YACI,KAAK,CAAC,KAAK;gBAChB,sCAAsC;gBACtC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBACnC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACjD,CAAC;gBAED,8CAA8C;gBAC9C,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;gBAC7D,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;gBACpD,CAAC;gBACD,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;gBAE3E,0DAA0D;gBAC1D,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACtB,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;gBACxC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gBAExB,oDAAoD;gBACpD,KAAK,MAAM,KAAK,IAAI,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC/D,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACtD,CAAC;gBAED,2BAA2B;gBAC3B,uFAAuF;gBACvF,2BAA2B;gBAC3B,MAAM,eAAe,GAAG;oBACtB,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC9D,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,wCAAwC,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrF,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC5E,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,4CAA4C,CAAC,IAAI,CAAC,IAAI,CAAC;iBACzF,CAAC;gBACF,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;oBACjE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;gBAClE,CAAC;gBAED,yBAAyB;gBACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBAEzG,2CAA2C;gBAC3C,IAAI,CAAC,uBAAuB,GAAG,IAAI,cAAc,CAC/C,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,EAClC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAChC,CAAC;gBACF,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,CAAC;gBAErC,sIAAsI;gBACtI,MAAM,4BAA4B,GAAG;oBACnC,GAAG,+BAA+B;oBAClC,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC;iBACvD,CAAC;gBACF,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAuB,EAAE,4BAA4B,CAAC,CAAC;gBACrF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE;oBACtC,MAAM,EAAE,gBAAgB;oBACxB,QAAQ,EAAE,oBAAoB;oBAC9B,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;iBACpC,CAAC,CAAC;YACL,CAAC;YAED;;;eAGG;YACI,KAAK,CAAC,IAAI;gBACf,6BAA6B;gBAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBAE5G,oBAAoB;gBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAC9C,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;gBAExB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAC3C,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACjD,MAAM,IAAI,CAAC,uBAAuB,EAAE,IAAI,EAAE,CAAC;gBAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;gBACxD,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBACzD,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBACxC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;gBACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAC7C,CAAC;YAED;;;;;eAKG;YACI,MAAM,CAAC,KAAK,CAAC,GAAG,CACrB,UAAa,EACb,MAAiB,EACjB,oBAA0C,EAC1C,MAAc,EACd,QAAqB,EACrB,aAA4B,EAC5B,UAAsB,EACtB,aAA4C,EAC5C,sBAA8C,EAC9C,KAAmB,EACnB,SAA0B;gBAE1B,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;gBACpF,MAAM,WAAW,GAAG,kBAAkB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;gBAChE,yGAAyG;gBACzG,MAAM,eAAe,GAAG,kBAAkB,CAAC,kBAAmB,EAAE,KAAK,CAAC,CAAC;gBAEvE,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC;gBAE5C,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,SAAS,CAAC,CAAC;gBAE7D,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC;oBAC9B,KAAK,EAAE,KAAK;oBACZ,MAAM;oBACN,SAAS,EAAE;wBACT,MAAM,EAAE,CAAC,WAAW,CAAC;wBACrB,QAAQ,EAAE,CAAC,eAAe,CAAC;qBAC5B;oBACD,UAAU,EAAE;wBACV,GAAG,CAAC;4BACF,cAAc,EAAE,MAAM,CAAC,YAAY;4BACnC,wEAAwE;4BACxE,sEAAsE;4BACtE,2CAA2C;4BAC3C,OAAO,EAAE,CAAC;4BACV,2BAA2B,EAAE;gCAC3B,UAAU,EAAE,YAAY,IAAI,QAAQ;gCACpC,WAAW,EAAE,YAAY,IAAI,QAAQ;6BACtC;yBACF,CAAC;qBACH;oBACD,SAAS;oBACT,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC;oBAChC,oBAAoB,EAAE,CAAC,KAAK,EAAE,CAAC;oBAC/B,iBAAiB,EAAE;wBACjB,cAAc,EAAE,YAAY;wBAC5B,cAAc,EAAE,YAAY;qBAC7B;oBACD,QAAQ,EAAE;wBACR,QAAQ,EAAE,QAAQ,CAAC;4BACjB,cAAc,EAAE,OAAO;yBACxB,CAAC;wBACF,MAAM,EAAE,SAAS,CAAC;4BAChB,4BAA4B,EAAE,IAAI;4BAClC,CAAC,EAAE,MAAM,CAAC,UAAU;4BACpB,GAAG,EAAE,MAAM,CAAC,YAAY;4BACxB,GAAG,EAAE,MAAM,CAAC,YAAY;4BACxB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;4BAC3C,YAAY,EAAE,MAAM,CAAC,qBAAqB;4BAC1C,YAAY,EAAE,MAAM,CAAC,qBAAqB;4BAC1C,OAAO,EAAE,UAAU;4BACnB,YAAY,EAAE,YAAY;4BAC1B,WAAW,EAAE,WAAW;4BACxB,aAAa,EAAE,IAAI,eAAe,EAAE;4BACpC,eAAe,EAAE,kBAAkB;4BACnC,sBAAsB,EAAE,uBAAuB,EAAE;4BACjD,eAAe,EAAE,IAAI;4BACrB,WAAW,EAAE,qBAAqB,CAAC;gCACjC,MAAM,EAAE;oCACN,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;wCACpC,WAAW,EAAE,CAAC;wCACd,8BAA8B,EAAE,CAAC,EAAE;wCACnC,6BAA6B,EAAE,GAAG;qCACnC,CAAC;oCACF,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;wCAClD,WAAW,EAAE,CAAC;wCACd,8BAA8B,EAAE,CAAC,EAAE;wCACnC,6BAA6B,EAAE,GAAG;qCACnC,CAAC;oCACF,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;wCAClD,WAAW,EAAE,CAAC;wCACd,8BAA8B,EAAE,CAAC,EAAE;wCACnC,6BAA6B,EAAE,GAAG;qCACnC,CAAC;oCACF,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;wCACjD,WAAW,EAAE,CAAC;wCACd,8BAA8B,EAAE,CAAC,EAAE;wCACnC,6BAA6B,EAAE,GAAG;qCACnC,CAAC;iCACH;6BACF,CAAC;yBACH,CAAmD;qBACrD;iBACF,CAAC,CAAC;gBAEH,4CAA4C;gBAC5C;;;;mBAIG;gBACH,MAAM,SAAS,GAAG,CAAC,GAAW,EAAmB,EAAE;oBACjD,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBACtC,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;oBACpD,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC3D,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC9B,CAAC,CAAC;gBAEF,MAAM,uBAAuB,GAAG;oBAC9B,CAAC,aAAa,CAAC,EAAE,WAAW;oBAC5B,CAAC,eAAe,CAAC,EAAE,aAAa;oBAChC,CAAC,eAAe,CAAC,EAAE,SAAS;iBAC7B,CAAC;gBAEF,OAAO,IAAI,EAAa,CACtB,UAAU,EACV,MAAM,EACN,IAAI,EACJ,oBAAoB,EACpB,QAAQ,EACR,aAAa,EACb,UAAU,EACV,aAAa,EACb,sBAAsB,EACtB,SAAS,EACT,uBAAuB,CACxB,CAAC;YACJ,CAAC;YAEM,QAAQ,CAAC,cAAwB;gBACtC,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YACnD,CAAC;YAEO,KAAK,CAAC,oBAAoB,CAAC,CAAgC;gBACjE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC;gBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAE9C,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC;YAClE,CAAC;YAED;;;;;;;;;eASG;YACH,WAAW,CACT,QAAqB,EACrB,OAA6D;gBAE7D,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACrD,CAAC;YAED;;;eAGG;YACI,MAAM;gBACX,OAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC;YAC5C,CAAC;YAEM,6BAA6B,CAAC,QAAyE;gBAC5G,IAAI,CAAC,qBAAqB,GAAG,QAAQ,CAAC;gBACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAC;YAC5D,CAAC;YAED;;;eAGG;YACK,gBAAgB,CAAC,KAAa;gBACpC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;oBAC/B,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;gBACnD,CAAC;gBACD,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAClD,CAAC;YAED;;;;;eAKG;YACK,KAAK,CAAC,cAAc,CAAC,KAAa,EAAE,IAAgB;gBAC1D,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;oBAC/B,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;gBACnD,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBAEpE,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;YAClC,CAAC;YAED;;;;eAIG;YACK,KAAK,CAAC,sBAAsB,CAAC,OAAyB;gBAC5D,IAAI,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC;oBAClC,MAAM,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;oBACpD,MAAM,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;gBACnC,CAAC;gBACD,IAAI,OAAO,CAAC,KAAK,KAAK,gBAAgB,CAAC,QAAQ,IAAI,IAAI,CAAC,UAAU,KAAK,aAAa,CAAC,IAAI,EAAE,CAAC;oBAC1F,MAAM,WAAW,GAAG,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC3E,MAAM,IAAI,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAC;gBACrD,CAAC;gBACD,IAAI,OAAO,CAAC,KAAK,IAAI,aAAa,CAAC,QAAQ,EAAE,CAAC;oBAC5C,MAAM,KAAK,GAAG,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;oBAClE,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBACzC,CAAC;gBACD,IAAI,OAAO,CAAC,KAAK,IAAI,eAAe,CAAC,QAAQ,EAAE,CAAC;oBAC9C,MAAM,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC9E,IAAI,CAAC,8BAA8B,CAAC,eAAe,CAAC,CAAC;gBACvD,CAAC;gBAED,OAAO;YACT,CAAC;YAED;;;;eAIG;YAOK,KAAK,CAAC,0BAA0B,CAAC,WAA6B;gBACpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,WAAW,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,CAAC;gBACpG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAgB,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;YACtE,CAAC;YAED;;;;;eAKG;YACH,uFAAuF;YAO/E,KAAK,CAAC,oBAAoB,CAAC,KAAoB;gBACrD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,KAAK,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,CAAC;gBAC1F,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;gBAE5D,0DAA0D;gBAC1D,uGAAuG;gBACvG,IAAI,WAAW,IAAI,SAAS,EAAE,CAAC;oBAC7B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,4BAA4B,WAAW,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;oBACtF,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;YAED;;;eAGG;YAOK,oBAAoB,CAAC,WAA6B;gBACxD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YAC9B,CAAC;YAEO,8BAA8B,CAAC,eAAgC;gBACrE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,8BAA8B,eAAe,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,CAAC;gBAChH,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YAC9D,CAAC;YAED;;;eAGG;YACI,SAAS,CAAuB,OAAU;gBAC/C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;gBAChE,KAAK,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;oBAChC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBAClC,CAAC,CAAC,CAAC;YACL,CAAC;YAEO,KAAK,CAAC,iBAAiB,CAAC,EAAM;gBACpC,MAAM,MAAM,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC;gBAC9B,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACvC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,YAAY,sBAAsB,CAAC,CAAC;gBACvE,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1C,CAAC;YAED;;;;;;;;;;;;;eAaG;YAIK,KAAK,CAAC,mBAAmB,CAAC,eAAuB,EAAE,UAAc,EAAE,MAAc;gBACvF,MAAM,cAAc,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAChE,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBAE/D,qDAAqD;gBACrD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;oBACpD,oDAAoD;oBACpD,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;oBAC3E,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,0GAA0G;oBAC1G,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;oBAC3E,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC;YAED;;;;;eAKG;YACK,KAAK,CAAC,+BAA+B,CAC3C,iBAAyB,EACzB,GAAY;gBAEZ,MAAM,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBAChD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;gBACvE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,EAAE;oBACpD,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE;oBAC/C,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC,QAAQ,EAAE;iBAClD,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC;YAC7E,CAAC;YAED;;;;;eAKG;YACK,KAAK,CAAC,wCAAwC,CACpD,iBAAyB,EACzB,GAAY;gBAEZ,MAAM,WAAW,GAAG,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBACvE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;gBAC/E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,OAAO,EAAE,EAAE;oBAC7D,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE;oBAC1F,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC,QAAQ,EAAE;iBAClD,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC;YAC7E,CAAC;YAED;;;;;eAKG;YACK,KAAK,CAAC,kCAAkC,CAC9C,iBAAyB,EACzB,GAAY;gBAEZ,MAAM,KAAK,GAAG,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC9D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;gBAC3E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,OAAO,EAAE,EAAE;oBACvD,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE;oBACpF,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC,QAAQ,EAAE;iBAClD,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC;YAC7E,CAAC;YAED;;;;;eAKG;YACK,KAAK,CAAC,4CAA4C,CACxD,iBAAyB,EACzB,GAAY;gBAEZ,MAAM,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC1E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;gBACvF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,OAAO,EAAE,EAAE;oBACjE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE;oBAC1E,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC,QAAQ,EAAE;iBAClD,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC;YAC7E,CAAC;YAKO,KAAK,CAAC,oBAAoB,CAAC,EAAM,EAAE,MAAc;gBACvD,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC;gBACpE,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;gBACpE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;gBAEjE,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;oBACtB,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;gBAE3C,oDAAoD;gBACpD,IAAI,IAAI,KAAK,sBAAsB,EAAE,CAAC;oBACpC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;oBAC7E,IAAI,OAAO,EAAE,CAAC;wBACZ,OAAO,IAAI,CAAC;oBACd,CAAC;gBACH,CAAC;gBAED,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAChD,OAAO,KAAK,CAAC;YACf,CAAC;YAED;;;;;;;;eAQG;YACK,uBAAuB,CAAC,WAAmB;gBACjD,OAAO;oBACL,aAAa,EAAE;wBACb,SAAS,EAAE,IAAI,eAAe,EAAE;wBAChC,QAAQ,EAAE,iBAAiB,CAAC,kBAAkB;qBAC/C;oBACD,iBAAiB,EAAE;wBACjB,SAAS,EAAE,IAAI,mBAAmB,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,WAAW,CAAC,CAAC;wBACtF,QAAQ,EAAE,iBAAiB,CAAC,kBAAkB;qBAC/C;oBACD,cAAc,EAAE;wBACd,SAAS,EAAE,IAAI,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC;wBACnD,QAAQ,EAAE,iBAAiB,CAAC,iBAAiB;qBAC9C;oBACD,oBAAoB,EAAE;wBACpB,SAAS,EAAE,IAAI,sBAAsB,CAAC;4BACpC,mBAAmB,EAAE,CAAC,UAAoB,EAAE,EAAE;gCAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC;gCAC9D,OAAO,UAAU,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;4BAC7E,CAAC;yBACF,CAAC;wBACF,QAAQ,EAAE,iBAAiB,CAAC,kBAAkB;qBAC/C;iBACF,CAAC;YACJ,CAAC;YAED;;;;;eAKG;YACK,KAAK,CAAC,cAAc,CAC1B,EAAM,EACN,iBAAmD;gBAEnD,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE;oBACzG,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;oBAC/C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;gBACrC,CAAC,CAAC,CAAC;gBAEH,6DAA6D;gBAC7D,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAEvD,0DAA0D;gBAC1D,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAC/B,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;oBACrC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC;oBAC7B,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBACzD,CAAC,CAAC,CACH,CAAC;gBAEF,mEAAmE;gBACnE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;oBAChC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAa,EAAE,CAAC,CAAC;oBACzD,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAc,EAAE,OAAO,EAAE,OAA2B,EAAE,CAAC,CAAC;iBACpG,CAAC,CAAC;gBAEH,oHAAoH;gBACpH,OAAO,MAAM,CAAC;YAChB,CAAC;YAED;;;;;;;;;;eAUG;YACK,KAAK,CAAC,wBAAwB,CAAC,EAAM,EAAE,WAAmB,EAAE,MAAc;gBAChF,IAAI,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,CAAC;oBAC5D,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,MAAM,iBAAiB,GAAG,IAAI,sBAAsB,CAAC;oBACnD,mBAAmB,EAAE,CAAC,UAAoB,EAAE,EAAE;wBAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,WAAW,CACxD,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,4BAA4B,CACvD,CAAC;wBACF,OAAO,UAAU,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;oBAC7E,CAAC;iBACF,CAAC,CAAC;gBAEH,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBAC7D,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;oBAC3E,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC;YAED;;;;;eAKG;YAII,KAAK,CAAC,mBAAmB,CAAC,MAAc,EAAE,WAA6B;gBAC5E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACvE,IAAI,QAAQ,EAAE,CAAC;oBACb,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBAChD,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC;YAED;;;;;eAKG;YAII,KAAK,CAAC,qBAAqB,CAAC,MAAc,EAAE,KAAoB;gBACrE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACnE,IAAI,QAAQ,EAAE,CAAC;oBACb,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBAChD,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC;YAED;;;;;eAKG;YAII,KAAK,CAAC,uBAAuB,CAAC,MAAc,EAAE,eAAgC;gBACnF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;gBAC/E,IAAI,QAAQ,EAAE,CAAC;oBACb,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBAChD,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC;YAEM,YAAY,CAAC,MAAc;gBAChC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClE,CAAC;YAEO,KAAK,CAAC,WAAW,CAAuB,OAAU;gBACxD,MAAM,MAAM,GAAG,OAAO,CAAC,WAAgC,CAAC;gBAExD,MAAM,UAAU,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAC7D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAC;gBAEnD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACrF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,UAAU,OAAO,aAAa,QAAQ,CAAC,CAAC;YAC5E,CAAC;YAED,0EAA0E;YAClE,KAAK,CAAC,UAAU;gBACtB,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,oBAAoB;gBAC7C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC9C,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;gBAClF,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC;oBACH,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;oBAChD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;gBACtC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC;;;;sDAhZA,SAAS,CAAC,0CAA0C,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;oBACrE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE;oBAC5F,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE;oBAC1F,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE;oBAC1D,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,oBAAoB,EAAE,CAAC,QAAQ,EAAE;iBACnE,CAAC,CAAC;gDAaF,SAAS,CAAC,oCAAoC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;oBACzD,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE;oBACtF,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE;oBACpF,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE;oBACpD,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,oBAAoB,EAAE,CAAC,QAAQ,EAAE;iBAC7D,CAAC,CAAC;gDAiBF,SAAS,CAAC,oCAAoC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;oBAC/D,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE;oBAC5F,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE;oBAC1F,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE;oBAC1D,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,oBAAoB,EAAE,CAAC,QAAQ,EAAE;iBACnE,CAAC,CAAC;+CA0CF,SAAS,CAAC,mCAAmC,EAAE,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;oBACjF,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,QAAQ,EAAE;iBACjD,CAAC,CAAC;gDAiGF,SAAS,CAAC,oCAAoC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;oBACtD,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE;iBAChD,CAAC,CAAC;+CAuIF,SAAS,CAAC,mCAAmC,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;oBACzE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE;iBAC3F,CAAC,CAAC;iDAiBF,SAAS,CAAC,qCAAqC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;oBACrE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE;iBACrF,CAAC,CAAC;mDAiBF,SAAS,CAAC,uCAAuC,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;oBACjF,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE;iBAC3E,CAAC,CAAC;YArWH,+NAAc,0BAA0B,6DAGvC;YAeD,6MAAc,oBAAoB,6DAUjC;YAYD,6MAAQ,oBAAoB,6DAE3B;YA0CD,0MAAc,mBAAmB,6DAkBhC;YAiFD,6MAAc,oBAAoB,6DAqBjC;YAoHD,0MAAa,mBAAmB,6DAQ/B;YAWD,gNAAa,qBAAqB,6DAQjC;YAWD,sNAAa,uBAAuB,6DAQnC;;;;;SA9uBU,aAAa"}
|
|
698
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"libp2p_service.js","sourceRoot":"","sources":["../../../src/services/libp2p/libp2p_service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/p2p",
|
|
3
|
-
"version": "0.69.
|
|
3
|
+
"version": "0.69.1-devnet",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -63,12 +63,12 @@
|
|
|
63
63
|
]
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@aztec/circuit-types": "0.69.
|
|
67
|
-
"@aztec/circuits.js": "0.69.
|
|
68
|
-
"@aztec/epoch-cache": "0.69.
|
|
69
|
-
"@aztec/foundation": "0.69.
|
|
70
|
-
"@aztec/kv-store": "0.69.
|
|
71
|
-
"@aztec/telemetry-client": "0.69.
|
|
66
|
+
"@aztec/circuit-types": "0.69.1-devnet",
|
|
67
|
+
"@aztec/circuits.js": "0.69.1-devnet",
|
|
68
|
+
"@aztec/epoch-cache": "0.69.1-devnet",
|
|
69
|
+
"@aztec/foundation": "0.69.1-devnet",
|
|
70
|
+
"@aztec/kv-store": "0.69.1-devnet",
|
|
71
|
+
"@aztec/telemetry-client": "0.69.1-devnet",
|
|
72
72
|
"@chainsafe/discv5": "9.0.0",
|
|
73
73
|
"@chainsafe/enr": "3.0.0",
|
|
74
74
|
"@chainsafe/libp2p-gossipsub": "13.0.0",
|
package/src/client/p2p_client.ts
CHANGED
|
@@ -142,6 +142,12 @@ export type P2P<T extends P2PClientType = P2PClientType.Full> = P2PApi<T> & {
|
|
|
142
142
|
*/
|
|
143
143
|
getTxStatus(txHash: TxHash): 'pending' | 'mined' | undefined;
|
|
144
144
|
|
|
145
|
+
/** Returns an iterator over pending txs on the mempool. */
|
|
146
|
+
iteratePendingTxs(): Iterable<Tx>;
|
|
147
|
+
|
|
148
|
+
/** Returns the number of pending txs in the mempool. */
|
|
149
|
+
getPendingTxCount(): number;
|
|
150
|
+
|
|
145
151
|
/**
|
|
146
152
|
* Starts the p2p client.
|
|
147
153
|
* @returns A promise signalling the completion of the block sync.
|
|
@@ -374,9 +380,6 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
|
|
|
374
380
|
this.log.debug(`Block ${syncedLatestBlock} (proven ${syncedProvenBlock}) already beyond current block`);
|
|
375
381
|
}
|
|
376
382
|
|
|
377
|
-
// publish any txs in TxPool after its doing initial sync
|
|
378
|
-
this.syncPromise = this.syncPromise.then(() => this.publishStoredTxs());
|
|
379
|
-
|
|
380
383
|
this.blockStream.start();
|
|
381
384
|
this.log.verbose(`Started block downloader from block ${syncedLatestBlock}`);
|
|
382
385
|
|
|
@@ -460,6 +463,20 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
|
|
|
460
463
|
return Promise.resolve(this.getTxs('pending'));
|
|
461
464
|
}
|
|
462
465
|
|
|
466
|
+
public getPendingTxCount(): number {
|
|
467
|
+
return this.txPool.getPendingTxHashes().length;
|
|
468
|
+
}
|
|
469
|
+
|
|
470
|
+
public *iteratePendingTxs() {
|
|
471
|
+
const pendingTxHashes = this.txPool.getPendingTxHashes();
|
|
472
|
+
for (const txHash of pendingTxHashes) {
|
|
473
|
+
const tx = this.txPool.getTxByHash(txHash);
|
|
474
|
+
if (tx) {
|
|
475
|
+
yield tx;
|
|
476
|
+
}
|
|
477
|
+
}
|
|
478
|
+
}
|
|
479
|
+
|
|
463
480
|
/**
|
|
464
481
|
* Returns all transactions in the transaction pool.
|
|
465
482
|
* @returns An array of Txs.
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
BlockAttestation,
|
|
3
3
|
ConsensusPayload,
|
|
4
|
-
|
|
4
|
+
SignatureDomainSeparator,
|
|
5
5
|
TxHash,
|
|
6
6
|
getHashedSignaturePayloadEthSignedMessage,
|
|
7
7
|
} from '@aztec/circuit-types';
|
|
@@ -37,7 +37,7 @@ export const mockAttestation = (
|
|
|
37
37
|
const header = makeHeader(1, 2, slot);
|
|
38
38
|
const payload = new ConsensusPayload(header, archive, txs);
|
|
39
39
|
|
|
40
|
-
const hash = getHashedSignaturePayloadEthSignedMessage(payload,
|
|
40
|
+
const hash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
|
|
41
41
|
const signature = signer.sign(hash);
|
|
42
42
|
|
|
43
43
|
return new BlockAttestation(payload, signature);
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Tx, TxHash } from '@aztec/circuit-types';
|
|
2
2
|
import { type TxAddedToPoolStats } from '@aztec/circuit-types/stats';
|
|
3
3
|
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
4
|
-
import { type AztecKVStore, type AztecMap, type
|
|
4
|
+
import { type AztecKVStore, type AztecMap, type AztecMultiMap } from '@aztec/kv-store';
|
|
5
5
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
6
6
|
|
|
7
7
|
import { PoolInstrumentation, PoolName } from '../instrumentation.js';
|
|
8
|
+
import { getPendingTxPriority } from './priority.js';
|
|
8
9
|
import { type TxPool } from './tx_pool.js';
|
|
9
10
|
|
|
10
11
|
/**
|
|
@@ -16,10 +17,11 @@ export class AztecKVTxPool implements TxPool {
|
|
|
16
17
|
/** Our tx pool, stored as a Map, with K: tx hash and V: the transaction. */
|
|
17
18
|
#txs: AztecMap<string, Buffer>;
|
|
18
19
|
|
|
19
|
-
/** Index
|
|
20
|
-
#
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
/** Index from tx hash to the block number in which they were mined, filtered by mined txs. */
|
|
21
|
+
#minedTxHashToBlock: AztecMap<string, number>;
|
|
22
|
+
|
|
23
|
+
/** Index from tx priority (stored as hex) to its tx hash, filtered by pending txs. */
|
|
24
|
+
#pendingTxPriorityToHash: AztecMultiMap<string, string>;
|
|
23
25
|
|
|
24
26
|
#log: Logger;
|
|
25
27
|
|
|
@@ -32,8 +34,8 @@ export class AztecKVTxPool implements TxPool {
|
|
|
32
34
|
*/
|
|
33
35
|
constructor(store: AztecKVStore, telemetry: TelemetryClient, log = createLogger('p2p:tx_pool')) {
|
|
34
36
|
this.#txs = store.openMap('txs');
|
|
35
|
-
this.#
|
|
36
|
-
this.#
|
|
37
|
+
this.#minedTxHashToBlock = store.openMap('txHashToBlockMined');
|
|
38
|
+
this.#pendingTxPriorityToHash = store.openMultiMap('pendingTxFeeToHash');
|
|
37
39
|
|
|
38
40
|
this.#store = store;
|
|
39
41
|
this.#log = log;
|
|
@@ -41,18 +43,25 @@ export class AztecKVTxPool implements TxPool {
|
|
|
41
43
|
}
|
|
42
44
|
|
|
43
45
|
public markAsMined(txHashes: TxHash[], blockNumber: number): Promise<void> {
|
|
46
|
+
if (txHashes.length === 0) {
|
|
47
|
+
return Promise.resolve();
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
let deletedPending = 0;
|
|
44
51
|
return this.#store.transaction(() => {
|
|
45
|
-
let deleted = 0;
|
|
46
52
|
for (const hash of txHashes) {
|
|
47
53
|
const key = hash.toString();
|
|
48
|
-
void this.#
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
54
|
+
void this.#minedTxHashToBlock.set(key, blockNumber);
|
|
55
|
+
|
|
56
|
+
const tx = this.getTxByHash(hash);
|
|
57
|
+
if (tx) {
|
|
58
|
+
deletedPending++;
|
|
59
|
+
const fee = getPendingTxPriority(tx);
|
|
60
|
+
void this.#pendingTxPriorityToHash.deleteValue(fee, key);
|
|
52
61
|
}
|
|
53
62
|
}
|
|
54
|
-
this.#metrics.recordRemovedObjects(deleted, 'pending');
|
|
55
63
|
this.#metrics.recordAddedObjects(txHashes.length, 'mined');
|
|
64
|
+
this.#metrics.recordRemovedObjects(deletedPending, 'pending');
|
|
56
65
|
});
|
|
57
66
|
}
|
|
58
67
|
|
|
@@ -61,33 +70,30 @@ export class AztecKVTxPool implements TxPool {
|
|
|
61
70
|
return Promise.resolve();
|
|
62
71
|
}
|
|
63
72
|
|
|
73
|
+
let markedAsPending = 0;
|
|
64
74
|
return this.#store.transaction(() => {
|
|
65
|
-
let deleted = 0;
|
|
66
|
-
let added = 0;
|
|
67
75
|
for (const hash of txHashes) {
|
|
68
76
|
const key = hash.toString();
|
|
69
|
-
|
|
70
|
-
deleted++;
|
|
71
|
-
void this.#minedTxs.delete(key);
|
|
72
|
-
}
|
|
77
|
+
void this.#minedTxHashToBlock.delete(key);
|
|
73
78
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
void this.#
|
|
79
|
+
const tx = this.getTxByHash(hash);
|
|
80
|
+
if (tx) {
|
|
81
|
+
void this.#pendingTxPriorityToHash.set(getPendingTxPriority(tx), key);
|
|
82
|
+
markedAsPending++;
|
|
77
83
|
}
|
|
78
84
|
}
|
|
79
85
|
|
|
80
|
-
this.#metrics.
|
|
81
|
-
this.#metrics.
|
|
86
|
+
this.#metrics.recordAddedObjects(markedAsPending, 'pending');
|
|
87
|
+
this.#metrics.recordRemovedObjects(markedAsPending, 'mined');
|
|
82
88
|
});
|
|
83
89
|
}
|
|
84
90
|
|
|
85
91
|
public getPendingTxHashes(): TxHash[] {
|
|
86
|
-
return Array.from(this.#
|
|
92
|
+
return Array.from(this.#pendingTxPriorityToHash.values({ reverse: true })).map(x => TxHash.fromString(x));
|
|
87
93
|
}
|
|
88
94
|
|
|
89
95
|
public getMinedTxHashes(): [TxHash, number][] {
|
|
90
|
-
return Array.from(this.#
|
|
96
|
+
return Array.from(this.#minedTxHashToBlock.entries()).map(([txHash, blockNumber]) => [
|
|
91
97
|
TxHash.fromString(txHash),
|
|
92
98
|
blockNumber,
|
|
93
99
|
]);
|
|
@@ -95,10 +101,10 @@ export class AztecKVTxPool implements TxPool {
|
|
|
95
101
|
|
|
96
102
|
public getTxStatus(txHash: TxHash): 'pending' | 'mined' | undefined {
|
|
97
103
|
const key = txHash.toString();
|
|
98
|
-
if (this.#
|
|
99
|
-
return 'pending';
|
|
100
|
-
} else if (this.#minedTxs.has(key)) {
|
|
104
|
+
if (this.#minedTxHashToBlock.has(key)) {
|
|
101
105
|
return 'mined';
|
|
106
|
+
} else if (this.#txs.has(key)) {
|
|
107
|
+
return 'pending';
|
|
102
108
|
} else {
|
|
103
109
|
return undefined;
|
|
104
110
|
}
|
|
@@ -111,7 +117,12 @@ export class AztecKVTxPool implements TxPool {
|
|
|
111
117
|
*/
|
|
112
118
|
public getTxByHash(txHash: TxHash): Tx | undefined {
|
|
113
119
|
const buffer = this.#txs.get(txHash.toString());
|
|
114
|
-
|
|
120
|
+
if (buffer) {
|
|
121
|
+
const tx = Tx.fromBuffer(buffer);
|
|
122
|
+
tx.setTxHash(txHash);
|
|
123
|
+
return tx;
|
|
124
|
+
}
|
|
125
|
+
return undefined;
|
|
115
126
|
}
|
|
116
127
|
|
|
117
128
|
/**
|
|
@@ -120,11 +131,10 @@ export class AztecKVTxPool implements TxPool {
|
|
|
120
131
|
* @returns Empty promise.
|
|
121
132
|
*/
|
|
122
133
|
public addTxs(txs: Tx[]): Promise<void> {
|
|
123
|
-
const txHashes = txs.map(tx => tx.getTxHash());
|
|
124
134
|
return this.#store.transaction(() => {
|
|
125
135
|
let pendingCount = 0;
|
|
126
|
-
for (const
|
|
127
|
-
const txHash =
|
|
136
|
+
for (const tx of txs) {
|
|
137
|
+
const txHash = tx.getTxHash();
|
|
128
138
|
this.#log.verbose(`Adding tx ${txHash.toString()} to pool`, {
|
|
129
139
|
eventName: 'tx-added-to-pool',
|
|
130
140
|
...tx.getStats(),
|
|
@@ -132,10 +142,11 @@ export class AztecKVTxPool implements TxPool {
|
|
|
132
142
|
|
|
133
143
|
const key = txHash.toString();
|
|
134
144
|
void this.#txs.set(key, tx.toBuffer());
|
|
135
|
-
|
|
145
|
+
|
|
146
|
+
if (!this.#minedTxHashToBlock.has(key)) {
|
|
136
147
|
pendingCount++;
|
|
137
148
|
// REFACTOR: Use an lmdb conditional write to avoid race conditions with this write tx
|
|
138
|
-
void this.#
|
|
149
|
+
void this.#pendingTxPriorityToHash.set(getPendingTxPriority(tx), key);
|
|
139
150
|
this.#metrics.recordSize(tx);
|
|
140
151
|
}
|
|
141
152
|
}
|
|
@@ -150,20 +161,27 @@ export class AztecKVTxPool implements TxPool {
|
|
|
150
161
|
* @returns The number of transactions that was deleted from the pool.
|
|
151
162
|
*/
|
|
152
163
|
public deleteTxs(txHashes: TxHash[]): Promise<void> {
|
|
164
|
+
let pendingDeleted = 0;
|
|
165
|
+
let minedDeleted = 0;
|
|
166
|
+
|
|
153
167
|
return this.#store.transaction(() => {
|
|
154
|
-
let pendingDeleted = 0;
|
|
155
|
-
let minedDeleted = 0;
|
|
156
168
|
for (const hash of txHashes) {
|
|
157
169
|
const key = hash.toString();
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
170
|
+
const tx = this.getTxByHash(hash);
|
|
171
|
+
|
|
172
|
+
if (tx) {
|
|
173
|
+
const fee = getPendingTxPriority(tx);
|
|
174
|
+
void this.#pendingTxPriorityToHash.deleteValue(fee, key);
|
|
163
175
|
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
176
|
+
const isMined = this.#minedTxHashToBlock.has(key);
|
|
177
|
+
if (isMined) {
|
|
178
|
+
minedDeleted++;
|
|
179
|
+
} else {
|
|
180
|
+
pendingDeleted++;
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
void this.#txs.delete(key);
|
|
184
|
+
void this.#minedTxHashToBlock.delete(key);
|
|
167
185
|
}
|
|
168
186
|
}
|
|
169
187
|
|
|
@@ -177,7 +195,11 @@ export class AztecKVTxPool implements TxPool {
|
|
|
177
195
|
* @returns Array of tx objects in the order they were added to the pool.
|
|
178
196
|
*/
|
|
179
197
|
public getAllTxs(): Tx[] {
|
|
180
|
-
return Array.from(this.#txs.
|
|
198
|
+
return Array.from(this.#txs.entries()).map(([hash, buffer]) => {
|
|
199
|
+
const tx = Tx.fromBuffer(buffer);
|
|
200
|
+
tx.setTxHash(TxHash.fromString(hash));
|
|
201
|
+
return tx;
|
|
202
|
+
});
|
|
181
203
|
}
|
|
182
204
|
|
|
183
205
|
/**
|
|
@@ -4,6 +4,7 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
4
4
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
5
5
|
|
|
6
6
|
import { PoolInstrumentation, PoolName } from '../instrumentation.js';
|
|
7
|
+
import { getPendingTxPriority } from './priority.js';
|
|
7
8
|
import { type TxPool } from './tx_pool.js';
|
|
8
9
|
|
|
9
10
|
/**
|
|
@@ -68,7 +69,10 @@ export class InMemoryTxPool implements TxPool {
|
|
|
68
69
|
}
|
|
69
70
|
|
|
70
71
|
public getPendingTxHashes(): TxHash[] {
|
|
71
|
-
return
|
|
72
|
+
return this.getAllTxs()
|
|
73
|
+
.sort((tx1, tx2) => -getPendingTxPriority(tx1).localeCompare(getPendingTxPriority(tx2)))
|
|
74
|
+
.map(tx => tx.getTxHash())
|
|
75
|
+
.filter(txHash => this.pendingTxs.has(txHash.toBigInt()));
|
|
72
76
|
}
|
|
73
77
|
|
|
74
78
|
public getMinedTxHashes(): [TxHash, number][] {
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { type Tx } from '@aztec/circuit-types';
|
|
2
|
+
import { Buffer32 } from '@aztec/foundation/buffer';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Returns a string representing the priority of a tx.
|
|
6
|
+
* Txs with a higher priority value are returned first when retrieving pending tx hashes.
|
|
7
|
+
* We currently use the sum of the priority fees for the tx for this value, represented as hex.
|
|
8
|
+
*/
|
|
9
|
+
export function getPendingTxPriority(tx: Tx): string {
|
|
10
|
+
const priorityFees = tx.getGasSettings().maxPriorityFeesPerGas;
|
|
11
|
+
const totalFees = priorityFees.feePerDaGas.toBigInt() + priorityFees.feePerL2Gas.toBigInt();
|
|
12
|
+
return Buffer32.fromBigInt(totalFees).toString();
|
|
13
|
+
}
|
|
@@ -49,7 +49,7 @@ export interface TxPool {
|
|
|
49
49
|
getAllTxHashes(): TxHash[];
|
|
50
50
|
|
|
51
51
|
/**
|
|
52
|
-
* Gets the hashes of pending transactions currently in the tx pool.
|
|
52
|
+
* Gets the hashes of pending transactions currently in the tx pool sorted by priority (see getPendingTxPriority).
|
|
53
53
|
* @returns An array of pending transaction hashes found in the tx pool.
|
|
54
54
|
*/
|
|
55
55
|
getPendingTxHashes(): TxHash[];
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import { mockTx } from '@aztec/circuit-types';
|
|
1
|
+
import { type Tx, mockTx } from '@aztec/circuit-types';
|
|
2
|
+
import { GasFees } from '@aztec/circuits.js';
|
|
3
|
+
import { unfreeze } from '@aztec/foundation/types';
|
|
2
4
|
|
|
3
5
|
import { type TxPool } from './tx_pool.js';
|
|
4
6
|
|
|
@@ -67,10 +69,12 @@ export function describeTxPool(getTxPool: () => TxPool) {
|
|
|
67
69
|
await pool.addTxs([tx1]);
|
|
68
70
|
// this peer knows that tx2 was mined, but it does not have the tx object
|
|
69
71
|
await pool.markAsMined([tx1.getTxHash(), someTxHashThatThisPeerDidNotSee], 1);
|
|
70
|
-
expect(pool.getMinedTxHashes()).toEqual(
|
|
71
|
-
[
|
|
72
|
-
|
|
73
|
-
|
|
72
|
+
expect(new Set(pool.getMinedTxHashes())).toEqual(
|
|
73
|
+
new Set([
|
|
74
|
+
[tx1.getTxHash(), 1],
|
|
75
|
+
[someTxHashThatThisPeerDidNotSee, 1],
|
|
76
|
+
]),
|
|
77
|
+
);
|
|
74
78
|
|
|
75
79
|
// reorg: both txs should now become available again
|
|
76
80
|
await pool.markMinedAsPending([tx1.getTxHash(), someTxHashThatThisPeerDidNotSee]);
|
|
@@ -101,4 +105,22 @@ export function describeTxPool(getTxPool: () => TxPool) {
|
|
|
101
105
|
expect(poolTxHashes).toHaveLength(3);
|
|
102
106
|
expect(poolTxHashes).toEqual(expect.arrayContaining([tx1.getTxHash(), tx2.getTxHash(), tx3.getTxHash()]));
|
|
103
107
|
});
|
|
108
|
+
|
|
109
|
+
it('Returns pending tx hashes sorted by priority', async () => {
|
|
110
|
+
const withPriorityFee = (tx: Tx, fee: number) => {
|
|
111
|
+
unfreeze(tx.data.constants.txContext.gasSettings).maxPriorityFeesPerGas = new GasFees(fee, fee);
|
|
112
|
+
return tx;
|
|
113
|
+
};
|
|
114
|
+
|
|
115
|
+
const tx1 = withPriorityFee(mockTx(0), 1000);
|
|
116
|
+
const tx2 = withPriorityFee(mockTx(1), 100);
|
|
117
|
+
const tx3 = withPriorityFee(mockTx(2), 200);
|
|
118
|
+
const tx4 = withPriorityFee(mockTx(3), 3000);
|
|
119
|
+
|
|
120
|
+
await pool.addTxs([tx1, tx2, tx3, tx4]);
|
|
121
|
+
|
|
122
|
+
const poolTxHashes = pool.getPendingTxHashes();
|
|
123
|
+
expect(poolTxHashes).toHaveLength(4);
|
|
124
|
+
expect(poolTxHashes).toEqual([tx4, tx1, tx3, tx2].map(tx => tx.getTxHash()));
|
|
125
|
+
});
|
|
104
126
|
}
|