@aztec/prover-node 0.85.0-alpha-testnet.5 → 0.85.0-alpha-testnet.7

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.
Files changed (4) hide show
  1. package/dest/prover-coordination/combined-prover-coordination.d.ts.map +1 -1
  2. package/dest/prover-coordination/combined-prover-coordination.js +6 -3
  3. package/package.json +20 -20
  4. package/src/prover-coordination/combined-prover-coordination.ts +8 -5
package/dest/prover-coordination/combined-prover-coordination.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"combined-prover-coordination.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/combined-prover-coordination.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,2BAA2B,GAAG;IAExC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AASF,MAAM,WAAW,QAAQ;IACvB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CAC/D;AAsCD,qBAAa,0BAA2B,YAAW,kBAAkB;;aAEjD,GAAG,EAAE,GAAG,GAAG,SAAS;aACpB,UAAU,EAAE,QAAQ,EAAE;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAIxB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBANJ,GAAG,EAAE,GAAG,GAAG,SAAS,EACpB,UAAU,EAAE,QAAQ,EAAE,EACrB,OAAO,GAAE,2BAGzB,EACgB,GAAG,yCAA2D;IAG1E,YAAY,IAAI,SAAS,GAAG,SAAS;IAI/B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAY/C,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAyE1D"}
1
+ {"version":3,"file":"combined-prover-coordination.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/combined-prover-coordination.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,2BAA2B,GAAG;IAExC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AASF,MAAM,WAAW,QAAQ;IACvB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CAC/D;AAsCD,qBAAa,0BAA2B,YAAW,kBAAkB;;aAEjD,GAAG,EAAE,GAAG,GAAG,SAAS;aACpB,UAAU,EAAE,QAAQ,EAAE;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAIxB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBANJ,GAAG,EAAE,GAAG,GAAG,SAAS,EACpB,UAAU,EAAE,QAAQ,EAAE,EACrB,OAAO,GAAE,2BAGzB,EACgB,GAAG,yCAA2D;IAG1E,YAAY,IAAI,SAAS,GAAG,SAAS;IAI/B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAY/C,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CA4E1D"}
package/dest/prover-coordination/combined-prover-coordination.js CHANGED
@@ -90,13 +90,16 @@ export class CombinedProverCoordination {
90
90
  const foundFromP2P = await pool.getTxsByHash([
91
91
  ...txsToFind
92
92
  ].map((tx)=>TxHash.fromString(tx)));
93
+ // TODO(!!): test for this
94
+ // getTxsByHash returns undefined for transactions that are not found, so it must be filtered to find the true length
95
+ const foundFromP2PLength = foundFromP2P.filter((tx)=>!!tx).length;
93
96
  const numFoundFromNodes = originalToFind - toFindFromP2P;
94
- const numNotFound = toFindFromP2P - foundFromP2P.length;
97
+ const numNotFound = toFindFromP2P - foundFromP2PLength;
95
98
  if (numNotFound === 0) {
96
- this.log.info(`Found all ${originalToFind} txs. ${numFoundFromNodes} from nodes, ${foundFromP2P.length} from p2p`);
99
+ this.log.info(`Found all ${originalToFind} txs. ${numFoundFromNodes} from nodes, ${foundFromP2PLength} from p2p`);
97
100
  return;
98
101
  }
99
- this.log.warn(`Failed to find ${numNotFound} txs from any source. Found ${foundFromP2P.length} from p2p and ${numFoundFromNodes} from nodes`);
102
+ this.log.warn(`Failed to find ${numNotFound} txs from any source. Found ${foundFromP2PLength} from p2p and ${numFoundFromNodes} from nodes`);
100
103
  }
101
104
  async #gatherTxsFromAllNodes(txsToFind, pool) {
102
105
  if (txsToFind.size === 0 || this.aztecNodes.length === 0) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/prover-node",
3
- "version": "0.85.0-alpha-testnet.5",
3
+ "version": "0.85.0-alpha-testnet.7",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -53,25 +53,25 @@
53
53
  ]
54
54
  },
