Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: nuking accounts from e2e setup #5574

Merged
merged 3 commits into from
Apr 4, 2024
Merged

refactor: nuking accounts from e2e setup #5574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f66d2f
refactor: nuking accounts from e2e setup
benesjan Apr 4, 2024
0f4ff23
fix
benesjan Apr 4, 2024
69a76ad
cleanup
benesjan Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions yarn-project/end-to-end/src/benchmarks/bench_tx_size_fees.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
type AccountWalletWithPrivateKey,
type AztecAddress,
type EthAddress,
type FeePaymentMethod,
NativeFeePaymentMethod,
PrivateFeePaymentMethod,
Expand All @@ -13,40 +14,40 @@ import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token

import { jest } from '@jest/globals';

import { type EndToEndContext, publicDeployAccounts, setup } from '../fixtures/utils.js';
import { publicDeployAccounts, setup } from '../fixtures/utils.js';

jest.setTimeout(50_000);

describe('benchmarks/tx_size_fees', () => {
let ctx: EndToEndContext;
let aliceWallet: AccountWalletWithPrivateKey;
let bobAddress: AztecAddress;
let sequencerAddress: AztecAddress;
let gas: GasTokenContract;
let fpc: FPCContract;
let token: TokenContract;
let gasPortalAddress: EthAddress;

// setup the environment
beforeAll(async () => {
ctx = await setup(3);
aliceWallet = ctx.wallets[0];
bobAddress = ctx.wallets[1].getAddress();
sequencerAddress = ctx.wallets[2].getAddress();
const { wallets, aztecNode, deployL1ContractsValues } = await setup(3);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very much like putting this in line with all the other e2e tests


await ctx.aztecNode.setConfig({
gasPortalAddress = deployL1ContractsValues.l1ContractAddresses.gasPortalAddress;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wdyt about sticking to this as a convention?

Suggested change
gasPortalAddress = deployL1ContractsValues.l1ContractAddresses.gasPortalAddress;
({gasPortalAddress} = deployL1ContractsValues.l1ContractAddresses);

Pros: Slightly more terse
Cons: More error prone if fucking something up with semicolons, arguably harder to read ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in this case it doesn't matter much.


aliceWallet = wallets[0];
bobAddress = wallets[1].getAddress();
sequencerAddress = wallets[2].getAddress();

await aztecNode.setConfig({
feeRecipient: sequencerAddress,
allowedFeePaymentContractClasses: [getContractClassFromArtifact(FPCContract.artifact).id],
});

await publicDeployAccounts(aliceWallet, ctx.accounts);
await publicDeployAccounts(aliceWallet, wallets);
});

// deploy the contracts
beforeAll(async () => {
gas = await GasTokenContract.at(
getCanonicalGasTokenAddress(ctx.deployL1ContractsValues.l1ContractAddresses.gasPortalAddress),
aliceWallet,
);
gas = await GasTokenContract.at(getCanonicalGasTokenAddress(gasPortalAddress), aliceWallet);
token = await TokenContract.deploy(aliceWallet, aliceWallet.getAddress(), 'test', 'test', 18).send().deployed();
fpc = await FPCContract.deploy(aliceWallet, token.address, gas.address).send().deployed();
});
Expand Down
83 changes: 43 additions & 40 deletions yarn-project/end-to-end/src/e2e_2_pxes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { getUnsafeSchnorrAccount } from '@aztec/accounts/single_key';
import {
type AztecAddress,
type AztecNode,
type CompleteAddress,
type DebugLogger,
ExtendedNote,
Fr,
Expand All @@ -29,29 +28,22 @@ describe('e2e_2_pxes', () => {
let pxeB: PXE;
let walletA: Wallet;
let walletB: Wallet;
let userA: CompleteAddress;
let userB: CompleteAddress;
let logger: DebugLogger;
let teardownA: () => Promise<void>;

beforeEach(async () => {
let accounts: CompleteAddress[] = [];
({
aztecNode,
pxe: pxeA,
accounts,
wallets: [walletA],
logger,
teardown: teardownA,
} = await setup(1));
[userA] = accounts;

({
pxe: pxeB,
accounts: accounts,
wallets: [walletB],
} = await setupPXEService(1, aztecNode!, {}, undefined, true));
[userB] = accounts;
}, 100_000);

afterEach(async () => {
Expand Down Expand Up @@ -121,13 +113,13 @@ describe('e2e_2_pxes', () => {
const transferAmount1 = 654n;
const transferAmount2 = 323n;

const tokenInstance = await deployTokenContract(initialBalance, userA.address, pxeA);
const tokenInstance = await deployTokenContract(initialBalance, walletA.getAddress(), pxeA);
const tokenAddress = tokenInstance.address;

// Add account B to wallet A
await pxeA.registerRecipient(userB);
await pxeA.registerRecipient(walletB.getCompleteAddress());
// Add account A to wallet B
await pxeB.registerRecipient(userA);
await pxeB.registerRecipient(walletA.getCompleteAddress());

// Add token to PXE B (PXE A already has it because it was deployed through it)
await pxeB.registerContract({
Expand All @@ -136,29 +128,37 @@ describe('e2e_2_pxes', () => {
});

// Check initial balances and logs are as expected
await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance);
await expectTokenBalance(walletB, tokenAddress, userB.address, 0n);
await expectTokenBalance(walletA, tokenAddress, walletA.getAddress(), initialBalance);
await expectTokenBalance(walletB, tokenAddress, walletB.getAddress(), 0n);
await expectsNumOfEncryptedLogsInTheLastBlockToBe(aztecNode, 1);

// Transfer funds from A to B via PXE A
const contractWithWalletA = await TokenContract.at(tokenAddress, walletA);
await contractWithWalletA.methods.transfer(userA.address, userB.address, transferAmount1, 0).send().wait();
await contractWithWalletA.methods
.transfer(walletA.getAddress(), walletB.getAddress(), transferAmount1, 0)
.send()
.wait();

// Check balances and logs are as expected
await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance - transferAmount1);
await expectTokenBalance(walletB, tokenAddress, userB.address, transferAmount1);
await expectTokenBalance(walletA, tokenAddress, walletA.getAddress(), initialBalance - transferAmount1);
await expectTokenBalance(walletB, tokenAddress, walletB.getAddress(), transferAmount1);
await expectsNumOfEncryptedLogsInTheLastBlockToBe(aztecNode, 2);

// Transfer funds from B to A via PXE B
const contractWithWalletB = await TokenContract.at(tokenAddress, walletB);
await contractWithWalletB.methods
.transfer(userB.address, userA.address, transferAmount2, 0)
.transfer(walletB.getAddress(), walletA.getAddress(), transferAmount2, 0)
.send()
.wait({ interval: 0.1 });

// Check balances and logs are as expected
await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance - transferAmount1 + transferAmount2);
await expectTokenBalance(walletB, tokenAddress, userB.address, transferAmount1 - transferAmount2);
await expectTokenBalance(
walletA,
tokenAddress,
walletA.getAddress(),
initialBalance - transferAmount1 + transferAmount2,
);
await expectTokenBalance(walletB, tokenAddress, walletB.getAddress(), transferAmount1 - transferAmount2);
await expectsNumOfEncryptedLogsInTheLastBlockToBe(aztecNode, 2);
}, 120_000);

Expand Down Expand Up @@ -209,13 +209,13 @@ describe('e2e_2_pxes', () => {
const userABalance = 100n;
const userBBalance = 150n;

const tokenInstance = await deployTokenContract(userABalance, userA.address, pxeA);
const tokenInstance = await deployTokenContract(userABalance, walletA.getAddress(), pxeA);
const contractWithWalletA = await TokenContract.at(tokenInstance.address, walletA);

// Add account B to wallet A
await pxeA.registerRecipient(userB);
await pxeA.registerRecipient(walletB.getCompleteAddress());
// Add account A to wallet B
await pxeB.registerRecipient(userA);
await pxeB.registerRecipient(walletA.getCompleteAddress());

// Add token to PXE B (PXE A already has it because it was deployed through it)
await pxeB.registerContract({
Expand All @@ -224,20 +224,20 @@ describe('e2e_2_pxes', () => {
});

// Mint tokens to user B
await mintTokens(contractWithWalletA, userB.address, userBBalance, pxeA);
await mintTokens(contractWithWalletA, walletB.getAddress(), userBBalance, pxeA);

// Check that user A balance is 100 on server A
await expectTokenBalance(walletA, tokenInstance.address, userA.address, userABalance);
await expectTokenBalance(walletA, tokenInstance.address, walletA.getAddress(), userABalance);
// Check that user B balance is 150 on server B
await expectTokenBalance(walletB, tokenInstance.address, userB.address, userBBalance);
await expectTokenBalance(walletB, tokenInstance.address, walletB.getAddress(), userBBalance);

// CHECK THAT PRIVATE BALANCES ARE 0 WHEN ACCOUNT'S PRIVATE KEYS ARE NOT REGISTERED
// Note: Not checking if the account is synchronized because it is not registered as an account (it would throw).
const checkIfSynchronized = false;
// Check that user A balance is 0 on server B
await expectTokenBalance(walletB, tokenInstance.address, userA.address, 0n, checkIfSynchronized);
await expectTokenBalance(walletB, tokenInstance.address, walletA.getAddress(), 0n, checkIfSynchronized);
// Check that user B balance is 0 on server A
await expectTokenBalance(walletA, tokenInstance.address, userB.address, 0n, checkIfSynchronized);
await expectTokenBalance(walletA, tokenInstance.address, walletB.getAddress(), 0n, checkIfSynchronized);
});

it('permits migrating an account from one PXE to another', async () => {
Expand All @@ -262,31 +262,34 @@ describe('e2e_2_pxes', () => {
const initialBalance = 987n;
const transferAmount1 = 654n;

const tokenInstance = await deployTokenContract(initialBalance, userA.address, pxeA);
const tokenInstance = await deployTokenContract(initialBalance, walletA.getAddress(), pxeA);
const tokenAddress = tokenInstance.address;

// Add account B to wallet A
await pxeA.registerRecipient(userB);
await pxeA.registerRecipient(walletB.getCompleteAddress());
// Add account A to wallet B
await pxeB.registerRecipient(userA);
await pxeB.registerRecipient(walletA.getCompleteAddress());

// Check initial balances and logs are as expected
await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance);
await expectTokenBalance(walletA, tokenAddress, walletA.getAddress(), initialBalance);
// don't check userB yet

await expectsNumOfEncryptedLogsInTheLastBlockToBe(aztecNode, 1);

// Transfer funds from A to B via PXE A
const contractWithWalletA = await TokenContract.at(tokenAddress, walletA);
await contractWithWalletA.methods.transfer(userA.address, userB.address, transferAmount1, 0).send().wait();
await contractWithWalletA.methods
.transfer(walletA.getAddress(), walletB.getAddress(), transferAmount1, 0)
.send()
.wait();

// now add the contract and check balances
await pxeB.registerContract({
artifact: TokenContract.artifact,
instance: tokenInstance,
});
await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance - transferAmount1);
await expectTokenBalance(walletB, tokenAddress, userB.address, transferAmount1);
await expectTokenBalance(walletA, tokenAddress, walletA.getAddress(), initialBalance - transferAmount1);
await expectTokenBalance(walletB, tokenAddress, walletB.getAddress(), transferAmount1);
});

it('permits sending funds to a user, and spending them, before they have registered the contract', async () => {
Expand All @@ -305,28 +308,28 @@ describe('e2e_2_pxes', () => {
await sharedAccountOnB.register();
const sharedWalletOnB = await sharedAccountOnB.getWallet();

await pxeA.registerRecipient(userB);
await pxeA.registerRecipient(walletB.getCompleteAddress());

// deploy the contract on PXE A
const tokenInstance = await deployTokenContract(initialBalance, userA.address, pxeA);
const tokenInstance = await deployTokenContract(initialBalance, walletA.getAddress(), pxeA);
const tokenAddress = tokenInstance.address;

// Transfer funds from A to Shared Wallet via PXE A
const contractWithWalletA = await TokenContract.at(tokenAddress, walletA);
await contractWithWalletA.methods
.transfer(userA.address, sharedAccountAddress.address, transferAmount1, 0)
.transfer(walletA.getAddress(), sharedAccountAddress.address, transferAmount1, 0)
.send()
.wait();

// Now send funds from Shared Wallet to B via PXE A
const contractWithSharedWalletA = await TokenContract.at(tokenAddress, sharedWalletOnA);
await contractWithSharedWalletA.methods
.transfer(sharedAccountAddress.address, userB.address, transferAmount2, 0)
.transfer(sharedAccountAddress.address, walletB.getAddress(), transferAmount2, 0)
.send()
.wait();

// check balances from PXE-A's perspective
await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance - transferAmount1);
await expectTokenBalance(walletA, tokenAddress, walletA.getAddress(), initialBalance - transferAmount1);
await expectTokenBalance(
sharedWalletOnA,
tokenAddress,
Expand All @@ -343,7 +346,7 @@ describe('e2e_2_pxes', () => {
artifact: TokenContract.artifact,
instance: tokenInstance,
});
await expectTokenBalance(walletB, tokenAddress, userB.address, transferAmount2);
await expectTokenBalance(walletB, tokenAddress, walletB.getAddress(), transferAmount2);
await expect(sharedWalletOnB.isAccountStateSynchronized(sharedAccountAddress.address)).resolves.toBe(true);
await expectTokenBalance(
sharedWalletOnB,
Expand Down
13 changes: 3 additions & 10 deletions yarn-project/end-to-end/src/e2e_authwit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import {
type AccountWallet,
type CompleteAddress,
Fr,
computeInnerAuthWitHash,
computeOuterAuthWitHash,
} from '@aztec/aztec.js';
import { type AccountWallet, Fr, computeInnerAuthWitHash, computeOuterAuthWitHash } from '@aztec/aztec.js';
import { SchnorrAccountContract } from '@aztec/noir-contracts.js';

import { jest } from '@jest/globals';
Expand All @@ -17,14 +11,13 @@ describe('e2e_authwit_tests', () => {
jest.setTimeout(TIMEOUT);

let wallets: AccountWallet[];
let accounts: CompleteAddress[];

let chainId: Fr;
let version: Fr;

beforeAll(async () => {
({ wallets, accounts } = await setup(2));
await publicDeployAccounts(wallets[0], accounts.slice(0, 2));
({ wallets } = await setup(2));
await publicDeployAccounts(wallets[0], wallets.slice(0, 2));

const nodeInfo = await wallets[0].getNodeInfo();
chainId = new Fr(nodeInfo.chainId);
Expand Down
Loading
Loading