chore: conflicts

Author: alexghr

yarn-project/end-to-end/src/spartan/prove_n_tps.test.ts

@@ -1,4 +1,4 @@
-import type { SentTx } from '@aztec/aztec.js/contracts';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
 import { SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee';
 import { type AztecNode, createAztecNodeClient } from '@aztec/aztec.js/node';
 import { RollupCheatCodes } from '@aztec/aztec/testing';
@@ -13,7 +13,7 @@ import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider } from '@aztec/foundation/timer';
 import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
 import { GasFees } from '@aztec/stdlib/gas';
-import { Tx } from '@aztec/stdlib/tx';
+import { Tx, TxHash } from '@aztec/stdlib/tx';
 import { ProvenTx, type TestWallet, proveInteraction } from '@aztec/test-wallet/server';
 
 import { jest } from '@jest/globals';
@@ -276,9 +276,10 @@ describe(`prove ${TARGET_TPS}TPS test`, () => {
 
     logger.info('Deploying benchmark contract...');
     const sponsor = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
-    benchmarkContract = await BenchmarkingContract.deploy(localTestAccounts[0].wallet)
-      .send({ from: localTestAccounts[0].recipientAddress, fee: { paymentMethod: sponsor } })
-      .deployed();
+    benchmarkContract = await BenchmarkingContract.deploy(localTestAccounts[0].wallet).send({
+      from: localTestAccounts[0].recipientAddress,
+      fee: { paymentMethod: sponsor },
+    });
 
     logger.info('Test setup complete');
   });
@@ -342,7 +343,7 @@ describe(`prove ${TARGET_TPS}TPS test`, () => {
     const msPerTx = 1000 / TARGET_TPS;
     logger.info(`Will send ${txsToSend} transactions at ${TARGET_TPS} TPS over ${epochDurationSeconds} seconds`);
 
-    const sentTxs: SentTx[] = [];
+    const sentTxs: TxHash[] = [];
     const sendStartTime = performance.now();
 
     for (let i = 0; i < txsToSend; i++) {
@@ -360,7 +361,7 @@ describe(`prove ${TARGET_TPS}TPS test`, () => {
       // consume tx
       const tx = producer.readyTx;
       producer.readyTx = null;
-      sentTxs.push(tx.send());
+      sentTxs.push(await tx.send({ wait: NO_WAIT }));
 
       logger.info(`Sent tx ${i + 1}/${txsToSend}`);
 
@@ -379,10 +380,9 @@ describe(`prove ${TARGET_TPS}TPS test`, () => {
     logger.info(`Finished sending ${totalSent} txs in ${(sendEndTime - sendStartTime) / 1000}s`);
 
     logger.info('Waiting for transactions to be mined...');
-    const pendingTxs = new Map<string, SentTx>();
-    for (const sentTx of sentTxs) {
-      const hash = (await sentTx.getTxHash()).toString();
-      pendingTxs.set(hash, sentTx);
+    const pendingTxs = new Map<string, TxHash>();
+    for (const txHash of sentTxs) {
+      pendingTxs.set(txHash.toString(), txHash);
     }
 
     let successCount = 0;
@@ -394,7 +394,7 @@ describe(`prove ${TARGET_TPS}TPS test`, () => {
       const start = Math.floor(Math.random() * Math.max(1, entries.length - batchSize + 1));
       const txsToCheck = entries.length <= batchSize ? entries : entries.slice(start, start + batchSize);
 
-      const receipts = await Promise.all(txsToCheck.map(([_, tx]) => tx.getReceipt()));
+      const receipts = await Promise.all(txsToCheck.map(([_, txHash]) => aztecNode.getTxReceipt(txHash)));
 
       let processedCount = 0;
       for (const receipt of receipts) {