55
55
  "dependencies": {
56
- "@aztec/archiver": "0.85.0-alpha-testnet.5",
57
- "@aztec/bb-prover": "0.85.0-alpha-testnet.5",
58
- "@aztec/blob-sink": "0.85.0-alpha-testnet.5",
59
- "@aztec/constants": "0.85.0-alpha-testnet.5",
60
- "@aztec/epoch-cache": "0.85.0-alpha-testnet.5",
61
- "@aztec/ethereum": "0.85.0-alpha-testnet.5",
62
- "@aztec/foundation": "0.85.0-alpha-testnet.5",
63
- "@aztec/kv-store": "0.85.0-alpha-testnet.5",
64
- "@aztec/l1-artifacts": "0.85.0-alpha-testnet.5",
65
- "@aztec/node-lib": "0.85.0-alpha-testnet.5",
66
- "@aztec/noir-protocol-circuits-types": "0.85.0-alpha-testnet.5",
67
- "@aztec/p2p": "0.85.0-alpha-testnet.5",
68
- "@aztec/protocol-contracts": "0.85.0-alpha-testnet.5",
69
- "@aztec/prover-client": "0.85.0-alpha-testnet.5",
70
- "@aztec/sequencer-client": "0.85.0-alpha-testnet.5",
71
- "@aztec/simulator": "0.85.0-alpha-testnet.5",
72
- "@aztec/stdlib": "0.85.0-alpha-testnet.5",
73
- "@aztec/telemetry-client": "0.85.0-alpha-testnet.5",
74
- "@aztec/world-state": "0.85.0-alpha-testnet.5",
56
+ "@aztec/archiver": "0.85.0-alpha-testnet.7",
57
+ "@aztec/bb-prover": "0.85.0-alpha-testnet.7",
58
+ "@aztec/blob-sink": "0.85.0-alpha-testnet.7",
59
+ "@aztec/constants": "0.85.0-alpha-testnet.7",
60
+ "@aztec/epoch-cache": "0.85.0-alpha-testnet.7",
61
+ "@aztec/ethereum": "0.85.0-alpha-testnet.7",
62
+ "@aztec/foundation": "0.85.0-alpha-testnet.7",
63
+ "@aztec/kv-store": "0.85.0-alpha-testnet.7",
64
+ "@aztec/l1-artifacts": "0.85.0-alpha-testnet.7",
65
+ "@aztec/node-lib": "0.85.0-alpha-testnet.7",
66
+ "@aztec/noir-protocol-circuits-types": "0.85.0-alpha-testnet.7",
67
+ "@aztec/p2p": "0.85.0-alpha-testnet.7",
68
+ "@aztec/protocol-contracts": "0.85.0-alpha-testnet.7",
69
+ "@aztec/prover-client": "0.85.0-alpha-testnet.7",
70
+ "@aztec/sequencer-client": "0.85.0-alpha-testnet.7",
71
+ "@aztec/simulator": "0.85.0-alpha-testnet.7",
72
+ "@aztec/stdlib": "0.85.0-alpha-testnet.7",
73
+ "@aztec/telemetry-client": "0.85.0-alpha-testnet.7",
74
+ "@aztec/world-state": "0.85.0-alpha-testnet.7",
75
75
  "source-map-support": "^0.5.21",
76
76
  "tslib": "^2.4.0",
77
77
  "viem": "2.23.7"
package/src/prover-coordination/combined-prover-coordination.ts CHANGED
@@ -107,16 +107,19 @@ export class CombinedProverCoordination implements ProverCoordination {
107
107
  const toFindFromP2P = txsToFind.size;
108
108
  this.log.verbose(`Gathering ${toFindFromP2P} txs from p2p network`);
109
109
  const foundFromP2P = await pool.getTxsByHash([...txsToFind].map(tx => TxHash.fromString(tx)));
110
+
111
+ // TODO(!!): test for this
112
+ // getTxsByHash returns undefined for transactions that are not found, so it must be filtered to find the true length
113
+ const foundFromP2PLength = foundFromP2P.filter(tx => !!tx).length;
114
+
110
115
  const numFoundFromNodes = originalToFind - toFindFromP2P;
111
- const numNotFound = toFindFromP2P - foundFromP2P.length;
116
+ const numNotFound = toFindFromP2P - foundFromP2PLength;
112
117
  if (numNotFound === 0) {
113
- this.log.info(
114
- `Found all ${originalToFind} txs. ${numFoundFromNodes} from nodes, ${foundFromP2P.length} from p2p`,
115
- );
118
+ this.log.info(`Found all ${originalToFind} txs. ${numFoundFromNodes} from nodes, ${foundFromP2PLength} from p2p`);
116
119
  return;
117
120
  }
118
121
  this.log.warn(
119
- `Failed to find ${numNotFound} txs from any source. Found ${foundFromP2P.length} from p2p and ${numFoundFromNodes} from nodes`,
122
+ `Failed to find ${numNotFound} txs from any source. Found ${foundFromP2PLength} from p2p and ${numFoundFromNodes} from nodes`,
120
123
  );
121
124
  }
122
125