@aztec/end-to-end 4.0.0-devnet.1-patch.0 → 4.0.0-devnet.1-patch.1
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/bench/client_flows/client_flows_benchmark.d.ts +2 -2
- package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.js +1 -1
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +2 -2
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +2 -2
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
- package/dest/e2e_deploy_contract/deploy_test.d.ts +2 -2
- package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
- package/dest/e2e_fees/fees_test.d.ts +2 -2
- package/dest/e2e_fees/fees_test.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.d.ts +2 -2
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/shared.d.ts +2 -2
- package/dest/e2e_p2p/shared.d.ts.map +1 -1
- package/dest/e2e_p2p/shared.js +2 -1
- package/dest/e2e_token_contract/token_contract_test.d.ts +2 -2
- package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.d.ts +2 -2
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/setup.d.ts +2 -2
- package/dest/fixtures/setup.d.ts.map +1 -1
- package/dest/fixtures/setup.js +2 -1
- package/dest/shared/submit-transactions.d.ts +2 -2
- package/dest/shared/submit-transactions.d.ts.map +1 -1
- package/dest/shared/uniswap_l1_l2.d.ts +1 -1
- package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.d.ts +2 -2
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +3 -1
- package/dest/test-wallet/test_wallet.d.ts +82 -0
- package/dest/test-wallet/test_wallet.d.ts.map +1 -0
- package/dest/test-wallet/test_wallet.js +213 -0
- package/dest/test-wallet/utils.d.ts +41 -0
- package/dest/test-wallet/utils.d.ts.map +1 -0
- package/dest/test-wallet/utils.js +71 -0
- package/package.json +40 -39
- package/src/bench/client_flows/client_flows_benchmark.ts +1 -1
- package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +1 -1
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +1 -1
- package/src/e2e_deploy_contract/deploy_test.ts +1 -1
- package/src/e2e_fees/bridging_race.notest.ts +1 -1
- package/src/e2e_fees/fees_test.ts +1 -1
- package/src/e2e_p2p/p2p_network.ts +1 -1
- package/src/e2e_p2p/shared.ts +2 -1
- package/src/e2e_token_contract/token_contract_test.ts +1 -1
- package/src/fixtures/e2e_prover_test.ts +1 -1
- package/src/fixtures/setup.ts +2 -1
- package/src/shared/submit-transactions.ts +2 -1
- package/src/shared/uniswap_l1_l2.ts +1 -1
- package/src/spartan/setup_test_wallets.ts +3 -1
- package/src/test-wallet/test_wallet.ts +296 -0
- package/src/test-wallet/utils.ts +112 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup_test_wallets.d.ts","sourceRoot":"","sources":["../../src/spartan/setup_test_wallets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,EAAE,KAAK,gBAAgB,EAA6B,MAAM,qBAAqB,CAAC;AAEvF,OAAO,EAAE,KAAK,SAAS,EAAoC,MAAM,sBAAsB,CAAC;AAIxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"setup_test_wallets.d.ts","sourceRoot":"","sources":["../../src/spartan/setup_test_wallets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,EAAE,KAAK,gBAAgB,EAA6B,MAAM,qBAAqB,CAAC;AAEvF,OAAO,EAAE,KAAK,SAAS,EAAoC,MAAM,sBAAsB,CAAC;AAIxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO/D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,YAAY,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,YAAY,CAAC;IAC/B,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,YAAY,EACZ,cAAc,GAAG,eAAe,GAAG,WAAW,GAAG,mBAAmB,CACrE,CAAC;AAMF,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC,CAyBvB;AAED,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,YAAY,CAAC,CAuCvB;AAmDD,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,yBAAyB,CAAC,CAkBpC;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,YAAY,CAAC,CA+CvB;AAiFD,wBAAsB,gBAAgB,CAAC,EACrC,MAAM,EACN,YAAY,EACZ,MAAM,EACN,cAAc,EACd,MAAM,EACN,gBAAgB,EACjB,EAAE;IACD,MAAM,EAAE,UAAU,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,iBAqBA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC,CAqBxB"}
|
|
@@ -10,10 +10,12 @@ import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
|
10
10
|
import { createExtendedL1Client } from '@aztec/ethereum/client';
|
|
11
11
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
12
12
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
13
|
-
import {
|
|
13
|
+
import { registerInitialLocalNetworkAccountsInWallet } from '@aztec/wallets/testing';
|
|
14
14
|
import { getACVMConfig } from '../fixtures/get_acvm_config.js';
|
|
15
15
|
import { getBBConfig } from '../fixtures/get_bb_config.js';
|
|
16
16
|
import { getSponsoredFPCAddress, registerSponsoredFPC } from '../fixtures/utils.js';
|
|
17
|
+
import { TestWallet } from '../test-wallet/test_wallet.js';
|
|
18
|
+
import { proveInteraction } from '../test-wallet/utils.js';
|
|
17
19
|
const TOKEN_NAME = 'USDC';
|
|
18
20
|
const TOKEN_SYMBOL = 'USD';
|
|
19
21
|
const TOKEN_DECIMALS = 18n;
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { type Account, type AccountContract } from '@aztec/aztec.js/account';
|
|
2
|
+
import { type CallIntent, type ContractFunctionInteractionCallIntent, type IntentInnerHash, SetPublicAuthwitContractInteraction } from '@aztec/aztec.js/authorization';
|
|
3
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
4
|
+
import { AccountManager, type SendOptions } from '@aztec/aztec.js/wallet';
|
|
5
|
+
import { Fq, Fr } from '@aztec/foundation/curves/bn254';
|
|
6
|
+
import { type PXEConfig } from '@aztec/pxe/config';
|
|
7
|
+
import { PXE, type PXECreationOptions } from '@aztec/pxe/server';
|
|
8
|
+
import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
9
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
10
|
+
import type { NoteDao, NotesFilter } from '@aztec/stdlib/note';
|
|
11
|
+
import type { BlockHeader, TxHash, TxReceipt, TxSimulationResult } from '@aztec/stdlib/tx';
|
|
12
|
+
import { ExecutionPayload } from '@aztec/stdlib/tx';
|
|
13
|
+
import { BaseWallet, type FeeOptions } from '@aztec/wallet-sdk/base-wallet';
|
|
14
|
+
import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
15
|
+
/**
|
|
16
|
+
* Data for generating an account.
|
|
17
|
+
*/
|
|
18
|
+
export interface AccountData {
|
|
19
|
+
secret: Fr;
|
|
20
|
+
salt: Fr;
|
|
21
|
+
contract: AccountContract;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Wallet implementation that stores accounts in memory and provides extra debugging
|
|
25
|
+
* utilities
|
|
26
|
+
* It is intended to be used in e2e tests.
|
|
27
|
+
*/
|
|
28
|
+
export declare class TestWallet extends BaseWallet {
|
|
29
|
+
private readonly nodeRef;
|
|
30
|
+
constructor(pxe: PXE, nodeRef: AztecNodeProxy);
|
|
31
|
+
static create(node: AztecNode, overridePXEConfig?: Partial<PXEConfig>, options?: PXECreationOptions): Promise<TestWallet>;
|
|
32
|
+
/**
|
|
33
|
+
* Updates the underlying node that this wallet and its PXE communicate with.
|
|
34
|
+
* @param node - The new AztecNode to forward all calls to.
|
|
35
|
+
*/
|
|
36
|
+
updateNode(node: AztecNode): void;
|
|
37
|
+
createSchnorrAccount(secret: Fr, salt: Fr, signingKey?: Fq): Promise<AccountManager>;
|
|
38
|
+
createECDSARAccount(secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager>;
|
|
39
|
+
createECDSAKAccount(secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager>;
|
|
40
|
+
getFakeAccountDataFor(address: AztecAddress): Promise<{
|
|
41
|
+
account: import("@aztec/aztec.js/account").BaseAccount;
|
|
42
|
+
instance: import("@aztec/stdlib/contract").ContractInstanceWithAddress;
|
|
43
|
+
artifact: import("@aztec/stdlib/abi").ContractArtifact;
|
|
44
|
+
}>;
|
|
45
|
+
protected accounts: Map<string, Account>;
|
|
46
|
+
/**
|
|
47
|
+
* Toggle for running "simulated simulations" when calling simulateTx.
|
|
48
|
+
*
|
|
49
|
+
* When this flag is true, simulateViaEntrypoint constructs a request using a fake account
|
|
50
|
+
* (and accepts contract overrides on the input) and the PXE emulates kernel effects without
|
|
51
|
+
* generating kernel witnesses. When false, simulateViaEntrypoint defers to the standard
|
|
52
|
+
* simulation path via the real account entrypoint.
|
|
53
|
+
*/
|
|
54
|
+
private simulatedSimulations;
|
|
55
|
+
enableSimulatedSimulations(): void;
|
|
56
|
+
disableSimulatedSimulations(): void;
|
|
57
|
+
setMinFeePadding(value?: number): void;
|
|
58
|
+
protected getAccountFromAddress(address: AztecAddress): Promise<Account>;
|
|
59
|
+
getAccounts(): Promise<{
|
|
60
|
+
alias: string;
|
|
61
|
+
item: AztecAddress;
|
|
62
|
+
}[]>;
|
|
63
|
+
createAccount(accountData?: AccountData): Promise<AccountManager>;
|
|
64
|
+
lookupValidity(onBehalfOf: AztecAddress, intent: IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent, witness: AuthWitness): Promise<{
|
|
65
|
+
isValidInPrivate: boolean;
|
|
66
|
+
isValidInPublic: boolean;
|
|
67
|
+
}>;
|
|
68
|
+
setPublicAuthWit(from: AztecAddress, messageHashOrIntent: Fr | IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent, authorized: boolean): Promise<SetPublicAuthwitContractInteraction>;
|
|
69
|
+
createAuthWit(from: AztecAddress, intent: IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent): Promise<AuthWitness>;
|
|
70
|
+
/**
|
|
71
|
+
* Override simulateViaEntrypoint to use fake accounts for kernelless simulation
|
|
72
|
+
* when simulatedSimulations is enabled. Otherwise falls through to the real entrypoint path.
|
|
73
|
+
*/
|
|
74
|
+
protected simulateViaEntrypoint(executionPayload: ExecutionPayload, from: AztecAddress, feeOptions: FeeOptions, skipTxValidation?: boolean, skipFeeEnforcement?: boolean): Promise<TxSimulationResult>;
|
|
75
|
+
proveTx(exec: ExecutionPayload, opts: Omit<SendOptions, 'wait'>): Promise<ProvenTx>;
|
|
76
|
+
getTxReceipt(txHash: TxHash): Promise<TxReceipt>;
|
|
77
|
+
getNotes(filter: NotesFilter): Promise<NoteDao[]>;
|
|
78
|
+
getSyncedBlockHeader(): Promise<BlockHeader>;
|
|
79
|
+
sync(): Promise<void>;
|
|
80
|
+
stop(): Promise<void>;
|
|
81
|
+
}
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF93YWxsZXQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC90ZXN0X3dhbGxldC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXFCLE1BQU0seUJBQXlCLENBQUM7QUFDaEcsT0FBTyxFQUNMLEtBQUssVUFBVSxFQUNmLEtBQUsscUNBQXFDLEVBQzFDLEtBQUssZUFBZSxFQUNwQixtQ0FBbUMsRUFJcEMsTUFBTSwrQkFBK0IsQ0FBQztBQUN2QyxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsY0FBYyxFQUFFLEtBQUssV0FBVyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFMUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUV4RCxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQWdCLE1BQU0sbUJBQW1CLENBQUM7QUFDakUsT0FBTyxFQUFFLEdBQUcsRUFBRSxLQUFLLGtCQUFrQixFQUFhLE1BQU0sbUJBQW1CLENBQUM7QUFDNUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUczRCxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMzRixPQUFPLEVBQUUsZ0JBQWdCLEVBQTBCLE1BQU0sa0JBQWtCLENBQUM7QUFDNUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxLQUFLLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTVFLE9BQU8sRUFBRSxj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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test_wallet.d.ts","sourceRoot":"","sources":["../../src/test-wallet/test_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
import { EcdsaKAccountContract, EcdsaRAccountContract } from '@aztec/accounts/ecdsa';
|
|
2
|
+
import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
|
|
3
|
+
import { StubAccountContractArtifact, createStubAccount } from '@aztec/accounts/stub';
|
|
4
|
+
import { SignerlessAccount } from '@aztec/aztec.js/account';
|
|
5
|
+
import { SetPublicAuthwitContractInteraction, computeInnerAuthWitHashFromAction, isContractFunctionInteractionCallIntent, lookupValidity } from '@aztec/aztec.js/authorization';
|
|
6
|
+
import { AccountManager } from '@aztec/aztec.js/wallet';
|
|
7
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
8
|
+
import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
|
|
9
|
+
import { getPXEConfig } from '@aztec/pxe/config';
|
|
10
|
+
import { createPXE } from '@aztec/pxe/server';
|
|
11
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
12
|
+
import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
|
|
13
|
+
import { deriveSigningKey } from '@aztec/stdlib/keys';
|
|
14
|
+
import { mergeExecutionPayloads } from '@aztec/stdlib/tx';
|
|
15
|
+
import { BaseWallet } from '@aztec/wallet-sdk/base-wallet';
|
|
16
|
+
import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
17
|
+
/**
|
|
18
|
+
* Wallet implementation that stores accounts in memory and provides extra debugging
|
|
19
|
+
* utilities
|
|
20
|
+
* It is intended to be used in e2e tests.
|
|
21
|
+
*/ export class TestWallet extends BaseWallet {
|
|
22
|
+
nodeRef;
|
|
23
|
+
constructor(pxe, nodeRef){
|
|
24
|
+
super(pxe, nodeRef), this.nodeRef = nodeRef, this.accounts = new Map(), this.simulatedSimulations = false;
|
|
25
|
+
}
|
|
26
|
+
static async create(node, overridePXEConfig, options = {
|
|
27
|
+
loggers: {}
|
|
28
|
+
}) {
|
|
29
|
+
const nodeRef = new AztecNodeProxy(node);
|
|
30
|
+
const pxeConfig = Object.assign(getPXEConfig(), {
|
|
31
|
+
proverEnabled: overridePXEConfig?.proverEnabled ?? false,
|
|
32
|
+
...overridePXEConfig
|
|
33
|
+
});
|
|
34
|
+
const pxe = await createPXE(nodeRef, pxeConfig, options);
|
|
35
|
+
return new TestWallet(pxe, nodeRef);
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Updates the underlying node that this wallet and its PXE communicate with.
|
|
39
|
+
* @param node - The new AztecNode to forward all calls to.
|
|
40
|
+
*/ updateNode(node) {
|
|
41
|
+
this.nodeRef.updateTargetNode(node);
|
|
42
|
+
}
|
|
43
|
+
createSchnorrAccount(secret, salt, signingKey) {
|
|
44
|
+
signingKey = signingKey ?? deriveSigningKey(secret);
|
|
45
|
+
const accountData = {
|
|
46
|
+
secret,
|
|
47
|
+
salt,
|
|
48
|
+
contract: new SchnorrAccountContract(signingKey)
|
|
49
|
+
};
|
|
50
|
+
return this.createAccount(accountData);
|
|
51
|
+
}
|
|
52
|
+
createECDSARAccount(secret, salt, signingKey) {
|
|
53
|
+
const accountData = {
|
|
54
|
+
secret,
|
|
55
|
+
salt,
|
|
56
|
+
contract: new EcdsaRAccountContract(signingKey)
|
|
57
|
+
};
|
|
58
|
+
return this.createAccount(accountData);
|
|
59
|
+
}
|
|
60
|
+
createECDSAKAccount(secret, salt, signingKey) {
|
|
61
|
+
const accountData = {
|
|
62
|
+
secret,
|
|
63
|
+
salt,
|
|
64
|
+
contract: new EcdsaKAccountContract(signingKey)
|
|
65
|
+
};
|
|
66
|
+
return this.createAccount(accountData);
|
|
67
|
+
}
|
|
68
|
+
async getFakeAccountDataFor(address) {
|
|
69
|
+
const originalAccount = await this.getAccountFromAddress(address);
|
|
70
|
+
if (originalAccount instanceof SignerlessAccount) {
|
|
71
|
+
throw new Error(`Cannot create fake account data for SignerlessAccount at address: ${address}`);
|
|
72
|
+
}
|
|
73
|
+
const originalAddress = originalAccount.getCompleteAddress();
|
|
74
|
+
const contractInstance = await this.pxe.getContractInstance(originalAddress.address);
|
|
75
|
+
if (!contractInstance) {
|
|
76
|
+
throw new Error(`No contract instance found for address: ${originalAddress.address}`);
|
|
77
|
+
}
|
|
78
|
+
const stubAccount = createStubAccount(originalAddress);
|
|
79
|
+
const instance = await getContractInstanceFromInstantiationParams(StubAccountContractArtifact, {
|
|
80
|
+
salt: Fr.random()
|
|
81
|
+
});
|
|
82
|
+
return {
|
|
83
|
+
account: stubAccount,
|
|
84
|
+
instance,
|
|
85
|
+
artifact: StubAccountContractArtifact
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
accounts;
|
|
89
|
+
/**
|
|
90
|
+
* Toggle for running "simulated simulations" when calling simulateTx.
|
|
91
|
+
*
|
|
92
|
+
* When this flag is true, simulateViaEntrypoint constructs a request using a fake account
|
|
93
|
+
* (and accepts contract overrides on the input) and the PXE emulates kernel effects without
|
|
94
|
+
* generating kernel witnesses. When false, simulateViaEntrypoint defers to the standard
|
|
95
|
+
* simulation path via the real account entrypoint.
|
|
96
|
+
*/ simulatedSimulations;
|
|
97
|
+
enableSimulatedSimulations() {
|
|
98
|
+
this.simulatedSimulations = true;
|
|
99
|
+
}
|
|
100
|
+
disableSimulatedSimulations() {
|
|
101
|
+
this.simulatedSimulations = false;
|
|
102
|
+
}
|
|
103
|
+
setMinFeePadding(value) {
|
|
104
|
+
this.minFeePadding = value ?? 0.5;
|
|
105
|
+
}
|
|
106
|
+
getAccountFromAddress(address) {
|
|
107
|
+
let account;
|
|
108
|
+
if (address.equals(AztecAddress.ZERO)) {
|
|
109
|
+
account = new SignerlessAccount();
|
|
110
|
+
} else {
|
|
111
|
+
account = this.accounts.get(address?.toString() ?? '');
|
|
112
|
+
}
|
|
113
|
+
if (!account) {
|
|
114
|
+
throw new Error(`Account not found in wallet for address: ${address}`);
|
|
115
|
+
}
|
|
116
|
+
return Promise.resolve(account);
|
|
117
|
+
}
|
|
118
|
+
getAccounts() {
|
|
119
|
+
return Promise.resolve(Array.from(this.accounts.values()).map((acc)=>({
|
|
120
|
+
alias: '',
|
|
121
|
+
item: acc.getAddress()
|
|
122
|
+
})));
|
|
123
|
+
}
|
|
124
|
+
async createAccount(accountData) {
|
|
125
|
+
const secret = accountData?.secret ?? Fr.random();
|
|
126
|
+
const salt = accountData?.salt ?? Fr.random();
|
|
127
|
+
const contract = accountData?.contract ?? new SchnorrAccountContract(GrumpkinScalar.random());
|
|
128
|
+
const accountManager = await AccountManager.create(this, secret, contract, salt);
|
|
129
|
+
const instance = accountManager.getInstance();
|
|
130
|
+
const artifact = await contract.getContractArtifact();
|
|
131
|
+
await this.registerContract(instance, artifact, secret);
|
|
132
|
+
this.accounts.set(accountManager.address.toString(), await accountManager.getAccount());
|
|
133
|
+
return accountManager;
|
|
134
|
+
}
|
|
135
|
+
lookupValidity(onBehalfOf, intent, witness) {
|
|
136
|
+
return lookupValidity(this, onBehalfOf, intent, witness);
|
|
137
|
+
}
|
|
138
|
+
setPublicAuthWit(from, messageHashOrIntent, authorized) {
|
|
139
|
+
return SetPublicAuthwitContractInteraction.create(this, from, messageHashOrIntent, authorized);
|
|
140
|
+
}
|
|
141
|
+
async createAuthWit(from, intent) {
|
|
142
|
+
const account = await this.getAccountFromAddress(from);
|
|
143
|
+
const chainInfo = await this.getChainInfo();
|
|
144
|
+
let intentInnerHash;
|
|
145
|
+
if ('caller' in intent) {
|
|
146
|
+
const call = isContractFunctionInteractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
|
|
147
|
+
const innerHash = await computeInnerAuthWitHashFromAction(intent.caller, call);
|
|
148
|
+
intentInnerHash = {
|
|
149
|
+
innerHash,
|
|
150
|
+
consumer: call.to
|
|
151
|
+
};
|
|
152
|
+
} else {
|
|
153
|
+
intentInnerHash = intent;
|
|
154
|
+
}
|
|
155
|
+
return account.createAuthWit(intentInnerHash, chainInfo);
|
|
156
|
+
}
|
|
157
|
+
/**
|
|
158
|
+
* Override simulateViaEntrypoint to use fake accounts for kernelless simulation
|
|
159
|
+
* when simulatedSimulations is enabled. Otherwise falls through to the real entrypoint path.
|
|
160
|
+
*/ async simulateViaEntrypoint(executionPayload, from, feeOptions, skipTxValidation, skipFeeEnforcement) {
|
|
161
|
+
if (!this.simulatedSimulations) {
|
|
162
|
+
return super.simulateViaEntrypoint(executionPayload, from, feeOptions, skipTxValidation, skipFeeEnforcement);
|
|
163
|
+
}
|
|
164
|
+
const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
|
|
165
|
+
const executionOptions = {
|
|
166
|
+
txNonce: Fr.random(),
|
|
167
|
+
cancellable: this.cancellableTransactions,
|
|
168
|
+
feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
|
|
169
|
+
};
|
|
170
|
+
const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
|
|
171
|
+
feeExecutionPayload,
|
|
172
|
+
executionPayload
|
|
173
|
+
]) : executionPayload;
|
|
174
|
+
const { account: fromAccount, instance, artifact } = await this.getFakeAccountDataFor(from);
|
|
175
|
+
const chainInfo = await this.getChainInfo();
|
|
176
|
+
const txRequest = await fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
|
|
177
|
+
const contractOverrides = {
|
|
178
|
+
[from.toString()]: {
|
|
179
|
+
instance,
|
|
180
|
+
artifact
|
|
181
|
+
}
|
|
182
|
+
};
|
|
183
|
+
return this.pxe.simulateTx(txRequest, {
|
|
184
|
+
simulatePublic: true,
|
|
185
|
+
skipFeeEnforcement: true,
|
|
186
|
+
skipTxValidation: true,
|
|
187
|
+
overrides: {
|
|
188
|
+
contracts: contractOverrides
|
|
189
|
+
}
|
|
190
|
+
});
|
|
191
|
+
}
|
|
192
|
+
async proveTx(exec, opts) {
|
|
193
|
+
const fee = await this.completeFeeOptions(opts.from, exec.feePayer, opts.fee?.gasSettings);
|
|
194
|
+
const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(exec, opts.from, fee);
|
|
195
|
+
const txProvingResult = await this.pxe.proveTx(txRequest);
|
|
196
|
+
return new ProvenTx(this.aztecNode, await txProvingResult.toTx(), txProvingResult.getOffchainEffects(), txProvingResult.stats);
|
|
197
|
+
}
|
|
198
|
+
getTxReceipt(txHash) {
|
|
199
|
+
return this.aztecNode.getTxReceipt(txHash);
|
|
200
|
+
}
|
|
201
|
+
getNotes(filter) {
|
|
202
|
+
return this.pxe.debug.getNotes(filter);
|
|
203
|
+
}
|
|
204
|
+
getSyncedBlockHeader() {
|
|
205
|
+
return this.pxe.getSyncedBlockHeader();
|
|
206
|
+
}
|
|
207
|
+
sync() {
|
|
208
|
+
return this.pxe.debug.sync();
|
|
209
|
+
}
|
|
210
|
+
stop() {
|
|
211
|
+
return this.pxe.stop();
|
|
212
|
+
}
|
|
213
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { ContractFunctionInteraction, DeployMethod, type DeployOptions, type NoWait, type SendInteractionOptions, type WaitOpts } from '@aztec/aztec.js/contracts';
|
|
2
|
+
import { type AztecNode } from '@aztec/aztec.js/node';
|
|
3
|
+
import { type OffchainEffect, type ProvingStats, Tx, TxHash, type TxReceipt } from '@aztec/stdlib/tx';
|
|
4
|
+
import type { TestWallet } from './test_wallet.js';
|
|
5
|
+
export type ProvenTxSendOpts = {
|
|
6
|
+
wait?: NoWait | WaitOpts;
|
|
7
|
+
};
|
|
8
|
+
export type ProvenTxSendReturn<T extends NoWait | WaitOpts | undefined> = T extends NoWait ? TxHash : TxReceipt;
|
|
9
|
+
export declare class ProvenTx extends Tx {
|
|
10
|
+
private node;
|
|
11
|
+
offchainEffects: OffchainEffect[];
|
|
12
|
+
stats?: ProvingStats | undefined;
|
|
13
|
+
constructor(node: AztecNode, tx: Tx, offchainEffects: OffchainEffect[], stats?: ProvingStats | undefined);
|
|
14
|
+
send(options?: Omit<ProvenTxSendOpts, 'wait'>): Promise<TxReceipt>;
|
|
15
|
+
send<W extends ProvenTxSendOpts['wait']>(options: ProvenTxSendOpts & {
|
|
16
|
+
wait: W;
|
|
17
|
+
}): Promise<ProvenTxSendReturn<W>>;
|
|
18
|
+
private contextualizeError;
|
|
19
|
+
}
|
|
20
|
+
export declare function proveInteraction(wallet: TestWallet, interaction: ContractFunctionInteraction | DeployMethod, options: SendInteractionOptions | DeployOptions): Promise<ProvenTx>;
|
|
21
|
+
/**
|
|
22
|
+
* Extends AztecNode via declaration merging so instances can be used wherever AztecNode is expected.
|
|
23
|
+
* The actual method forwarding is handled by a Proxy in the class constructor.
|
|
24
|
+
*/
|
|
25
|
+
export interface AztecNodeProxy extends AztecNode {
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Mutable wrapper around an AztecNode that forwards all calls to the current target.
|
|
29
|
+
* Allows swapping the underlying node at runtime via updateTargetNode, which is useful
|
|
30
|
+
* for tests that need to redirect a wallet from one node to another without recreating it.
|
|
31
|
+
*/
|
|
32
|
+
export declare class AztecNodeProxy {
|
|
33
|
+
private target;
|
|
34
|
+
constructor(target: AztecNode);
|
|
35
|
+
/**
|
|
36
|
+
* Updates the underlying node that this reference points to.
|
|
37
|
+
* @param node - The new node to forward calls to.
|
|
38
|
+
*/
|
|
39
|
+
updateTargetNode(node: AztecNode): void;
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsMkJBQTJCLEVBQzNCLFlBQVksRUFDWixLQUFLLGFBQWEsRUFFbEIsS0FBSyxNQUFNLEVBQ1gsS0FBSyxzQkFBc0IsRUFDM0IsS0FBSyxRQUFRLEVBRWQsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQWEsTUFBTSxzQkFBc0IsQ0FBQztBQUVqRSxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQUUsS0FBSyxZQUFZLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxLQUFLLFNBQVMsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBSXRHLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5ELE1BQU0sTUFBTSxnQkFBZ0IsR0FBRztJQUM3QixJQUFJLENBQUMsRUFBRSxNQUFNLEdBQUcsUUFBUSxDQUFDO0NBQzFCLENBQUM7QUFFRixNQUFNLE1BQU0sa0JBQWtCLENBQUMsQ0FBQyxTQUFTLE1BQU0sR0FBRyxRQUFRLEdBQUcsU0FBUyxJQUFJLENBQUMsU0FBUyxNQUFNLEdBQUcsTUFBTSxHQUFHLFNBQVMsQ0FBQztBQUVoSCxxQkFBYSxRQUFTLFNBQVEsRUFBRTtJQUU1QixPQUFPLENBQUMsSUFBSTtJQUVMLGVBQWUsRUFBRSxjQUFjLEVBQUU7SUFDakMsS0FBSyxDQUFDO0lBSmYsWUFDVSxJQUFJLEVBQUUsU0FBUyxFQUN2QixFQUFFLEVBQUUsRUFBRSxFQUNDLGVBQWUsRUFBRSxjQUFjLEVBQUUsRUFDakMsS0FBSyxDQUFDLDBCQUFjLEVBRzVCO0lBRUQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDbkUsSUFBSSxDQUFDLENBQUMsU0FBUyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsRUFBRSxPQUFPLEVBQUUsZ0JBQWdCLEdBQUc7UUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQWVsSCxPQUFPLENBQUMsa0JBQWtCO0NBVTNCO0FBRUQsd0JBQXNCLGdCQUFnQixDQUNwQyxNQUFNLEVBQUUsVUFBVSxFQUNsQixXQUFXLEVBQUUsMkJBQTJCLEdBQUcsWUFBWSxFQUN2RCxPQUFPLEVBQUUsc0JBQXNCLEdBQUcsYUFBYSxxQkFTaEQ7QUFFRDs7O0dBR0c7QUFFSCxNQUFNLFdBQVcsY0FBZSxTQUFRLFNBQVM7Q0FBRztBQUVwRDs7OztHQUlHO0FBRUgscUJBQWEsY0FBYztJQUNiLE9BQU8sQ0FBQyxNQUFNO0lBQTFCLFlBQW9CLE1BQU0sRUFBRSxTQUFTLEVBWXBDO0lBRUQ7OztPQUdHO0lBQ0gsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLFNBQVMsR0FBRyxJQUFJLENBRXRDO0NBQ0YifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test-wallet/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,YAAY,EACZ,KAAK,aAAa,EAElB,KAAK,MAAM,EACX,KAAK,sBAAsB,EAC3B,KAAK,QAAQ,EAEd,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,sBAAsB,CAAC;AAEjE,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAItG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,MAAM,GAAG,QAAQ,GAAG,SAAS,IAAI,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;AAEhH,qBAAa,QAAS,SAAQ,EAAE;IAE5B,OAAO,CAAC,IAAI;IAEL,eAAe,EAAE,cAAc,EAAE;IACjC,KAAK,CAAC;IAJf,YACU,IAAI,EAAE,SAAS,EACvB,EAAE,EAAE,EAAE,EACC,eAAe,EAAE,cAAc,EAAE,EACjC,KAAK,CAAC,0BAAc,EAG5B;IAED,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnE,IAAI,CAAC,CAAC,SAAS,gBAAgB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG;QAAE,IAAI,EAAE,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAelH,OAAO,CAAC,kBAAkB;CAU3B;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,2BAA2B,GAAG,YAAY,EACvD,OAAO,EAAE,sBAAsB,GAAG,aAAa,qBAShD;AAED;;;GAGG;AAEH,MAAM,WAAW,cAAe,SAAQ,SAAS;CAAG;AAEpD;;;;GAIG;AAEH,qBAAa,cAAc;IACb,OAAO,CAAC,MAAM;IAA1B,YAAoB,MAAM,EAAE,SAAS,EAYpC;IAED;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAEtC;CACF"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { DeployMethod, NO_WAIT, toSendOptions } from '@aztec/aztec.js/contracts';
|
|
2
|
+
import { waitForTx } from '@aztec/aztec.js/node';
|
|
3
|
+
import { SimulationError } from '@aztec/stdlib/errors';
|
|
4
|
+
import { Tx } from '@aztec/stdlib/tx';
|
|
5
|
+
import { inspect } from 'util';
|
|
6
|
+
export class ProvenTx extends Tx {
|
|
7
|
+
node;
|
|
8
|
+
offchainEffects;
|
|
9
|
+
stats;
|
|
10
|
+
constructor(node, tx, offchainEffects, stats){
|
|
11
|
+
super(tx.getTxHash(), tx.data, tx.chonkProof, tx.contractClassLogFields, tx.publicFunctionCalldata), this.node = node, this.offchainEffects = offchainEffects, this.stats = stats;
|
|
12
|
+
}
|
|
13
|
+
async send(options) {
|
|
14
|
+
const txHash = this.getTxHash();
|
|
15
|
+
await this.node.sendTx(this).catch((err)=>{
|
|
16
|
+
throw this.contextualizeError(err, inspect(this));
|
|
17
|
+
});
|
|
18
|
+
if (options?.wait === NO_WAIT) {
|
|
19
|
+
return txHash;
|
|
20
|
+
}
|
|
21
|
+
const waitOpts = typeof options?.wait === 'object' ? options.wait : undefined;
|
|
22
|
+
return await waitForTx(this.node, txHash, waitOpts);
|
|
23
|
+
}
|
|
24
|
+
contextualizeError(err, ...context) {
|
|
25
|
+
let contextStr = '';
|
|
26
|
+
if (context.length > 0) {
|
|
27
|
+
contextStr = `\nContext:\n${context.join('\n')}`;
|
|
28
|
+
}
|
|
29
|
+
if (err instanceof SimulationError) {
|
|
30
|
+
err.setAztecContext(contextStr);
|
|
31
|
+
}
|
|
32
|
+
return err;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
export async function proveInteraction(wallet, interaction, options) {
|
|
36
|
+
let execPayload;
|
|
37
|
+
if (interaction instanceof DeployMethod) {
|
|
38
|
+
execPayload = await interaction.request(interaction.convertDeployOptionsToRequestOptions(options));
|
|
39
|
+
} else {
|
|
40
|
+
execPayload = await interaction.request(options);
|
|
41
|
+
}
|
|
42
|
+
return wallet.proveTx(execPayload, toSendOptions(options));
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Mutable wrapper around an AztecNode that forwards all calls to the current target.
|
|
46
|
+
* Allows swapping the underlying node at runtime via updateTargetNode, which is useful
|
|
47
|
+
* for tests that need to redirect a wallet from one node to another without recreating it.
|
|
48
|
+
*/ // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
|
|
49
|
+
export class AztecNodeProxy {
|
|
50
|
+
target;
|
|
51
|
+
constructor(target){
|
|
52
|
+
this.target = target;
|
|
53
|
+
return new Proxy(this, {
|
|
54
|
+
get: (obj, prop, receiver)=>{
|
|
55
|
+
// Own properties and methods (updateTargetNode, target) are served directly.
|
|
56
|
+
if (Reflect.has(obj, prop)) {
|
|
57
|
+
return Reflect.get(obj, prop, receiver);
|
|
58
|
+
}
|
|
59
|
+
// Everything else is forwarded to the current target node.
|
|
60
|
+
const val = obj.target[prop];
|
|
61
|
+
return typeof val === 'function' ? val.bind(obj.target) : val;
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Updates the underlying node that this reference points to.
|
|
67
|
+
* @param node - The new node to forward calls to.
|
|
68
|
+
*/ updateTargetNode(node) {
|
|
69
|
+
this.target = node;
|
|
70
|
+
}
|
|
71
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "4.0.0-devnet.1-patch.
|
|
3
|
+
"version": "4.0.0-devnet.1-patch.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"inherits": [
|
|
@@ -26,44 +26,45 @@
|
|
|
26
26
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@aztec/accounts": "4.0.0-devnet.1-patch.
|
|
30
|
-
"@aztec/archiver": "4.0.0-devnet.1-patch.
|
|
31
|
-
"@aztec/aztec": "4.0.0-devnet.1-patch.
|
|
32
|
-
"@aztec/aztec-node": "4.0.0-devnet.1-patch.
|
|
33
|
-
"@aztec/aztec.js": "4.0.0-devnet.1-patch.
|
|
34
|
-
"@aztec/bb-prover": "4.0.0-devnet.1-patch.
|
|
35
|
-
"@aztec/bb.js": "4.0.0-devnet.1-patch.
|
|
36
|
-
"@aztec/blob-client": "4.0.0-devnet.1-patch.
|
|
37
|
-
"@aztec/blob-lib": "4.0.0-devnet.1-patch.
|
|
38
|
-
"@aztec/bot": "4.0.0-devnet.1-patch.
|
|
39
|
-
"@aztec/cli": "4.0.0-devnet.1-patch.
|
|
40
|
-
"@aztec/constants": "4.0.0-devnet.1-patch.
|
|
41
|
-
"@aztec/entrypoints": "4.0.0-devnet.1-patch.
|
|
42
|
-
"@aztec/epoch-cache": "4.0.0-devnet.1-patch.
|
|
43
|
-
"@aztec/ethereum": "4.0.0-devnet.1-patch.
|
|
44
|
-
"@aztec/foundation": "4.0.0-devnet.1-patch.
|
|
45
|
-
"@aztec/kv-store": "4.0.0-devnet.1-patch.
|
|
46
|
-
"@aztec/l1-artifacts": "4.0.0-devnet.1-patch.
|
|
47
|
-
"@aztec/merkle-tree": "4.0.0-devnet.1-patch.
|
|
48
|
-
"@aztec/node-keystore": "4.0.0-devnet.1-patch.
|
|
49
|
-
"@aztec/noir-contracts.js": "4.0.0-devnet.1-patch.
|
|
50
|
-
"@aztec/noir-noirc_abi": "4.0.0-devnet.1-patch.
|
|
51
|
-
"@aztec/noir-protocol-circuits-types": "4.0.0-devnet.1-patch.
|
|
52
|
-
"@aztec/noir-test-contracts.js": "4.0.0-devnet.1-patch.
|
|
53
|
-
"@aztec/p2p": "4.0.0-devnet.1-patch.
|
|
54
|
-
"@aztec/protocol-contracts": "4.0.0-devnet.1-patch.
|
|
55
|
-
"@aztec/prover-client": "4.0.0-devnet.1-patch.
|
|
56
|
-
"@aztec/prover-node": "4.0.0-devnet.1-patch.
|
|
57
|
-
"@aztec/pxe": "4.0.0-devnet.1-patch.
|
|
58
|
-
"@aztec/sequencer-client": "4.0.0-devnet.1-patch.
|
|
59
|
-
"@aztec/simulator": "4.0.0-devnet.1-patch.
|
|
60
|
-
"@aztec/slasher": "4.0.0-devnet.1-patch.
|
|
61
|
-
"@aztec/stdlib": "4.0.0-devnet.1-patch.
|
|
62
|
-
"@aztec/telemetry-client": "4.0.0-devnet.1-patch.
|
|
63
|
-
"@aztec/
|
|
64
|
-
"@aztec/validator-
|
|
65
|
-
"@aztec/
|
|
66
|
-
"@aztec/
|
|
29
|
+
"@aztec/accounts": "4.0.0-devnet.1-patch.1",
|
|
30
|
+
"@aztec/archiver": "4.0.0-devnet.1-patch.1",
|
|
31
|
+
"@aztec/aztec": "4.0.0-devnet.1-patch.1",
|
|
32
|
+
"@aztec/aztec-node": "4.0.0-devnet.1-patch.1",
|
|
33
|
+
"@aztec/aztec.js": "4.0.0-devnet.1-patch.1",
|
|
34
|
+
"@aztec/bb-prover": "4.0.0-devnet.1-patch.1",
|
|
35
|
+
"@aztec/bb.js": "4.0.0-devnet.1-patch.1",
|
|
36
|
+
"@aztec/blob-client": "4.0.0-devnet.1-patch.1",
|
|
37
|
+
"@aztec/blob-lib": "4.0.0-devnet.1-patch.1",
|
|
38
|
+
"@aztec/bot": "4.0.0-devnet.1-patch.1",
|
|
39
|
+
"@aztec/cli": "4.0.0-devnet.1-patch.1",
|
|
40
|
+
"@aztec/constants": "4.0.0-devnet.1-patch.1",
|
|
41
|
+
"@aztec/entrypoints": "4.0.0-devnet.1-patch.1",
|
|
42
|
+
"@aztec/epoch-cache": "4.0.0-devnet.1-patch.1",
|
|
43
|
+
"@aztec/ethereum": "4.0.0-devnet.1-patch.1",
|
|
44
|
+
"@aztec/foundation": "4.0.0-devnet.1-patch.1",
|
|
45
|
+
"@aztec/kv-store": "4.0.0-devnet.1-patch.1",
|
|
46
|
+
"@aztec/l1-artifacts": "4.0.0-devnet.1-patch.1",
|
|
47
|
+
"@aztec/merkle-tree": "4.0.0-devnet.1-patch.1",
|
|
48
|
+
"@aztec/node-keystore": "4.0.0-devnet.1-patch.1",
|
|
49
|
+
"@aztec/noir-contracts.js": "4.0.0-devnet.1-patch.1",
|
|
50
|
+
"@aztec/noir-noirc_abi": "4.0.0-devnet.1-patch.1",
|
|
51
|
+
"@aztec/noir-protocol-circuits-types": "4.0.0-devnet.1-patch.1",
|
|
52
|
+
"@aztec/noir-test-contracts.js": "4.0.0-devnet.1-patch.1",
|
|
53
|
+
"@aztec/p2p": "4.0.0-devnet.1-patch.1",
|
|
54
|
+
"@aztec/protocol-contracts": "4.0.0-devnet.1-patch.1",
|
|
55
|
+
"@aztec/prover-client": "4.0.0-devnet.1-patch.1",
|
|
56
|
+
"@aztec/prover-node": "4.0.0-devnet.1-patch.1",
|
|
57
|
+
"@aztec/pxe": "4.0.0-devnet.1-patch.1",
|
|
58
|
+
"@aztec/sequencer-client": "4.0.0-devnet.1-patch.1",
|
|
59
|
+
"@aztec/simulator": "4.0.0-devnet.1-patch.1",
|
|
60
|
+
"@aztec/slasher": "4.0.0-devnet.1-patch.1",
|
|
61
|
+
"@aztec/stdlib": "4.0.0-devnet.1-patch.1",
|
|
62
|
+
"@aztec/telemetry-client": "4.0.0-devnet.1-patch.1",
|
|
63
|
+
"@aztec/validator-client": "4.0.0-devnet.1-patch.1",
|
|
64
|
+
"@aztec/validator-ha-signer": "4.0.0-devnet.1-patch.1",
|
|
65
|
+
"@aztec/wallet-sdk": "4.0.0-devnet.1-patch.1",
|
|
66
|
+
"@aztec/wallets": "4.0.0-devnet.1-patch.1",
|
|
67
|
+
"@aztec/world-state": "4.0.0-devnet.1-patch.1",
|
|
67
68
|
"@iarna/toml": "^2.2.5",
|
|
68
69
|
"@jest/globals": "^30.0.0",
|
|
69
70
|
"@noble/curves": "=1.0.0",
|
|
@@ -26,7 +26,6 @@ import { type PXEConfig, getPXEConfig } from '@aztec/pxe/server';
|
|
|
26
26
|
import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
|
|
27
27
|
import { GasSettings } from '@aztec/stdlib/gas';
|
|
28
28
|
import { deriveSigningKey } from '@aztec/stdlib/keys';
|
|
29
|
-
import { TestWallet } from '@aztec/test-wallet/server';
|
|
30
29
|
|
|
31
30
|
import { MNEMONIC } from '../../fixtures/fixtures.js';
|
|
32
31
|
import { type EndToEndContext, type SetupOptions, deployAccounts, setup, teardown } from '../../fixtures/setup.js';
|
|
@@ -37,6 +36,7 @@ import {
|
|
|
37
36
|
FeeJuicePortalTestingHarnessFactory,
|
|
38
37
|
type GasBridgingTestHarness,
|
|
39
38
|
} from '../../shared/gas_portal_test_harness.js';
|
|
39
|
+
import { TestWallet } from '../../test-wallet/test_wallet.js';
|
|
40
40
|
import { ProxyLogger } from './benchmark.js';
|
|
41
41
|
import { type ClientFlowsConfig, FULL_FLOWS_CONFIG, KEY_FLOWS_CONFIG } from './config.js';
|
|
42
42
|
|
|
@@ -9,12 +9,12 @@ import type { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
|
9
9
|
import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
|
|
10
10
|
import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
|
|
11
11
|
import type { SequencerClient } from '@aztec/sequencer-client';
|
|
12
|
-
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
13
12
|
|
|
14
13
|
import { jest } from '@jest/globals';
|
|
15
14
|
|
|
16
15
|
import { type EndToEndContext, deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
|
|
17
16
|
import { TokenSimulator } from '../simulators/token_simulator.js';
|
|
17
|
+
import type { TestWallet } from '../test-wallet/test_wallet.js';
|
|
18
18
|
|
|
19
19
|
export class Role {
|
|
20
20
|
private isAdmin = false;
|
|
@@ -19,7 +19,6 @@ import { TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
|
|
|
19
19
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
20
20
|
import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
|
|
21
21
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
22
|
-
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
23
22
|
|
|
24
23
|
import { MNEMONIC } from '../fixtures/fixtures.js';
|
|
25
24
|
import {
|
|
@@ -31,6 +30,7 @@ import {
|
|
|
31
30
|
teardown,
|
|
32
31
|
} from '../fixtures/setup.js';
|
|
33
32
|
import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
|
|
33
|
+
import type { TestWallet } from '../test-wallet/test_wallet.js';
|
|
34
34
|
|
|
35
35
|
export class CrossChainMessagingTest {
|
|
36
36
|
private requireEpochProven: boolean;
|
|
@@ -8,9 +8,9 @@ import type { AztecNode } from '@aztec/aztec.js/node';
|
|
|
8
8
|
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
9
9
|
import type { StatefulTestContract } from '@aztec/noir-test-contracts.js/StatefulTest';
|
|
10
10
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
11
|
-
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
12
11
|
|
|
13
12
|
import { type EndToEndContext, deployAccounts, setup, teardown } from '../fixtures/setup.js';
|
|
13
|
+
import type { TestWallet } from '../test-wallet/test_wallet.js';
|
|
14
14
|
|
|
15
15
|
export class DeployTest {
|
|
16
16
|
public context!: EndToEndContext;
|
|
@@ -4,11 +4,11 @@ import type { Logger } from '@aztec/aztec.js/log';
|
|
|
4
4
|
import { Fq } from '@aztec/foundation/curves/bn254';
|
|
5
5
|
import { sleep } from '@aztec/foundation/sleep';
|
|
6
6
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
7
|
-
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
8
7
|
|
|
9
8
|
import { jest } from '@jest/globals';
|
|
10
9
|
import type { Hex } from 'viem';
|
|
11
10
|
|
|
11
|
+
import type { TestWallet } from '../test-wallet/test_wallet.js';
|
|
12
12
|
import { FeesTest } from './fees_test.js';
|
|
13
13
|
|
|
14
14
|
jest.setTimeout(300_000);
|
|
@@ -20,7 +20,6 @@ import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
|
20
20
|
import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
|
|
21
21
|
import { GasSettings } from '@aztec/stdlib/gas';
|
|
22
22
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
23
|
-
import { TestWallet } from '@aztec/test-wallet/server';
|
|
24
23
|
|
|
25
24
|
import { getContract } from 'viem';
|
|
26
25
|
|
|
@@ -36,6 +35,7 @@ import {
|
|
|
36
35
|
import { mintTokensToPrivate } from '../fixtures/token_utils.js';
|
|
37
36
|
import { type BalancesFn, getBalancesFn, setupSponsoredFPC } from '../fixtures/utils.js';
|
|
38
37
|
import { FeeJuicePortalTestingHarnessFactory, type GasBridgingTestHarness } from '../shared/gas_portal_test_harness.js';
|
|
38
|
+
import { TestWallet } from '../test-wallet/test_wallet.js';
|
|
39
39
|
|
|
40
40
|
/**
|
|
41
41
|
* Test fixture for testing fees. Provides the following setup steps:
|