diff --git a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts index aaeb216120a..5f34262853a 100644 --- a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts +++ b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts @@ -9,7 +9,6 @@ import { GrumpkinScalar, Note, PXE, - TxStatus, Wallet, computeMessageSecretHash, retryUntil, @@ -106,7 +105,6 @@ describe('e2e_2_pxes', () => { const secretHash = computeMessageSecretHash(secret); const receipt = await contract.methods.mint_private(balance, secretHash).send().wait(); - expect(receipt.status).toEqual(TxStatus.MINED); const storageSlot = new Fr(5); const noteTypeId = new Fr(84114971101151129711410111011678111116101n); // TransparentNote @@ -115,9 +113,7 @@ describe('e2e_2_pxes', () => { const extendedNote = new ExtendedNote(note, recipient, contract.address, storageSlot, noteTypeId, receipt.txHash); await pxe.addNote(extendedNote); - expect((await contract.methods.redeem_shield(recipient, balance, secret).send().wait()).status).toEqual( - TxStatus.MINED, - ); + await contract.methods.redeem_shield(recipient, balance, secret).send().wait(); }; it('transfers funds from user A to B via PXE A followed by transfer from B to A via PXE B', async () => { @@ -148,11 +144,7 @@ describe('e2e_2_pxes', () => { // Transfer funds from A to B via PXE A const contractWithWalletA = await TokenContract.at(tokenAddress, walletA); - const receiptAToB = await contractWithWalletA.methods - .transfer(userA.address, userB.address, transferAmount1, 0) - .send() - .wait(); - expect(receiptAToB.status).toBe(TxStatus.MINED); + await contractWithWalletA.methods.transfer(userA.address, userB.address, transferAmount1, 0).send().wait(); // Check balances and logs are as expected await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance - transferAmount1); @@ -292,11 +284,7 @@ describe('e2e_2_pxes', () => { // Transfer funds from A to B via PXE A const contractWithWalletA = await TokenContract.at(tokenAddress, walletA); - const receiptAToB = await contractWithWalletA.methods - .transfer(userA.address, userB.address, transferAmount1, 0) - .send() - .wait(); - expect(receiptAToB.status).toBe(TxStatus.MINED); + await contractWithWalletA.methods.transfer(userA.address, userB.address, transferAmount1, 0).send().wait(); // now add the contract and check balances await pxeB.addContracts([ @@ -333,19 +321,17 @@ describe('e2e_2_pxes', () => { // Transfer funds from A to Shared Wallet via PXE A const contractWithWalletA = await TokenContract.at(tokenAddress, walletA); - const receiptAToShared = await contractWithWalletA.methods + await contractWithWalletA.methods .transfer(userA.address, sharedAccountAddress.address, transferAmount1, 0) .send() .wait(); - expect(receiptAToShared.status).toBe(TxStatus.MINED); // Now send funds from Shared Wallet to B via PXE A const contractWithSharedWalletA = await TokenContract.at(tokenAddress, sharedWalletOnA); - const receiptSharedToB = await contractWithSharedWalletA.methods + await contractWithSharedWalletA.methods .transfer(sharedAccountAddress.address, userB.address, transferAmount2, 0) .send() .wait(); - expect(receiptSharedToB.status).toBe(TxStatus.MINED); // check balances from PXE-A's perspective await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance - transferAmount1); diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts index 91d1a33619a..1b8647e16bf 100644 --- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts @@ -9,7 +9,6 @@ import { FunctionSelector, Note, TxHash, - TxStatus, Wallet, computeAuthWitMessageHash, computeMessageSecretHash, @@ -174,8 +173,7 @@ describe('e2e_blacklist_token_contract', () => { getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), false)), ); - const tx = await asset.methods.update_roles(newMinter, newRoles).send().wait(); - expect(tx.status).toBe(TxStatus.MINED); + await asset.methods.update_roles(newMinter, newRoles).send().wait(); await slowUpdateTreeSimulator.commit(); const afterLeaf = await slowTree.methods.un_read_leaf_at(asset.address, newMinter).view(); @@ -186,9 +184,7 @@ describe('e2e_blacklist_token_contract', () => { const time = await cheatCodes.eth.timestamp(); await cheatCodes.aztec.warp(time + 200); - /* const tx = asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, true).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + /* asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, true).send().wait(); expect(await asset.methods.is_minter(accounts[1].address).view()).toBe(true);*/ }); @@ -205,8 +201,7 @@ describe('e2e_blacklist_token_contract', () => { getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), false)), ); - const tx = await asset.methods.update_roles(newAdmin, newRoles).send().wait(); - expect(tx.status).toBe(TxStatus.MINED); + await asset.methods.update_roles(newAdmin, newRoles).send().wait(); await slowUpdateTreeSimulator.commit(); v = await slowTree.methods.un_read_leaf_at(asset.address, newAdmin).view(); @@ -235,8 +230,7 @@ describe('e2e_blacklist_token_contract', () => { getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), false)), ); - const tx = await asset.methods.update_roles(actor, newRoles).send().wait(); - expect(tx.status).toBe(TxStatus.MINED); + await asset.methods.update_roles(actor, newRoles).send().wait(); await slowUpdateTreeSimulator.commit(); const afterLeaf = await slowTree.methods.un_read_leaf_at(asset.address, actor).view(); @@ -248,9 +242,7 @@ describe('e2e_blacklist_token_contract', () => { await cheatCodes.aztec.warp(time + 200); /* - const tx = asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, false).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, false).send().wait(); expect(await asset.methods.is_minter(accounts[1].address).view()).toBe(false);*/ }); @@ -264,8 +256,7 @@ describe('e2e_blacklist_token_contract', () => { getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), false)), ); - const tx = await asset.methods.update_roles(accounts[3].address, 1n).send().wait(); - expect(tx.status).toBe(TxStatus.MINED); + await asset.methods.update_roles(accounts[3].address, 1n).send().wait(); await slowUpdateTreeSimulator.commit(); v = await slowTree.methods.un_read_leaf_at(asset.address, accounts[3].address).view(); @@ -324,9 +315,7 @@ describe('e2e_blacklist_token_contract', () => { describe('Public', () => { it('as minter', async () => { const amount = 10000n; - const tx = asset.methods.mint_public(accounts[0].address, amount).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.mint_public(accounts[0].address, amount).send().wait(); tokenSim.mintPublic(accounts[0].address, amount); expect(await asset.methods.balance_of_public(accounts[0].address).view()).toEqual( @@ -384,9 +373,7 @@ describe('e2e_blacklist_token_contract', () => { describe('Mint flow', () => { it('mint_private as minter', async () => { - const tx = asset.methods.mint_private(amount, secretHash).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + const receipt = await asset.methods.mint_private(amount, secretHash).send().wait(); tokenSim.mintPrivate(amount); txHash = receipt.txHash; }); @@ -396,9 +383,10 @@ describe('e2e_blacklist_token_contract', () => { await wallets[0].addCapsule( getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)), ); - const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send(); - const receiptClaim = await txClaim.wait({ debug: true }); - expect(receiptClaim.status).toBe(TxStatus.MINED); + const receiptClaim = await asset.methods + .redeem_shield(accounts[0].address, amount, secret) + .send() + .wait({ debug: true }); tokenSim.redeemShield(accounts[0].address, amount); // 1 note should be created containing `amount` of tokens const { visibleNotes } = receiptClaim.debugInfo!; @@ -467,9 +455,7 @@ describe('e2e_blacklist_token_contract', () => { const balance0 = await asset.methods.balance_of_public(accounts[0].address).view(); const amount = balance0 / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, 0).send().wait(); tokenSim.transferPublic(accounts[0].address, accounts[1].address, amount); }); @@ -478,9 +464,7 @@ describe('e2e_blacklist_token_contract', () => { const balance = await asset.methods.balance_of_public(accounts[0].address).view(); const amount = balance / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.transfer_public(accounts[0].address, accounts[0].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.transfer_public(accounts[0].address, accounts[0].address, amount, 0).send().wait(); tokenSim.transferPublic(accounts[0].address, accounts[0].address, amount); }); @@ -501,9 +485,7 @@ describe('e2e_blacklist_token_contract', () => { // docs:end:authwit_public_transfer_example // Perform the transfer - const tx = action.send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await action.send().wait(); tokenSim.transferPublic(accounts[0].address, accounts[1].address, amount); @@ -643,9 +625,7 @@ describe('e2e_blacklist_token_contract', () => { await wallets[0].addCapsule( getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)), ); - const tx = asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 0).send().wait(); tokenSim.transferPrivate(accounts[0].address, accounts[1].address, amount); }); @@ -659,9 +639,7 @@ describe('e2e_blacklist_token_contract', () => { await wallets[0].addCapsule( getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)), ); - const tx = asset.methods.transfer(accounts[0].address, accounts[0].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.transfer(accounts[0].address, accounts[0].address, amount, 0).send().wait(); tokenSim.transferPrivate(accounts[0].address, accounts[0].address, amount); }); @@ -691,9 +669,7 @@ describe('e2e_blacklist_token_contract', () => { ); // Perform the transfer - const tx = action.send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await action.send().wait(); tokenSim.transferPrivate(accounts[0].address, accounts[1].address, amount); await wallets[1].addCapsule( @@ -871,9 +847,7 @@ describe('e2e_blacklist_token_contract', () => { const amount = balancePub / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.shield(accounts[0].address, amount, secretHash, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + const receipt = await asset.methods.shield(accounts[0].address, amount, secretHash, 0).send().wait(); tokenSim.shield(accounts[0].address, amount); await tokenSim.check(); @@ -881,9 +855,7 @@ describe('e2e_blacklist_token_contract', () => { // Redeem it await addPendingShieldNoteToPXE(0, amount, secretHash, receipt.txHash); await wallets[0].addCapsule(getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true))); - const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send(); - const receiptClaim = await txClaim.wait(); - expect(receiptClaim.status).toBe(TxStatus.MINED); + await asset.methods.redeem_shield(accounts[0].address, amount, secret).send().wait(); tokenSim.redeemShield(accounts[0].address, amount); }); @@ -899,9 +871,7 @@ describe('e2e_blacklist_token_contract', () => { const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request()); await wallets[0].setPublicAuth(messageHash, true).send().wait(); - const tx = action.send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + const receipt = await action.send().wait(); tokenSim.shield(accounts[0].address, amount); await tokenSim.check(); @@ -916,9 +886,7 @@ describe('e2e_blacklist_token_contract', () => { // Redeem it await addPendingShieldNoteToPXE(0, amount, secretHash, receipt.txHash); await wallets[0].addCapsule(getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true))); - const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send(); - const receiptClaim = await txClaim.wait(); - expect(receiptClaim.status).toBe(TxStatus.MINED); + await asset.methods.redeem_shield(accounts[0].address, amount, secret).send().wait(); tokenSim.redeemShield(accounts[0].address, amount); }); @@ -1002,9 +970,7 @@ describe('e2e_blacklist_token_contract', () => { await wallets[1].addCapsule(getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true))); await wallets[1].addCapsule(getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true))); - const tx = asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 0).send().wait(); tokenSim.unshield(accounts[0].address, accounts[0].address, amount); }); @@ -1029,9 +995,7 @@ describe('e2e_blacklist_token_contract', () => { const witness = await wallets[0].createAuthWitness(messageHash); await wallets[1].addAuthWitness(witness); - const tx = action.send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await action.send().wait(); tokenSim.unshield(accounts[0].address, accounts[1].address, amount); // Perform the transfer again, should fail @@ -1169,9 +1133,7 @@ describe('e2e_blacklist_token_contract', () => { const balance0 = await asset.methods.balance_of_public(accounts[0].address).view(); const amount = balance0 / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.burn_public(accounts[0].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.burn_public(accounts[0].address, amount, 0).send().wait(); tokenSim.burnPublic(accounts[0].address, amount); }); @@ -1187,9 +1149,7 @@ describe('e2e_blacklist_token_contract', () => { const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request()); await wallets[0].setPublicAuth(messageHash, true).send().wait(); - const tx = action.send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await action.send().wait(); tokenSim.burnPublic(accounts[0].address, amount); @@ -1273,9 +1233,7 @@ describe('e2e_blacklist_token_contract', () => { await wallets[0].addCapsule( getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)), ); - const tx = asset.methods.burn(accounts[0].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.burn(accounts[0].address, amount, 0).send().wait(); tokenSim.burnPrivate(accounts[0].address, amount); }); @@ -1298,9 +1256,7 @@ describe('e2e_blacklist_token_contract', () => { getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)), ); - const tx = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce).send().wait(); tokenSim.burnPrivate(accounts[0].address, amount); // Perform the transfer again, should fail diff --git a/yarn-project/end-to-end/src/e2e_block_building.test.ts b/yarn-project/end-to-end/src/e2e_block_building.test.ts index 3885495eddf..99551f7df9a 100644 --- a/yarn-project/end-to-end/src/e2e_block_building.test.ts +++ b/yarn-project/end-to-end/src/e2e_block_building.test.ts @@ -9,7 +9,6 @@ import { PXE, SentTx, TxReceipt, - TxStatus, Wallet, } from '@aztec/aztec.js'; import { times } from '@aztec/foundation/collection'; @@ -69,7 +68,6 @@ describe('e2e_block_building', () => { // Await txs to be mined and assert they are all mined on the same block const receipts = await Promise.all(txs.map(tx => tx.wait())); - expect(receipts.map(r => r.status)).toEqual(times(TX_COUNT, () => TxStatus.MINED)); expect(receipts.map(r => r.blockNumber)).toEqual(times(TX_COUNT, () => receipts[0].blockNumber)); // Assert all contracts got deployed diff --git a/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts b/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts index 8e27cefbabb..37daaf1b9b9 100644 --- a/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts +++ b/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts @@ -6,7 +6,6 @@ import { Fr, Note, PXE, - TxStatus, Wallet, computeMessageSecretHash, } from '@aztec/aztec.js'; @@ -168,15 +167,14 @@ describe('e2e_cheat_codes', () => { expect(Number(await rollup.read.lastBlockTs())).toEqual(newTimestamp); expect(Number(await rollup.read.lastWarpedBlockTs())).toEqual(newTimestamp); - const txIsTimeEqual = contract.methods.is_time_equal(newTimestamp).send(); - const isTimeEqualReceipt = await txIsTimeEqual.wait({ interval: 0.1 }); - expect(isTimeEqualReceipt.status).toBe(TxStatus.MINED); + await contract.methods.is_time_equal(newTimestamp).send().wait({ interval: 0.1 }); // Since last rollup block was warped, txs for this rollup will have time incremented by 1 // See https://github.com/AztecProtocol/aztec-packages/issues/1614 for details - const txTimeNotEqual = contract.methods.is_time_equal(newTimestamp + 1).send(); - const isTimeNotEqualReceipt = await txTimeNotEqual.wait({ interval: 0.1 }); - expect(isTimeNotEqualReceipt.status).toBe(TxStatus.MINED); + await contract.methods + .is_time_equal(newTimestamp + 1) + .send() + .wait({ interval: 0.1 }); // block is published at t >= newTimestamp + 1. expect(Number(await rollup.read.lastBlockTs())).toBeGreaterThanOrEqual(newTimestamp + 1); }, 50_000); diff --git a/yarn-project/end-to-end/src/e2e_counter_contract.test.ts b/yarn-project/end-to-end/src/e2e_counter_contract.test.ts index f47c6ba8d20..ea4f806fb7b 100644 --- a/yarn-project/end-to-end/src/e2e_counter_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_counter_contract.test.ts @@ -1,4 +1,4 @@ -import { AccountWallet, AztecAddress, CompleteAddress, DebugLogger, TxStatus } from '@aztec/aztec.js'; +import { AccountWallet, AztecAddress, CompleteAddress, DebugLogger } from '@aztec/aztec.js'; import { CounterContract } from '@aztec/noir-contracts.js/Counter'; import { setup } from './fixtures/utils.js'; @@ -31,8 +31,7 @@ describe('e2e_counter_contract', () => { describe('increments', () => { it('counts', async () => { - const receipt = await counterContract.methods.increment(owner).send().wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await counterContract.methods.increment(owner).send().wait(); expect(await counterContract.methods.get_counter(owner).view()).toBe(1n); }); }); diff --git a/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts b/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts index ac5418897dc..9a675188976 100644 --- a/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts +++ b/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts @@ -7,7 +7,6 @@ import { L1Actor, L1ToL2Message, L2Actor, - TxStatus, computeAuthWitMessageHash, } from '@aztec/aztec.js'; import { keccak, sha256 } from '@aztec/foundation/crypto'; @@ -168,12 +167,11 @@ describe('e2e_cross_chain_messaging', () => { ).rejects.toThrow(`L1 to L2 message index not found in the store for message ${wrongMessage.hash().toString()}`); // send the right one - - const consumptionTx = l2Bridge + const consumptionReceipt = await l2Bridge .withWallet(user2Wallet) .methods.claim_private(secretHashForRedeemingMintedNotes, bridgeAmount, secretForL2MessageConsumption) - .send(); - const consumptionReceipt = await consumptionTx.wait(); - expect(consumptionReceipt.status).toBe(TxStatus.MINED); + .send() + .wait(); // Now user1 can claim the notes that user2 minted on their behalf. await crossChainTestHarness.addPendingShieldNoteToPXE( diff --git a/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts b/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts index bf6455b69af..4b27b58e103 100644 --- a/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts @@ -11,7 +11,6 @@ import { Note, PXE, PublicKey, - TxStatus, computeMessageSecretHash, generatePublicKey, } from '@aztec/aztec.js'; @@ -70,7 +69,6 @@ describe('e2e_escrow_contract', () => { const secretHash = computeMessageSecretHash(secret); const receipt = await token.methods.mint_private(mintAmount, secretHash).send().wait(); - expect(receipt.status).toEqual(TxStatus.MINED); const note = new Note([new Fr(mintAmount), secretHash]); @@ -84,9 +82,7 @@ describe('e2e_escrow_contract', () => { ); await pxe.addNote(extendedNote); - expect( - (await token.methods.redeem_shield(escrowContract.address, mintAmount, secret).send().wait()).status, - ).toEqual(TxStatus.MINED); + await token.methods.redeem_shield(escrowContract.address, mintAmount, secret).send().wait(); logger(`Token contract deployed at ${token.address}`); }, 100_000); @@ -125,7 +121,6 @@ describe('e2e_escrow_contract', () => { const secretHash = computeMessageSecretHash(secret); const receipt = await token.methods.mint_private(mintAmount, secretHash).send().wait(); - expect(receipt.status).toEqual(TxStatus.MINED); const note = new Note([new Fr(mintAmount), secretHash]); const extendedNote = new ExtendedNote( @@ -138,7 +133,7 @@ describe('e2e_escrow_contract', () => { ); await pxe.addNote(extendedNote); - expect((await token.methods.redeem_shield(owner, mintAmount, secret).send().wait()).status).toEqual(TxStatus.MINED); + await token.methods.redeem_shield(owner, mintAmount, secret).send().wait(); await expectBalance(owner, 50n); diff --git a/yarn-project/end-to-end/src/e2e_lending_contract.test.ts b/yarn-project/end-to-end/src/e2e_lending_contract.test.ts index 52c23f8129f..10bae5d432e 100644 --- a/yarn-project/end-to-end/src/e2e_lending_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_lending_contract.test.ts @@ -6,8 +6,6 @@ import { ExtendedNote, Fr, Note, - SentTx, - TxStatus, computeAuthWitMessageHash, computeMessageSecretHash, } from '@aztec/aztec.js'; @@ -36,12 +34,6 @@ describe('e2e_lending_contract', () => { let lendingAccount: LendingAccount; let lendingSim: LendingSimulator; - const waitForSuccess = async (tx: SentTx) => { - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); - return receipt; - }; - const deployContracts = async () => { logger(`Deploying price feed contract...`); const priceFeedContract = await PriceFeedContract.deploy(wallet).send().deployed(); @@ -95,7 +87,10 @@ describe('e2e_lending_contract', () => { }); it('Mint assets for later usage', async () => { - await waitForSuccess(priceFeedContract.methods.set_price(0n, 2n * 10n ** 9n).send()); + await priceFeedContract.methods + .set_price(0n, 2n * 10n ** 9n) + .send() + .wait(); { const assets = [collateralAsset, stableCoin]; @@ -106,7 +101,7 @@ describe('e2e_lending_contract', () => { const a = asset.methods.mint_public(lendingAccount.address, mintAmount).send(); const b = asset.methods.mint_private(mintAmount, secretHash).send(); - await Promise.all([a, b].map(waitForSuccess)); + await Promise.all([a, b].map(tx => tx.wait())); const storageSlot = new Fr(5); const noteTypeId = new Fr(84114971101151129711410111011678111116101n); // TransparentNote @@ -123,7 +118,7 @@ describe('e2e_lending_contract', () => { ); await wallet.addNote(extendedNote); - await waitForSuccess(asset.methods.redeem_shield(lendingAccount.address, mintAmount, secret).send()); + await asset.methods.redeem_shield(lendingAccount.address, mintAmount, secret).send().wait(); } } @@ -139,9 +134,10 @@ describe('e2e_lending_contract', () => { it('Initialize the contract', async () => { await lendingSim.prepare(); logger('Initializing contract'); - await waitForSuccess( - lendingContract.methods.init(priceFeedContract.address, 8000, collateralAsset.address, stableCoin.address).send(), - ); + await lendingContract.methods + .init(priceFeedContract.address, 8000, collateralAsset.address, stableCoin.address) + .send() + .wait(); }); describe('Deposits', () => { @@ -165,18 +161,17 @@ describe('e2e_lending_contract', () => { // - increase last updated timestamp. // - increase the private collateral. logger('Depositing 🥸 : 💰 -> 🏦'); - await waitForSuccess( - lendingContract.methods - .deposit_private( - lendingAccount.address, - depositAmount, - nonce, - lendingAccount.secret, - 0n, - collateralAsset.address, - ) - .send(), - ); + await lendingContract.methods + .deposit_private( + lendingAccount.address, + depositAmount, + nonce, + lendingAccount.secret, + 0n, + collateralAsset.address, + ) + .send() + .wait(); }); it('Depositing 🥸 on behalf of recipient: 💰 -> 🏦', async () => { @@ -198,18 +193,17 @@ describe('e2e_lending_contract', () => { // - increase last updated timestamp. // - increase the public collateral. logger('Depositing 🥸 on behalf of recipient: 💰 -> 🏦'); - await waitForSuccess( - lendingContract.methods - .deposit_private( - lendingAccount.address, - depositAmount, - nonce, - 0n, - lendingAccount.address, - collateralAsset.address, - ) - .send(), - ); + await lendingContract.methods + .deposit_private( + lendingAccount.address, + depositAmount, + nonce, + 0n, + lendingAccount.address, + collateralAsset.address, + ) + .send() + .wait(); }); it('Depositing: 💰 -> 🏦', async () => { @@ -236,11 +230,10 @@ describe('e2e_lending_contract', () => { // - increase the public collateral. logger('Depositing: 💰 -> 🏦'); - await waitForSuccess( - lendingContract.methods - .deposit_public(depositAmount, nonce, lendingAccount.address, collateralAsset.address) - .send(), - ); + await lendingContract.methods + .deposit_public(depositAmount, nonce, lendingAccount.address, collateralAsset.address) + .send() + .wait(); }); }); @@ -257,9 +250,10 @@ describe('e2e_lending_contract', () => { // - increase the private debt. logger('Borrow 🥸 : 🏦 -> 🍌'); - await waitForSuccess( - lendingContract.methods.borrow_private(lendingAccount.secret, lendingAccount.address, borrowAmount).send(), - ); + await lendingContract.methods + .borrow_private(lendingAccount.secret, lendingAccount.address, borrowAmount) + .send() + .wait(); }); it('Borrow: 🏦 -> 🍌', async () => { @@ -274,7 +268,7 @@ describe('e2e_lending_contract', () => { // - increase the public debt. logger('Borrow: 🏦 -> 🍌'); - await waitForSuccess(lendingContract.methods.borrow_public(lendingAccount.address, borrowAmount).send()); + await lendingContract.methods.borrow_public(lendingAccount.address, borrowAmount).send().wait(); }); }); @@ -298,11 +292,10 @@ describe('e2e_lending_contract', () => { // - decrease the private debt. logger('Repay 🥸 : 🍌 -> 🏦'); - await waitForSuccess( - lendingContract.methods - .repay_private(lendingAccount.address, repayAmount, nonce, lendingAccount.secret, 0n, stableCoin.address) - .send(), - ); + await lendingContract.methods + .repay_private(lendingAccount.address, repayAmount, nonce, lendingAccount.secret, 0n, stableCoin.address) + .send() + .wait(); }); it('Repay 🥸 on behalf of public: 🍌 -> 🏦', async () => { @@ -324,11 +317,10 @@ describe('e2e_lending_contract', () => { // - decrease the public debt. logger('Repay 🥸 on behalf of public: 🍌 -> 🏦'); - await waitForSuccess( - lendingContract.methods - .repay_private(lendingAccount.address, repayAmount, nonce, 0n, lendingAccount.address, stableCoin.address) - .send(), - ); + await lendingContract.methods + .repay_private(lendingAccount.address, repayAmount, nonce, 0n, lendingAccount.address, stableCoin.address) + .send() + .wait(); }); it('Repay: 🍌 -> 🏦', async () => { @@ -353,9 +345,10 @@ describe('e2e_lending_contract', () => { // - decrease the public debt. logger('Repay: 🍌 -> 🏦'); - await waitForSuccess( - lendingContract.methods.repay_public(repayAmount, nonce, lendingAccount.address, stableCoin.address).send(), - ); + await lendingContract.methods + .repay_public(repayAmount, nonce, lendingAccount.address, stableCoin.address) + .send() + .wait(); }); }); @@ -372,7 +365,7 @@ describe('e2e_lending_contract', () => { // - decrease the public collateral. logger('Withdraw: 🏦 -> 💰'); - await waitForSuccess(lendingContract.methods.withdraw_public(lendingAccount.address, withdrawAmount).send()); + await lendingContract.methods.withdraw_public(lendingAccount.address, withdrawAmount).send().wait(); }); it('Withdraw 🥸 : 🏦 -> 💰', async () => { @@ -387,9 +380,10 @@ describe('e2e_lending_contract', () => { // - decrease the private collateral. logger('Withdraw 🥸 : 🏦 -> 💰'); - await waitForSuccess( - lendingContract.methods.withdraw_private(lendingAccount.secret, lendingAccount.address, withdrawAmount).send(), - ); + await lendingContract.methods + .withdraw_private(lendingAccount.secret, lendingAccount.address, withdrawAmount) + .send() + .wait(); }); describe('failure cases', () => { diff --git a/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts b/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts index bc01605d6b4..b4d911dfb02 100644 --- a/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts +++ b/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts @@ -9,7 +9,6 @@ import { GrumpkinScalar, Note, PXE, - TxStatus, Wallet, computeMessageSecretHash, generatePublicKey, @@ -63,7 +62,6 @@ describe('e2e_multiple_accounts_1_enc_key', () => { const secretHash = computeMessageSecretHash(secret); const receipt = await token.methods.mint_private(initialBalance, secretHash).send().wait(); - expect(receipt.status).toEqual(TxStatus.MINED); const storageSlot = new Fr(5); const noteTypeId = new Fr(84114971101151129711410111011678111116101n); // TransparentNote @@ -79,9 +77,7 @@ describe('e2e_multiple_accounts_1_enc_key', () => { ); await pxe.addNote(extendedNote); - expect((await token.methods.redeem_shield(accounts[0], initialBalance, secret).send().wait()).status).toEqual( - TxStatus.MINED, - ); + await token.methods.redeem_shield(accounts[0], initialBalance, secret).send().wait(); }, 100_000); afterEach(() => teardown()); @@ -110,8 +106,7 @@ describe('e2e_multiple_accounts_1_enc_key', () => { const contractWithWallet = await TokenContract.at(tokenAddress, wallets[senderIndex]); - const receipt = await contractWithWallet.methods.transfer(sender, receiver, transferAmount, 0).send().wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await contractWithWallet.methods.transfer(sender, receiver, transferAmount, 0).send().wait(); for (let i = 0; i < expectedBalances.length; i++) { await expectBalance(i, expectedBalances[i]); diff --git a/yarn-project/end-to-end/src/e2e_ordering.test.ts b/yarn-project/end-to-end/src/e2e_ordering.test.ts index 14a1aa10195..68836b1b2e3 100644 --- a/yarn-project/end-to-end/src/e2e_ordering.test.ts +++ b/yarn-project/end-to-end/src/e2e_ordering.test.ts @@ -1,5 +1,5 @@ // Test suite for testing proper ordering of side effects -import { Fr, FunctionSelector, PXE, TxStatus, Wallet, toBigIntBE } from '@aztec/aztec.js'; +import { Fr, FunctionSelector, PXE, Wallet, toBigIntBE } from '@aztec/aztec.js'; import { ChildContract } from '@aztec/noir-contracts.js/Child'; import { ParentContract } from '@aztec/noir-contracts.js/Parent'; @@ -100,9 +100,7 @@ describe('e2e_ordering', () => { async method => { const expectedOrder = expectedOrders[method]; - const tx = child.methods[method]().send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await child.methods[method]().send().wait(); const value = await pxe.getPublicStorageAt(child.address, new Fr(1)); expect(value.value).toBe(expectedOrder[1]); // final state should match last value set @@ -119,9 +117,7 @@ describe('e2e_ordering', () => { it.each(['setValueTwiceWithNestedLast'] as const)('orders unencrypted logs in %s', async method => { const expectedOrder = expectedOrders[method]; - const tx = child.methods[method]().send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await child.methods[method]().send().wait(); // Logs are emitted in the expected order await expectLogsFromLastBlockToBe(expectedOrder); diff --git a/yarn-project/end-to-end/src/e2e_p2p_network.test.ts b/yarn-project/end-to-end/src/e2e_p2p_network.test.ts index 45258e3eefc..5f8c8030176 100644 --- a/yarn-project/end-to-end/src/e2e_p2p_network.test.ts +++ b/yarn-project/end-to-end/src/e2e_p2p_network.test.ts @@ -60,12 +60,7 @@ describe('e2e_p2p_network', () => { } // now ensure that all txs were successfully mined - for (const context of contexts) { - for (const tx of context.txs) { - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); - } - } + await Promise.all(contexts.flatMap(context => context.txs.map(tx => tx.wait()))); // shutdown all nodes. for (const context of contexts) { diff --git a/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts b/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts index f4d772af157..37e1cbdefdb 100644 --- a/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts @@ -1,4 +1,4 @@ -import { AztecAddress, AztecNode, CompleteAddress, DebugLogger, Fr, TxStatus, Wallet } from '@aztec/aztec.js'; +import { AztecAddress, AztecNode, CompleteAddress, DebugLogger, Fr, Wallet } from '@aztec/aztec.js'; import { PendingNoteHashesContract } from '@aztec/noir-contracts.js/PendingNoteHashes'; import { setup } from './fixtures/utils.js'; @@ -63,11 +63,7 @@ describe('e2e_pending_note_hashes_contract', () => { const deployedContract = await deployContract(); - const receipt = await deployedContract.methods - .test_insert_then_get_then_nullify_flat(mintAmount, owner) - .send() - .wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await deployedContract.methods.test_insert_then_get_then_nullify_flat(mintAmount, owner).send().wait(); }, 60_000); it('Squash! Aztec.nr function can "create" and "nullify" note in the same TX', async () => { @@ -77,7 +73,7 @@ describe('e2e_pending_note_hashes_contract', () => { const deployedContract = await deployContract(); - const receipt = await deployedContract.methods + await deployedContract.methods .test_insert_then_get_then_nullify_all_in_nested_calls( mintAmount, owner, @@ -88,8 +84,6 @@ describe('e2e_pending_note_hashes_contract', () => { .send() .wait(); - expect(receipt.status).toBe(TxStatus.MINED); - await expectNoteHashesSquashedExcept(0); await expectNullifiersSquashedExcept(0); }, 60_000); @@ -101,7 +95,7 @@ describe('e2e_pending_note_hashes_contract', () => { const deployedContract = await deployContract(); - const receipt = await deployedContract.methods + await deployedContract.methods .test_insert2_then_get2_then_nullify2_all_in_nested_calls( mintAmount, owner, @@ -111,8 +105,6 @@ describe('e2e_pending_note_hashes_contract', () => { .send() .wait(); - expect(receipt.status).toBe(TxStatus.MINED); - await expectNoteHashesSquashedExcept(0); await expectNullifiersSquashedExcept(0); }, 60_000); @@ -125,7 +117,7 @@ describe('e2e_pending_note_hashes_contract', () => { const deployedContract = await deployContract(); - const receipt = await deployedContract.methods + await deployedContract.methods .test_insert2_then_get2_then_nullify1_all_in_nested_calls( mintAmount, owner, @@ -135,8 +127,6 @@ describe('e2e_pending_note_hashes_contract', () => { .send() .wait(); - expect(receipt.status).toBe(TxStatus.MINED); - await expectNoteHashesSquashedExcept(1); await expectNullifiersSquashedExcept(0); }, 60_000); @@ -152,14 +142,13 @@ describe('e2e_pending_note_hashes_contract', () => { const deployedContract = await deployContract(); // create persistent note - const receipt0 = await deployedContract.methods.insert_note(mintAmount, owner).send().wait(); - expect(receipt0.status).toBe(TxStatus.MINED); + await deployedContract.methods.insert_note(mintAmount, owner).send().wait(); await expectNoteHashesSquashedExcept(1); // first TX just creates 1 persistent note await expectNullifiersSquashedExcept(0); // create another note, and nullify it and AND nullify the above-created note in the same TX - const receipt1 = await deployedContract.methods + await deployedContract.methods .test_insert1_then_get2_then_nullify2_all_in_nested_calls( mintAmount, owner, @@ -170,8 +159,6 @@ describe('e2e_pending_note_hashes_contract', () => { .send() .wait(); - expect(receipt1.status).toBe(TxStatus.MINED); - // second TX creates 1 note, but it is squashed! await expectNoteHashesSquashedExcept(0); // the nullifier corresponding to this transient note is squashed, but the @@ -188,14 +175,12 @@ describe('e2e_pending_note_hashes_contract', () => { const mintAmount = 65n; const deployedContract = await deployContract(); - const receipt = await deployedContract.methods.insert_note(mintAmount, owner).send().wait(); - - expect(receipt.status).toBe(TxStatus.MINED); + await deployedContract.methods.insert_note(mintAmount, owner).send().wait(); // There is a single new note hash. await expectNoteHashesSquashedExcept(1); - const receipt2 = await deployedContract.methods + await deployedContract.methods .test_insert_then_get_then_nullify_all_in_nested_calls( mintAmount, owner, @@ -206,8 +191,6 @@ describe('e2e_pending_note_hashes_contract', () => { .send() .wait(); - expect(receipt2.status).toBe(TxStatus.MINED); - // There is a single new nullifier. await expectNullifiersSquashedExcept(1); }, 60_000); diff --git a/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts b/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts index e76bd607092..7d700bdffdc 100644 --- a/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts @@ -1,4 +1,4 @@ -import { AccountWallet, AztecAddress, CompleteAddress, DebugLogger, Fr, TxStatus } from '@aztec/aztec.js'; +import { AccountWallet, AztecAddress, CompleteAddress, DebugLogger, Fr } from '@aztec/aztec.js'; import { EasyPrivateVotingContract } from '@aztec/noir-contracts.js/EasyPrivateVoting'; import { setup } from './fixtures/utils.js'; @@ -32,9 +32,7 @@ describe('e2e_voting_contract', () => { describe('votes', () => { it('votes', async () => { const candidate = new Fr(1); - const tx = votingContract.methods.cast_vote(candidate).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await votingContract.methods.cast_vote(candidate).send().wait(); expect(await votingContract.methods.get_vote(candidate).view()).toBe(1n); }); }); diff --git a/yarn-project/end-to-end/src/e2e_token_contract.test.ts b/yarn-project/end-to-end/src/e2e_token_contract.test.ts index 8a000a73af7..4cfb50b756c 100644 --- a/yarn-project/end-to-end/src/e2e_token_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_token_contract.test.ts @@ -7,7 +7,6 @@ import { FunctionSelector, Note, TxHash, - TxStatus, computeAuthWitMessageHash, computeMessageSecretHash, } from '@aztec/aztec.js'; @@ -112,10 +111,7 @@ describe('e2e_token_contract', () => { const t = toString(await asset.methods.un_get_name().view()); expect(t).toBe(TOKEN_NAME); - const tx = reader.methods[method](asset.address, TOKEN_NAME).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); - + await reader.methods[method](asset.address, TOKEN_NAME).send().wait(); await expect(reader.methods[method](asset.address, 'WRONG_NAME').simulate()).rejects.toThrow(errorMessage); }); }); @@ -125,9 +121,7 @@ describe('e2e_token_contract', () => { const t = toString(await asset.methods.un_get_symbol().view()); expect(t).toBe(TOKEN_SYMBOL); - const tx = reader.methods.check_symbol_private(asset.address, TOKEN_SYMBOL).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await reader.methods.check_symbol_private(asset.address, TOKEN_SYMBOL).send().wait(); await expect( reader.methods.check_symbol_private(asset.address, 'WRONG_SYMBOL').simulate(), @@ -137,9 +131,7 @@ describe('e2e_token_contract', () => { const t = toString(await asset.methods.un_get_symbol().view()); expect(t).toBe(TOKEN_SYMBOL); - const tx = reader.methods.check_symbol_public(asset.address, TOKEN_SYMBOL).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await reader.methods.check_symbol_public(asset.address, TOKEN_SYMBOL).send().wait(); await expect(reader.methods.check_symbol_public(asset.address, 'WRONG_SYMBOL').simulate()).rejects.toThrowError( "Failed to solve brillig function, reason: explicit trap hit in brillig 'symbol.is_eq(_what)'", @@ -152,9 +144,7 @@ describe('e2e_token_contract', () => { const t = await asset.methods.un_get_decimals().view(); expect(t).toBe(TOKEN_DECIMALS); - const tx = reader.methods.check_decimals_private(asset.address, TOKEN_DECIMALS).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await reader.methods.check_decimals_private(asset.address, TOKEN_DECIMALS).send().wait(); await expect(reader.methods.check_decimals_private(asset.address, 99).simulate()).rejects.toThrowError( "Cannot satisfy constraint 'ret[0] as u8 == what'", @@ -165,9 +155,7 @@ describe('e2e_token_contract', () => { const t = await asset.methods.un_get_decimals().view(); expect(t).toBe(TOKEN_DECIMALS); - const tx = reader.methods.check_decimals_public(asset.address, TOKEN_DECIMALS).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await reader.methods.check_decimals_public(asset.address, TOKEN_DECIMALS).send().wait(); await expect(reader.methods.check_decimals_public(asset.address, 99).simulate()).rejects.toThrowError( "Failed to solve brillig function, reason: explicit trap hit in brillig 'ret[0] as u8 == what'", @@ -178,23 +166,17 @@ describe('e2e_token_contract', () => { describe('Access controlled functions', () => { it('Set admin', async () => { - const tx = asset.methods.set_admin(accounts[1].address).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.set_admin(accounts[1].address).send().wait(); expect(await asset.methods.admin().view()).toBe(accounts[1].address.toBigInt()); }); it('Add minter as admin', async () => { - const tx = asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, true).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, true).send().wait(); expect(await asset.methods.is_minter(accounts[1].address).view()).toBe(true); }); it('Revoke minter as admin', async () => { - const tx = asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, false).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, false).send().wait(); expect(await asset.methods.is_minter(accounts[1].address).view()).toBe(false); }); @@ -216,9 +198,7 @@ describe('e2e_token_contract', () => { describe('Public', () => { it('as minter', async () => { const amount = 10000n; - const tx = asset.methods.mint_public(accounts[0].address, amount).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.mint_public(accounts[0].address, amount).send().wait(); tokenSim.mintPublic(accounts[0].address, amount); expect(await asset.methods.balance_of_public(accounts[0].address).view()).toEqual( @@ -270,9 +250,7 @@ describe('e2e_token_contract', () => { describe('Mint flow', () => { it('mint_private as minter', async () => { - const tx = asset.methods.mint_private(amount, secretHash).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + const receipt = await asset.methods.mint_private(amount, secretHash).send().wait(); tokenSim.mintPrivate(amount); txHash = receipt.txHash; }); @@ -283,7 +261,6 @@ describe('e2e_token_contract', () => { // docs:start:debug const receiptClaim = await txClaim.wait({ debug: true }); // docs:end:debug - expect(receiptClaim.status).toBe(TxStatus.MINED); tokenSim.redeemShield(accounts[0].address, amount); // 1 note should be created containing `amount` of tokens const { visibleNotes } = receiptClaim.debugInfo!; @@ -339,9 +316,7 @@ describe('e2e_token_contract', () => { const balance0 = await asset.methods.balance_of_public(accounts[0].address).view(); const amount = balance0 / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, 0).send().wait(); tokenSim.transferPublic(accounts[0].address, accounts[1].address, amount); }); @@ -350,9 +325,7 @@ describe('e2e_token_contract', () => { const balance = await asset.methods.balance_of_public(accounts[0].address).view(); const amount = balance / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.transfer_public(accounts[0].address, accounts[0].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.transfer_public(accounts[0].address, accounts[0].address, amount, 0).send().wait(); tokenSim.transferPublic(accounts[0].address, accounts[0].address, amount); }); @@ -373,9 +346,7 @@ describe('e2e_token_contract', () => { // docs:end:authwit_public_transfer_example // Perform the transfer - const tx = action.send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await action.send().wait(); tokenSim.transferPublic(accounts[0].address, accounts[1].address, amount); @@ -533,9 +504,7 @@ describe('e2e_token_contract', () => { const balance0 = await asset.methods.balance_of_private(accounts[0].address).view(); const amount = balance0 / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 0).send().wait(); tokenSim.transferPrivate(accounts[0].address, accounts[1].address, amount); }); @@ -543,9 +512,7 @@ describe('e2e_token_contract', () => { const balance0 = await asset.methods.balance_of_private(accounts[0].address).view(); const amount = balance0 / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.transfer(accounts[0].address, accounts[0].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.transfer(accounts[0].address, accounts[0].address, amount, 0).send().wait(); tokenSim.transferPrivate(accounts[0].address, accounts[0].address, amount); }); @@ -569,9 +536,7 @@ describe('e2e_token_contract', () => { // docs:end:authwit_transfer_example // Perform the transfer - const tx = action.send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await action.send().wait(); tokenSim.transferPrivate(accounts[0].address, accounts[1].address, amount); // Perform the transfer again, should fail @@ -726,18 +691,14 @@ describe('e2e_token_contract', () => { const amount = balancePub / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.shield(accounts[0].address, amount, secretHash, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + const receipt = await asset.methods.shield(accounts[0].address, amount, secretHash, 0).send().wait(); tokenSim.shield(accounts[0].address, amount); await tokenSim.check(); // Redeem it await addPendingShieldNoteToPXE(0, amount, secretHash, receipt.txHash); - const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send(); - const receiptClaim = await txClaim.wait(); - expect(receiptClaim.status).toBe(TxStatus.MINED); + await asset.methods.redeem_shield(accounts[0].address, amount, secret).send().wait(); tokenSim.redeemShield(accounts[0].address, amount); }); @@ -753,9 +714,7 @@ describe('e2e_token_contract', () => { const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request()); await wallets[0].setPublicAuth(messageHash, true).send().wait(); - const tx = action.send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + const receipt = await action.send().wait(); tokenSim.shield(accounts[0].address, amount); await tokenSim.check(); @@ -769,9 +728,7 @@ describe('e2e_token_contract', () => { // Redeem it await addPendingShieldNoteToPXE(0, amount, secretHash, receipt.txHash); - const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send(); - const receiptClaim = await txClaim.wait(); - expect(receiptClaim.status).toBe(TxStatus.MINED); + await asset.methods.redeem_shield(accounts[0].address, amount, secret).send().wait(); tokenSim.redeemShield(accounts[0].address, amount); }); @@ -844,9 +801,7 @@ describe('e2e_token_contract', () => { const amount = balancePriv / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 0).send().wait(); tokenSim.unshield(accounts[0].address, accounts[0].address, amount); }); @@ -869,9 +824,7 @@ describe('e2e_token_contract', () => { const witness = await wallets[0].createAuthWitness(messageHash); await wallets[1].addAuthWitness(witness); - const tx = action.send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await action.send().wait(); tokenSim.unshield(accounts[0].address, accounts[1].address, amount); // Perform the transfer again, should fail @@ -956,9 +909,7 @@ describe('e2e_token_contract', () => { const balance0 = await asset.methods.balance_of_public(accounts[0].address).view(); const amount = balance0 / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.burn_public(accounts[0].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.burn_public(accounts[0].address, amount, 0).send().wait(); tokenSim.burnPublic(accounts[0].address, amount); }); @@ -974,9 +925,7 @@ describe('e2e_token_contract', () => { const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request()); await wallets[0].setPublicAuth(messageHash, true).send().wait(); - const tx = action.send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await action.send().wait(); tokenSim.burnPublic(accounts[0].address, amount); @@ -1051,9 +1000,7 @@ describe('e2e_token_contract', () => { const balance0 = await asset.methods.balance_of_private(accounts[0].address).view(); const amount = balance0 / 2n; expect(amount).toBeGreaterThan(0n); - const tx = asset.methods.burn(accounts[0].address, amount, 0).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.methods.burn(accounts[0].address, amount, 0).send().wait(); tokenSim.burnPrivate(accounts[0].address, amount); }); @@ -1073,9 +1020,7 @@ describe('e2e_token_contract', () => { const witness = await wallets[0].createAuthWitness(messageHash); await wallets[1].addAuthWitness(witness); - const tx = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce).send().wait(); tokenSim.burnPrivate(accounts[0].address, amount); // Perform the transfer again, should fail diff --git a/yarn-project/end-to-end/src/guides/dapp_testing.test.ts b/yarn-project/end-to-end/src/guides/dapp_testing.test.ts index 9bf90e5e4ae..34decec01e9 100644 --- a/yarn-project/end-to-end/src/guides/dapp_testing.test.ts +++ b/yarn-project/end-to-end/src/guides/dapp_testing.test.ts @@ -6,7 +6,6 @@ import { Fr, Note, PXE, - TxStatus, computeMessageSecretHash, createPXEClient, waitForPXE, @@ -255,8 +254,7 @@ describe('guides/dapp/testing', () => { it('asserts a transaction with a failing public call is included (with no state changes)', async () => { // docs:start:pub-reverted const call = token.methods.transfer_public(owner.getAddress(), recipient.getAddress(), 1000n, 0); - const receipt = await call.send({ skipPublicSimulation: true }).wait(); - expect(receipt.status).toEqual(TxStatus.MINED); + await call.send({ skipPublicSimulation: true }).wait(); const ownerPublicBalanceSlot = cheats.aztec.computeSlotInMap(6n, owner.getAddress()); const balance = await pxe.getPublicStorageAt(token.address, ownerPublicBalanceSlot); expect(balance.value).toEqual(100n); diff --git a/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts b/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts index cf368845f2d..4f873c3ab3b 100644 --- a/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts +++ b/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts @@ -4,7 +4,6 @@ import { EthAddress, Fr, PXE, - TxStatus, Wallet, computeMessageSecretHash, deployL1Contract, @@ -257,9 +256,7 @@ class GasBridgingTestHarness implements IGasBridgingTestHarness { async consumeMessageOnAztecAndMintPublicly(bridgeAmount: bigint, owner: AztecAddress, secret: Fr) { this.logger('Consuming messages on L2 Publicly'); // Call the mint tokens function on the Aztec.nr contract - const tx = this.l2Token.methods.claim_public(owner, bridgeAmount, secret).send(); - const receipt = await tx.wait(); - expect(receipt.status).toBe(TxStatus.MINED); + await this.l2Token.methods.claim_public(owner, bridgeAmount, secret).send().wait(); } async getL2PublicBalanceOf(owner: AztecAddress) { diff --git a/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts b/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts index 00ab5e70468..e8030397e6b 100644 --- a/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts +++ b/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts @@ -6,7 +6,6 @@ import { EthAddress, Fr, PXE, - TxStatus, computeAuthWitMessageHash, } from '@aztec/aztec.js'; import { deployL1Contract } from '@aztec/ethereum'; @@ -218,7 +217,7 @@ export const uniswapL1L2TestSuite = ( daiCrossChainHarness.generateClaimSecret(); const [secretForRedeemingDai, secretHashForRedeemingDai] = daiCrossChainHarness.generateClaimSecret(); - const withdrawReceipt = await uniswapL2Contract.methods + await uniswapL2Contract.methods .swap_private( wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, @@ -233,7 +232,6 @@ export const uniswapL1L2TestSuite = ( ) .send() .wait(); - expect(withdrawReceipt.status).toBe(TxStatus.MINED); // ensure that user's funds were burnt await wethCrossChainHarness.expectPrivateBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge); // ensure that uniswap contract didn't eat the funds. @@ -378,8 +376,7 @@ export const uniswapL1L2TestSuite = ( await ownerWallet.setPublicAuth(swapMessageHash, true).send().wait(); // 4.2 Call swap_public from user2 on behalf of owner - const withdrawReceipt = await action.send().wait(); - expect(withdrawReceipt.status).toBe(TxStatus.MINED); + await action.send().wait(); // check weth balance of owner on L2 (we first bridged `wethAmountToBridge` into L2 and now withdrew it!) await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge); @@ -538,7 +535,7 @@ export const uniswapL1L2TestSuite = ( // No approval to call `swap` but should work even without it: const [_, secretHashForDepositingSwappedDai] = daiCrossChainHarness.generateClaimSecret(); - const withdrawReceipt = await uniswapL2Contract.methods + await uniswapL2Contract.methods .swap_public( ownerAddress, wethCrossChainHarness.l2Bridge.address, @@ -554,7 +551,6 @@ export const uniswapL1L2TestSuite = ( ) .send() .wait(); - expect(withdrawReceipt.status).toBe(TxStatus.MINED); // check weth balance of owner on L2 (we first bridged `wethAmountToBridge` into L2 and now withdrew it!) await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, 0n); }); @@ -646,7 +642,7 @@ export const uniswapL1L2TestSuite = ( logger('Withdrawing weth to L1 and sending message to swap to dai'); const secretHashForDepositingSwappedDai = Fr.random(); - const withdrawReceipt = await uniswapL2Contract.methods + await uniswapL2Contract.methods .swap_private( wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, @@ -661,7 +657,6 @@ export const uniswapL1L2TestSuite = ( ) .send() .wait(); - expect(withdrawReceipt.status).toBe(TxStatus.MINED); // ensure that user's funds were burnt await wethCrossChainHarness.expectPrivateBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge); @@ -700,7 +695,7 @@ export const uniswapL1L2TestSuite = ( // Call swap_public on L2 const secretHashForDepositingSwappedDai = Fr.random(); - const withdrawReceipt = await uniswapL2Contract.methods + await uniswapL2Contract.methods .swap_public( ownerAddress, wethCrossChainHarness.l2Bridge.address, @@ -716,7 +711,6 @@ export const uniswapL1L2TestSuite = ( ) .send() .wait(); - expect(withdrawReceipt.status).toBe(TxStatus.MINED); // check weth balance of owner on L2 (we first bridged `wethAmountToBridge` into L2 and now withdrew it!) await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, 0n);