@aztec/end-to-end 4.0.0-devnet.1-patch.1 → 4.0.0-devnet.2-patch.0
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 +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.js +2 -2
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +3 -1
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +10 -0
- package/dest/e2e_epochs/epochs_test.d.ts +9 -7
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +53 -34
- package/dest/e2e_fees/fees_test.d.ts +1 -1
- package/dest/e2e_fees/fees_test.d.ts.map +1 -1
- package/dest/e2e_fees/fees_test.js +5 -5
- package/dest/e2e_p2p/p2p_network.js +2 -2
- package/dest/e2e_p2p/reqresp/utils.d.ts +3 -3
- package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -1
- package/dest/e2e_p2p/reqresp/utils.js +32 -8
- package/dest/e2e_token_contract/token_contract_test.d.ts +3 -1
- package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
- package/dest/e2e_token_contract/token_contract_test.js +10 -0
- package/dest/fixtures/authwit_proxy.d.ts +15 -0
- package/dest/fixtures/authwit_proxy.d.ts.map +1 -0
- package/dest/fixtures/authwit_proxy.js +30 -0
- package/dest/fixtures/e2e_prover_test.d.ts +3 -3
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.js +27 -34
- package/dest/fixtures/fixtures.d.ts +5 -1
- package/dest/fixtures/fixtures.d.ts.map +1 -1
- package/dest/fixtures/fixtures.js +6 -0
- package/dest/fixtures/ha_setup.d.ts +1 -1
- package/dest/fixtures/ha_setup.d.ts.map +1 -1
- package/dest/fixtures/ha_setup.js +3 -1
- package/dest/fixtures/setup.d.ts +26 -9
- package/dest/fixtures/setup.d.ts.map +1 -1
- package/dest/fixtures/setup.js +54 -80
- package/dest/fixtures/setup_p2p_test.d.ts +6 -3
- package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
- package/dest/fixtures/setup_p2p_test.js +12 -9
- package/dest/shared/index.d.ts +2 -1
- package/dest/shared/index.d.ts.map +1 -1
- package/dest/shared/index.js +1 -0
- package/dest/shared/mock_state_view.d.ts +86 -0
- package/dest/shared/mock_state_view.d.ts.map +1 -0
- package/dest/shared/mock_state_view.js +186 -0
- package/dest/simulators/token_simulator.d.ts +1 -1
- package/dest/simulators/token_simulator.d.ts.map +1 -1
- package/dest/simulators/token_simulator.js +2 -23
- package/dest/spartan/setup_test_wallets.d.ts +8 -1
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +28 -0
- package/dest/spartan/utils/bot.d.ts +3 -2
- package/dest/spartan/utils/bot.d.ts.map +1 -1
- package/dest/spartan/utils/bot.js +2 -1
- package/dest/spartan/utils/index.d.ts +2 -2
- package/dest/spartan/utils/index.d.ts.map +1 -1
- package/dest/spartan/utils/index.js +1 -1
- package/dest/spartan/utils/k8s.d.ts +3 -1
- package/dest/spartan/utils/k8s.d.ts.map +1 -1
- package/dest/spartan/utils/k8s.js +6 -0
- package/dest/test-wallet/test_wallet.d.ts +4 -3
- package/dest/test-wallet/test_wallet.d.ts.map +1 -1
- package/dest/test-wallet/test_wallet.js +5 -4
- package/dest/test-wallet/wallet_worker_script.d.ts +2 -0
- package/dest/test-wallet/wallet_worker_script.d.ts.map +1 -0
- package/dest/test-wallet/wallet_worker_script.js +40 -0
- package/dest/test-wallet/worker_wallet.d.ts +52 -0
- package/dest/test-wallet/worker_wallet.d.ts.map +1 -0
- package/dest/test-wallet/worker_wallet.js +103 -0
- package/dest/test-wallet/worker_wallet_schema.d.ts +271 -0
- package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -0
- package/dest/test-wallet/worker_wallet_schema.js +10 -0
- package/package.json +40 -40
- package/src/bench/client_flows/client_flows_benchmark.ts +2 -6
- package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +9 -0
- package/src/e2e_epochs/epochs_test.ts +66 -66
- package/src/e2e_fees/fees_test.ts +4 -19
- package/src/e2e_p2p/p2p_network.ts +2 -2
- package/src/e2e_p2p/reqresp/utils.ts +36 -8
- package/src/e2e_token_contract/token_contract_test.ts +9 -0
- package/src/fixtures/authwit_proxy.ts +50 -0
- package/src/fixtures/dumps/epoch_proof_result.json +1 -1
- package/src/fixtures/e2e_prover_test.ts +25 -35
- package/src/fixtures/fixtures.ts +10 -0
- package/src/fixtures/ha_setup.ts +3 -1
- package/src/fixtures/setup.ts +71 -108
- package/src/fixtures/setup_p2p_test.ts +9 -17
- package/src/guides/up_quick_start.sh +3 -3
- package/src/shared/index.ts +1 -0
- package/src/shared/mock_state_view.ts +188 -0
- package/src/simulators/token_simulator.ts +1 -29
- package/src/spartan/setup_test_wallets.ts +40 -0
- package/src/spartan/utils/bot.ts +4 -1
- package/src/spartan/utils/index.ts +1 -0
- package/src/spartan/utils/k8s.ts +8 -0
- package/src/test-wallet/test_wallet.ts +13 -3
- package/src/test-wallet/wallet_worker_script.ts +43 -0
- package/src/test-wallet/worker_wallet.ts +165 -0
- package/src/test-wallet/worker_wallet_schema.ts +13 -0
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
import { EthAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import { type Logger, createLogger } from '@aztec/aztec.js/log';
|
|
3
|
+
import type { EthCheatCodes } from '@aztec/aztec/testing';
|
|
4
|
+
import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
|
|
5
|
+
|
|
6
|
+
import { getContract } from 'viem';
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Mock StateView contract for testing the Uniswap price oracle.
|
|
10
|
+
*
|
|
11
|
+
* Wraps a compiled Solidity contract that mimics the Uniswap V4 StateView's getSlot0 function.
|
|
12
|
+
* The mock allows setting return values dynamically for testing different price scenarios.
|
|
13
|
+
*
|
|
14
|
+
* Solidity source:
|
|
15
|
+
* ```solidity
|
|
16
|
+
* // SPDX-License-Identifier: Apache-2.0
|
|
17
|
+
* pragma solidity >=0.8.27;
|
|
18
|
+
*
|
|
19
|
+
* contract MockStateView {
|
|
20
|
+
* uint160 public sqrtPriceX96;
|
|
21
|
+
* int24 public tick;
|
|
22
|
+
* uint24 public protocolFee;
|
|
23
|
+
* uint24 public lpFee;
|
|
24
|
+
*
|
|
25
|
+
* function setReturnValues(
|
|
26
|
+
* uint160 _sqrtPriceX96,
|
|
27
|
+
* int24 _tick,
|
|
28
|
+
* uint24 _protocolFee,
|
|
29
|
+
* uint24 _lpFee
|
|
30
|
+
* ) external {
|
|
31
|
+
* sqrtPriceX96 = _sqrtPriceX96;
|
|
32
|
+
* tick = _tick;
|
|
33
|
+
* protocolFee = _protocolFee;
|
|
34
|
+
* lpFee = _lpFee;
|
|
35
|
+
* }
|
|
36
|
+
*
|
|
37
|
+
* function getSlot0(bytes32 poolId) external view returns (uint160, int24, uint24, uint24) {
|
|
38
|
+
* return (sqrtPriceX96, tick, protocolFee, lpFee);
|
|
39
|
+
* }
|
|
40
|
+
* }
|
|
41
|
+
* ```
|
|
42
|
+
*/
|
|
43
|
+
export class MockStateView {
|
|
44
|
+
private static readonly BYTECODE: `0x${string}` =
|
|
45
|
+
'0x608060405234801561000f575f5ffd5b5060043610610060575f3560e01c80633eaf5d9f14610064578063704ce43e146100825780638db791d2146100a0578063b0e21e8a146100be578063b52e4bdd146100dc578063c815641c146100f8575b5f5ffd5b61006c61012b565b60405161007991906102ab565b60405180910390f35b61008a61013d565b60405161009791906102e1565b60405180910390f35b6100a8610151565b6040516100b59190610328565b60405180910390f35b6100c6610175565b6040516100d391906102e1565b60405180910390f35b6100f660048036038101906100f191906103c3565b610189565b005b610112600480360381019061010d919061045a565b61022b565b6040516101229493929190610485565b60405180910390f35b5f60149054906101000a900460020b81565b5f601a9054906101000a900462ffffff1681565b5f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b5f60179054906101000a900462ffffff1681565b835f5f6101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550825f60146101000a81548162ffffff021916908360020b62ffffff160217905550815f60176101000a81548162ffffff021916908362ffffff160217905550805f601a6101000a81548162ffffff021916908362ffffff16021790555050505050565b5f5f5f5f5f5f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff165f60149054906101000a900460020b5f60179054906101000a900462ffffff165f601a9054906101000a900462ffffff1693509350935093509193509193565b5f8160020b9050919050565b6102a581610290565b82525050565b5f6020820190506102be5f83018461029c565b92915050565b5f62ffffff82169050919050565b6102db816102c4565b82525050565b5f6020820190506102f45f8301846102d2565b92915050565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b610322816102fa565b82525050565b5f60208201905061033b5f830184610319565b92915050565b5f5ffd5b61034e816102fa565b8114610358575f5ffd5b50565b5f8135905061036981610345565b92915050565b61037881610290565b8114610382575f5ffd5b50565b5f813590506103938161036f565b92915050565b6103a2816102c4565b81146103ac575f5ffd5b50565b5f813590506103bd81610399565b92915050565b5f5f5f5f608085870312156103db576103da610341565b5b5f6103e88782880161035b565b94505060206103f987828801610385565b935050604061040a878288016103af565b925050606061041b878288016103af565b91505092959194509250565b5f819050919050565b61043981610427565b8114610443575f5ffd5b50565b5f8135905061045481610430565b92915050565b5f6020828403121561046f5761046e610341565b5b5f61047c84828501610446565b91505092915050565b5f6080820190506104985f830187610319565b6104a5602083018661029c565b6104b260408301856102d2565b6104bf60608301846102d2565b9594505050505056fea2646970667358221220f8b1bfff284535bc078368ed34bd5e78981644845f3c9c1f5a4b8448c976805464736f6c634300081f0033';
|
|
46
|
+
private static readonly ABI = [
|
|
47
|
+
{
|
|
48
|
+
type: 'function',
|
|
49
|
+
name: 'setReturnValues',
|
|
50
|
+
inputs: [
|
|
51
|
+
{ name: '_sqrtPriceX96', type: 'uint160' },
|
|
52
|
+
{ name: '_tick', type: 'int24' },
|
|
53
|
+
{ name: '_protocolFee', type: 'uint24' },
|
|
54
|
+
{ name: '_lpFee', type: 'uint24' },
|
|
55
|
+
],
|
|
56
|
+
outputs: [],
|
|
57
|
+
stateMutability: 'nonpayable',
|
|
58
|
+
},
|
|
59
|
+
{
|
|
60
|
+
inputs: [
|
|
61
|
+
{
|
|
62
|
+
internalType: 'bytes32',
|
|
63
|
+
name: 'poolId',
|
|
64
|
+
type: 'bytes32',
|
|
65
|
+
},
|
|
66
|
+
],
|
|
67
|
+
name: 'getSlot0',
|
|
68
|
+
outputs: [
|
|
69
|
+
{
|
|
70
|
+
internalType: 'uint160',
|
|
71
|
+
name: '',
|
|
72
|
+
type: 'uint160',
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
internalType: 'int24',
|
|
76
|
+
name: '',
|
|
77
|
+
type: 'int24',
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
internalType: 'uint24',
|
|
81
|
+
name: '',
|
|
82
|
+
type: 'uint24',
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
internalType: 'uint24',
|
|
86
|
+
name: '',
|
|
87
|
+
type: 'uint24',
|
|
88
|
+
},
|
|
89
|
+
],
|
|
90
|
+
stateMutability: 'view',
|
|
91
|
+
type: 'function',
|
|
92
|
+
},
|
|
93
|
+
] as const;
|
|
94
|
+
|
|
95
|
+
private constructor(
|
|
96
|
+
private readonly address: EthAddress,
|
|
97
|
+
private readonly walletClient: ExtendedViemWalletClient,
|
|
98
|
+
private readonly log: Logger = createLogger('mock-state-view'),
|
|
99
|
+
) {}
|
|
100
|
+
|
|
101
|
+
/**
|
|
102
|
+
* Deploys the mock StateView contract at the specified address using etch.
|
|
103
|
+
* @param ethCheatCodes - Cheat codes for etching bytecode
|
|
104
|
+
* @param walletClient - Wallet client for sending transactions
|
|
105
|
+
* @param address - Address to deploy the mock at (typically the real StateView address)
|
|
106
|
+
*/
|
|
107
|
+
static async deploy(
|
|
108
|
+
ethCheatCodes: EthCheatCodes,
|
|
109
|
+
walletClient: ExtendedViemWalletClient,
|
|
110
|
+
address: EthAddress,
|
|
111
|
+
): Promise<MockStateView> {
|
|
112
|
+
await ethCheatCodes.etch(address, MockStateView.BYTECODE);
|
|
113
|
+
return new MockStateView(address, walletClient);
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
/**
|
|
117
|
+
* Sets the price using the ethPerFeeAssetE12 format (same as rollup contract).
|
|
118
|
+
* Computes the corresponding sqrtPriceX96 internally.
|
|
119
|
+
*
|
|
120
|
+
* Math (from fee_asset_price_oracle.ts):
|
|
121
|
+
* ethPerFeeAssetE12 = 1e12 * 2^192 / sqrtPriceX96^2
|
|
122
|
+
*
|
|
123
|
+
* Inverted:
|
|
124
|
+
* sqrtPriceX96^2 = 1e12 * 2^192 / ethPerFeeAssetE12
|
|
125
|
+
* sqrtPriceX96 = sqrt(1e12 * 2^192 / ethPerFeeAssetE12)
|
|
126
|
+
*
|
|
127
|
+
* @param ethPerFeeAssetE12 - The price in ETH per fee asset, scaled by 1e12
|
|
128
|
+
*/
|
|
129
|
+
async setEthPerFeeAsset(ethPerFeeAssetE12: bigint) {
|
|
130
|
+
const sqrtPriceX96 = this.ethPerFeeAssetE12ToSqrtPriceX96(ethPerFeeAssetE12);
|
|
131
|
+
return await this.setSqrtPriceX96(sqrtPriceX96);
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
/**
|
|
135
|
+
* Sets the sqrtPriceX96 value directly (Uniswap's price encoding).
|
|
136
|
+
* @param sqrtPriceX96 - The sqrtPriceX96 value
|
|
137
|
+
* @param tick - The tick value (default 10)
|
|
138
|
+
* @param protocolFee - The protocol fee (default 0)
|
|
139
|
+
* @param lpFee - The LP fee (default 500)
|
|
140
|
+
*/
|
|
141
|
+
async setSqrtPriceX96(sqrtPriceX96: bigint, tick: number = 10, protocolFee: number = 0, lpFee: number = 500) {
|
|
142
|
+
const contract = getContract({
|
|
143
|
+
address: this.address.toString() as `0x${string}`,
|
|
144
|
+
abi: MockStateView.ABI,
|
|
145
|
+
client: this.walletClient,
|
|
146
|
+
});
|
|
147
|
+
|
|
148
|
+
const hash = await contract.write.setReturnValues([sqrtPriceX96, tick, protocolFee, lpFee]);
|
|
149
|
+
this.log.info(`Set sqrtPriceX96 to ${sqrtPriceX96}`);
|
|
150
|
+
return await this.walletClient.waitForTransactionReceipt({ hash });
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
/**
|
|
154
|
+
* Converts ethPerFeeAssetE12 to sqrtPriceX96 (inverse of sqrtPriceX96ToEthPerFeeAssetE12).
|
|
155
|
+
*
|
|
156
|
+
* Math:
|
|
157
|
+
* sqrtPriceX96 = sqrt(1e12 * 2^192 / ethPerFeeAssetE12)
|
|
158
|
+
*/
|
|
159
|
+
ethPerFeeAssetE12ToSqrtPriceX96(ethPerFeeAssetE12: bigint): bigint {
|
|
160
|
+
if (ethPerFeeAssetE12 === 0n) {
|
|
161
|
+
throw new Error('Cannot convert zero ethPerFeeAssetE12');
|
|
162
|
+
}
|
|
163
|
+
const Q192 = 2n ** 192n;
|
|
164
|
+
const sqrtPriceSquared = (10n ** 12n * Q192) / ethPerFeeAssetE12;
|
|
165
|
+
return this.bigintSqrt(sqrtPriceSquared);
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
/** Integer square root using Newton's method */
|
|
169
|
+
bigintSqrt(n: bigint): bigint {
|
|
170
|
+
if (n < 0n) {
|
|
171
|
+
throw new Error('Cannot compute sqrt of negative number');
|
|
172
|
+
}
|
|
173
|
+
if (n === 0n) {
|
|
174
|
+
return 0n;
|
|
175
|
+
}
|
|
176
|
+
let x = n;
|
|
177
|
+
let y = (x + 1n) / 2n;
|
|
178
|
+
while (y < x) {
|
|
179
|
+
x = y;
|
|
180
|
+
y = (x + n / x) / 2n;
|
|
181
|
+
}
|
|
182
|
+
return x;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
export function diffInBps(a: bigint, b: bigint): bigint {
|
|
187
|
+
return ((a - b) * 10000n) / b;
|
|
188
|
+
}
|
|
@@ -119,39 +119,11 @@ export class TokenSimulator {
|
|
|
119
119
|
}
|
|
120
120
|
|
|
121
121
|
async checkPrivate() {
|
|
122
|
-
// Private calls
|
|
123
|
-
const defaultLookups = [];
|
|
124
|
-
const nonDefaultLookups = [];
|
|
125
|
-
|
|
126
122
|
for (const address of this.accounts) {
|
|
127
|
-
if (this.lookupProvider.has(address.toString())) {
|
|
128
|
-
nonDefaultLookups.push(address);
|
|
129
|
-
} else {
|
|
130
|
-
defaultLookups.push(address);
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
const defaultCalls = defaultLookups.map(address => this.token.methods.balance_of_private(address));
|
|
135
|
-
const results = (
|
|
136
|
-
await Promise.all(
|
|
137
|
-
chunk(defaultCalls, 4).map(batch =>
|
|
138
|
-
new BatchCall(this.defaultWallet, batch).simulate({ from: this.defaultAddress }),
|
|
139
|
-
),
|
|
140
|
-
)
|
|
141
|
-
).flat();
|
|
142
|
-
for (let i = 0; i < defaultLookups.length; i++) {
|
|
143
|
-
expect(results[i]).toEqual(this.balanceOfPrivate(defaultLookups[i]));
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
// We are just running individual calls for the non-default lookups
|
|
147
|
-
// @todo We should also batch these
|
|
148
|
-
for (const address of nonDefaultLookups) {
|
|
149
123
|
const wallet = this.lookupProvider.get(address.toString());
|
|
150
124
|
const asset = wallet ? this.token.withWallet(wallet) : this.token;
|
|
151
125
|
|
|
152
|
-
const actualPrivateBalance = await asset.methods
|
|
153
|
-
.balance_of_private({ address })
|
|
154
|
-
.simulate({ from: this.defaultAddress });
|
|
126
|
+
const actualPrivateBalance = await asset.methods.balance_of_private(address).simulate({ from: address });
|
|
155
127
|
expect(actualPrivateBalance).toEqual(this.balanceOfPrivate(address));
|
|
156
128
|
}
|
|
157
129
|
}
|
|
@@ -20,6 +20,7 @@ import { getBBConfig } from '../fixtures/get_bb_config.js';
|
|
|
20
20
|
import { getSponsoredFPCAddress, registerSponsoredFPC } from '../fixtures/utils.js';
|
|
21
21
|
import { TestWallet } from '../test-wallet/test_wallet.js';
|
|
22
22
|
import { proveInteraction } from '../test-wallet/utils.js';
|
|
23
|
+
import { WorkerWallet } from '../test-wallet/worker_wallet.js';
|
|
23
24
|
|
|
24
25
|
export interface TestAccounts {
|
|
25
26
|
aztecNode: AztecNode;
|
|
@@ -397,3 +398,42 @@ export async function createWalletAndAztecNodeClient(
|
|
|
397
398
|
},
|
|
398
399
|
};
|
|
399
400
|
}
|
|
401
|
+
|
|
402
|
+
export type WorkerWalletWrapper = {
|
|
403
|
+
wallet: WorkerWallet;
|
|
404
|
+
aztecNode: AztecNode;
|
|
405
|
+
cleanup: () => Promise<void>;
|
|
406
|
+
};
|
|
407
|
+
|
|
408
|
+
export async function createWorkerWalletClient(
|
|
409
|
+
nodeUrl: string,
|
|
410
|
+
proverEnabled: boolean,
|
|
411
|
+
logger: Logger,
|
|
412
|
+
): Promise<WorkerWalletWrapper> {
|
|
413
|
+
const aztecNode = createAztecNodeClient(nodeUrl);
|
|
414
|
+
const [bbConfig, acvmConfig] = await Promise.all([getBBConfig(logger), getACVMConfig(logger)]);
|
|
415
|
+
|
|
416
|
+
// Strip cleanup functions — they can't be structured-cloned for worker transfer
|
|
417
|
+
const { cleanup: bbCleanup, ...bbPaths } = bbConfig ?? {};
|
|
418
|
+
const { cleanup: acvmCleanup, ...acvmPaths } = acvmConfig ?? {};
|
|
419
|
+
|
|
420
|
+
const pxeConfig = {
|
|
421
|
+
dataDirectory: undefined,
|
|
422
|
+
dataStoreMapSizeKb: 1024 * 1024,
|
|
423
|
+
...bbPaths,
|
|
424
|
+
...acvmPaths,
|
|
425
|
+
proverEnabled,
|
|
426
|
+
};
|
|
427
|
+
|
|
428
|
+
const wallet = await WorkerWallet.create(nodeUrl, pxeConfig);
|
|
429
|
+
|
|
430
|
+
return {
|
|
431
|
+
wallet,
|
|
432
|
+
aztecNode,
|
|
433
|
+
async cleanup() {
|
|
434
|
+
await wallet.stop();
|
|
435
|
+
await bbCleanup?.();
|
|
436
|
+
await acvmCleanup?.();
|
|
437
|
+
},
|
|
438
|
+
};
|
|
439
|
+
}
|
package/src/spartan/utils/bot.ts
CHANGED
|
@@ -34,7 +34,8 @@ export async function installTransferBot({
|
|
|
34
34
|
logger: log,
|
|
35
35
|
replicas = 1,
|
|
36
36
|
txIntervalSeconds = 10,
|
|
37
|
-
followChain = '
|
|
37
|
+
followChain = 'CHECKPOINTED',
|
|
38
|
+
pxeSyncChainTip = 'proposed',
|
|
38
39
|
mnemonic = process.env.LABS_INFRA_MNEMONIC ?? 'test test test test test test test test test test test junk',
|
|
39
40
|
mnemonicStartIndex,
|
|
40
41
|
botPrivateKey = process.env.BOT_TRANSFERS_L2_PRIVATE_KEY ?? '0xcafe01',
|
|
@@ -49,6 +50,7 @@ export async function installTransferBot({
|
|
|
49
50
|
replicas?: number;
|
|
50
51
|
txIntervalSeconds?: number;
|
|
51
52
|
followChain?: string;
|
|
53
|
+
pxeSyncChainTip?: string;
|
|
52
54
|
mnemonic?: string;
|
|
53
55
|
mnemonicStartIndex?: number | string;
|
|
54
56
|
botPrivateKey?: string;
|
|
@@ -67,6 +69,7 @@ export async function installTransferBot({
|
|
|
67
69
|
'bot.replicaCount': replicas,
|
|
68
70
|
'bot.txIntervalSeconds': txIntervalSeconds,
|
|
69
71
|
'bot.followChain': followChain,
|
|
72
|
+
'bot.pxeSyncChainTip': pxeSyncChainTip,
|
|
70
73
|
'bot.botPrivateKey': botPrivateKey,
|
|
71
74
|
'bot.nodeUrl': resolvedNodeUrl,
|
|
72
75
|
'bot.mnemonic': mnemonic,
|
package/src/spartan/utils/k8s.ts
CHANGED
|
@@ -522,6 +522,14 @@ export function createResilientPrometheusConnection(
|
|
|
522
522
|
return { connect, runAlertCheck };
|
|
523
523
|
}
|
|
524
524
|
|
|
525
|
+
/** Scales the prover-agent Deployment to the given number of replicas. */
|
|
526
|
+
export async function scaleProverAgents(namespace: string, replicas: number, log: Logger): Promise<void> {
|
|
527
|
+
const label = 'app.kubernetes.io/component=prover-agent';
|
|
528
|
+
const command = `kubectl scale deployment -l ${label} -n ${namespace} --replicas=${replicas} --timeout=2m`;
|
|
529
|
+
log.info(`Scaling prover agents to ${replicas}: ${command}`);
|
|
530
|
+
await execAsync(command);
|
|
531
|
+
}
|
|
532
|
+
|
|
525
533
|
export function getChartDir(spartanDir: string, chartName: string) {
|
|
526
534
|
return path.join(spartanDir.trim(), chartName);
|
|
527
535
|
}
|
|
@@ -16,13 +16,14 @@ import { AccountManager, type SendOptions } from '@aztec/aztec.js/wallet';
|
|
|
16
16
|
import type { DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
|
|
17
17
|
import { Fq, Fr } from '@aztec/foundation/curves/bn254';
|
|
18
18
|
import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
|
|
19
|
+
import type { AccessScopes, NotesFilter } from '@aztec/pxe/client/lazy';
|
|
19
20
|
import { type PXEConfig, getPXEConfig } from '@aztec/pxe/config';
|
|
20
21
|
import { PXE, type PXECreationOptions, createPXE } from '@aztec/pxe/server';
|
|
21
22
|
import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
22
23
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
23
24
|
import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
|
|
24
25
|
import { deriveSigningKey } from '@aztec/stdlib/keys';
|
|
25
|
-
import type { NoteDao
|
|
26
|
+
import type { NoteDao } from '@aztec/stdlib/note';
|
|
26
27
|
import type { BlockHeader, TxHash, TxReceipt, TxSimulationResult } from '@aztec/stdlib/tx';
|
|
27
28
|
import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
|
|
28
29
|
import { BaseWallet, type FeeOptions } from '@aztec/wallet-sdk/base-wallet';
|
|
@@ -227,11 +228,19 @@ export class TestWallet extends BaseWallet {
|
|
|
227
228
|
executionPayload: ExecutionPayload,
|
|
228
229
|
from: AztecAddress,
|
|
229
230
|
feeOptions: FeeOptions,
|
|
231
|
+
scopes: AccessScopes,
|
|
230
232
|
skipTxValidation?: boolean,
|
|
231
233
|
skipFeeEnforcement?: boolean,
|
|
232
234
|
): Promise<TxSimulationResult> {
|
|
233
235
|
if (!this.simulatedSimulations) {
|
|
234
|
-
return super.simulateViaEntrypoint(
|
|
236
|
+
return super.simulateViaEntrypoint(
|
|
237
|
+
executionPayload,
|
|
238
|
+
from,
|
|
239
|
+
feeOptions,
|
|
240
|
+
scopes,
|
|
241
|
+
skipTxValidation,
|
|
242
|
+
skipFeeEnforcement,
|
|
243
|
+
);
|
|
235
244
|
}
|
|
236
245
|
|
|
237
246
|
const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
|
|
@@ -259,13 +268,14 @@ export class TestWallet extends BaseWallet {
|
|
|
259
268
|
skipFeeEnforcement: true,
|
|
260
269
|
skipTxValidation: true,
|
|
261
270
|
overrides: { contracts: contractOverrides },
|
|
271
|
+
scopes,
|
|
262
272
|
});
|
|
263
273
|
}
|
|
264
274
|
|
|
265
275
|
async proveTx(exec: ExecutionPayload, opts: Omit<SendOptions, 'wait'>): Promise<ProvenTx> {
|
|
266
276
|
const fee = await this.completeFeeOptions(opts.from, exec.feePayer, opts.fee?.gasSettings);
|
|
267
277
|
const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(exec, opts.from, fee);
|
|
268
|
-
const txProvingResult = await this.pxe.proveTx(txRequest);
|
|
278
|
+
const txProvingResult = await this.pxe.proveTx(txRequest, this.scopesFor(opts.from));
|
|
269
279
|
return new ProvenTx(
|
|
270
280
|
this.aztecNode,
|
|
271
281
|
await txProvingResult.toTx(),
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { createAztecNodeClient } from '@aztec/aztec.js/node';
|
|
2
|
+
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
3
|
+
import type { ApiSchema } from '@aztec/foundation/schemas';
|
|
4
|
+
import { parseWithOptionals, schemaHasMethod } from '@aztec/foundation/schemas';
|
|
5
|
+
import { NodeListener, TransportServer } from '@aztec/foundation/transport';
|
|
6
|
+
|
|
7
|
+
import { workerData } from 'worker_threads';
|
|
8
|
+
|
|
9
|
+
import { TestWallet } from './test_wallet.js';
|
|
10
|
+
import { WorkerWalletSchema } from './worker_wallet_schema.js';
|
|
11
|
+
|
|
12
|
+
const { nodeUrl, pxeConfig } = workerData as { nodeUrl: string; pxeConfig?: Record<string, unknown> };
|
|
13
|
+
|
|
14
|
+
const node = createAztecNodeClient(nodeUrl);
|
|
15
|
+
const wallet = await TestWallet.create(node, pxeConfig);
|
|
16
|
+
|
|
17
|
+
/** Handlers for methods that need custom implementation (not direct wallet passthrough). */
|
|
18
|
+
const handlers: Record<string, (...args: any[]) => Promise<any>> = {
|
|
19
|
+
proveTx: async (exec, opts) => {
|
|
20
|
+
const provenTx = await wallet.proveTx(exec, opts);
|
|
21
|
+
// ProvenTx has non-serializable fields (node proxy, etc.) — extract only Tx-compatible fields
|
|
22
|
+
const { data, chonkProof, contractClassLogFields, publicFunctionCalldata } = provenTx;
|
|
23
|
+
return { data, chonkProof, contractClassLogFields, publicFunctionCalldata };
|
|
24
|
+
},
|
|
25
|
+
registerAccount: async (secret, salt) => {
|
|
26
|
+
const manager = await wallet.createSchnorrAccount(secret, salt);
|
|
27
|
+
return manager.address;
|
|
28
|
+
},
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
const schema = WorkerWalletSchema as ApiSchema;
|
|
32
|
+
const listener = new NodeListener();
|
|
33
|
+
const server = new TransportServer<{ fn: string; args: string }>(listener, async msg => {
|
|
34
|
+
if (!schemaHasMethod(schema, msg.fn)) {
|
|
35
|
+
throw new Error(`Unknown method: ${msg.fn}`);
|
|
36
|
+
}
|
|
37
|
+
const jsonParams = JSON.parse(msg.args) as unknown[];
|
|
38
|
+
const args = await parseWithOptionals(jsonParams, schema[msg.fn].parameters());
|
|
39
|
+
const handler = handlers[msg.fn];
|
|
40
|
+
const result = handler ? await handler(...args) : await (wallet as any)[msg.fn](...args);
|
|
41
|
+
return jsonStringify(result);
|
|
42
|
+
});
|
|
43
|
+
server.start();
|
|
@@ -0,0 +1,165 @@
|
|
|
1
|
+
import type { CallIntent, IntentInnerHash } from '@aztec/aztec.js/authorization';
|
|
2
|
+
import type { InteractionWaitOptions, SendReturn } from '@aztec/aztec.js/contracts';
|
|
3
|
+
import type {
|
|
4
|
+
Aliased,
|
|
5
|
+
AppCapabilities,
|
|
6
|
+
BatchResults,
|
|
7
|
+
BatchedMethod,
|
|
8
|
+
ContractClassMetadata,
|
|
9
|
+
ContractMetadata,
|
|
10
|
+
PrivateEvent,
|
|
11
|
+
PrivateEventFilter,
|
|
12
|
+
ProfileOptions,
|
|
13
|
+
SendOptions,
|
|
14
|
+
SimulateOptions,
|
|
15
|
+
SimulateUtilityOptions,
|
|
16
|
+
Wallet,
|
|
17
|
+
WalletCapabilities,
|
|
18
|
+
} from '@aztec/aztec.js/wallet';
|
|
19
|
+
import type { ChainInfo } from '@aztec/entrypoints/interfaces';
|
|
20
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
21
|
+
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
22
|
+
import type { ApiSchema } from '@aztec/foundation/schemas';
|
|
23
|
+
import { NodeConnector, TransportClient } from '@aztec/foundation/transport';
|
|
24
|
+
import type { PXEConfig } from '@aztec/pxe/config';
|
|
25
|
+
import type { ContractArtifact, EventMetadataDefinition, FunctionCall } from '@aztec/stdlib/abi';
|
|
26
|
+
import type { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
27
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
28
|
+
import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
|
|
29
|
+
import type { ExecutionPayload, TxProfileResult, TxSimulationResult, UtilitySimulationResult } from '@aztec/stdlib/tx';
|
|
30
|
+
import { Tx } from '@aztec/stdlib/tx';
|
|
31
|
+
|
|
32
|
+
import { Worker } from 'worker_threads';
|
|
33
|
+
|
|
34
|
+
import { WorkerWalletSchema } from './worker_wallet_schema.js';
|
|
35
|
+
|
|
36
|
+
type WorkerMsg = { fn: string; args: string };
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Wallet implementation that offloads all work to a worker thread.
|
|
40
|
+
* Implements the Wallet interface by proxying calls over a transport layer
|
|
41
|
+
* using JSON serialization with Zod schema parsing on both ends.
|
|
42
|
+
*/
|
|
43
|
+
export class WorkerWallet implements Wallet {
|
|
44
|
+
private constructor(
|
|
45
|
+
private worker: Worker,
|
|
46
|
+
private client: TransportClient<WorkerMsg>,
|
|
47
|
+
) {}
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Creates a WorkerWallet by spawning a worker thread that creates a TestWallet internally.
|
|
51
|
+
* @param nodeUrl - URL of the Aztec node to connect to.
|
|
52
|
+
* @param pxeConfig - Optional PXE configuration overrides.
|
|
53
|
+
* @returns A WorkerWallet ready to use.
|
|
54
|
+
*/
|
|
55
|
+
static async create(nodeUrl: string, pxeConfig?: Partial<PXEConfig>): Promise<WorkerWallet> {
|
|
56
|
+
const worker = new Worker(new URL('./wallet_worker_script.js', import.meta.url), {
|
|
57
|
+
workerData: { nodeUrl, pxeConfig },
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
const connector = new NodeConnector(worker);
|
|
61
|
+
const client = new TransportClient<WorkerMsg>(connector);
|
|
62
|
+
await client.open();
|
|
63
|
+
|
|
64
|
+
const wallet = new WorkerWallet(worker, client);
|
|
65
|
+
// Warmup / readiness check — blocks until the worker has finished creating the TestWallet.
|
|
66
|
+
await wallet.getChainInfo();
|
|
67
|
+
return wallet;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
private async callRaw(fn: string, ...args: any[]): Promise<string> {
|
|
71
|
+
const argsJson = jsonStringify(args);
|
|
72
|
+
return (await this.client.request({ fn, args: argsJson })) as string;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
private async call(fn: string, ...args: any[]): Promise<any> {
|
|
76
|
+
const resultJson = await this.callRaw(fn, ...args);
|
|
77
|
+
const methodSchema = (WorkerWalletSchema as ApiSchema)[fn];
|
|
78
|
+
return methodSchema.returnType().parseAsync(JSON.parse(resultJson));
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
getChainInfo(): Promise<ChainInfo> {
|
|
82
|
+
return this.call('getChainInfo');
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
getContractMetadata(address: AztecAddress): Promise<ContractMetadata> {
|
|
86
|
+
return this.call('getContractMetadata', address);
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
getContractClassMetadata(id: Fr): Promise<ContractClassMetadata> {
|
|
90
|
+
return this.call('getContractClassMetadata', id);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
getPrivateEvents<T>(
|
|
94
|
+
eventMetadata: EventMetadataDefinition,
|
|
95
|
+
eventFilter: PrivateEventFilter,
|
|
96
|
+
): Promise<PrivateEvent<T>[]> {
|
|
97
|
+
return this.call('getPrivateEvents', eventMetadata, eventFilter);
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
registerSender(address: AztecAddress, alias?: string): Promise<AztecAddress> {
|
|
101
|
+
return this.call('registerSender', address, alias);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
getAddressBook(): Promise<Aliased<AztecAddress>[]> {
|
|
105
|
+
return this.call('getAddressBook');
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
getAccounts(): Promise<Aliased<AztecAddress>[]> {
|
|
109
|
+
return this.call('getAccounts');
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
registerContract(
|
|
113
|
+
instance: ContractInstanceWithAddress,
|
|
114
|
+
artifact?: ContractArtifact,
|
|
115
|
+
secretKey?: Fr,
|
|
116
|
+
): Promise<ContractInstanceWithAddress> {
|
|
117
|
+
return this.call('registerContract', instance, artifact, secretKey);
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
simulateTx(exec: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResult> {
|
|
121
|
+
return this.call('simulateTx', exec, opts);
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
simulateUtility(call: FunctionCall, opts: SimulateUtilityOptions): Promise<UtilitySimulationResult> {
|
|
125
|
+
return this.call('simulateUtility', call, opts);
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
profileTx(exec: ExecutionPayload, opts: ProfileOptions): Promise<TxProfileResult> {
|
|
129
|
+
return this.call('profileTx', exec, opts);
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
sendTx<W extends InteractionWaitOptions = undefined>(
|
|
133
|
+
exec: ExecutionPayload,
|
|
134
|
+
opts: SendOptions<W>,
|
|
135
|
+
): Promise<SendReturn<W>> {
|
|
136
|
+
return this.call('sendTx', exec, opts);
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
proveTx(exec: ExecutionPayload, opts: Omit<SendOptions, 'wait'>): Promise<Tx> {
|
|
140
|
+
return this.call('proveTx', exec, opts);
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
/** Registers an account inside the worker's TestWallet, populating its accounts map. */
|
|
144
|
+
registerAccount(secret: Fr, salt: Fr): Promise<AztecAddress> {
|
|
145
|
+
return this.call('registerAccount', secret, salt);
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
createAuthWit(from: AztecAddress, messageHashOrIntent: IntentInnerHash | CallIntent): Promise<AuthWitness> {
|
|
149
|
+
return this.call('createAuthWit', from, messageHashOrIntent);
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
requestCapabilities(manifest: AppCapabilities): Promise<WalletCapabilities> {
|
|
153
|
+
return this.call('requestCapabilities', manifest);
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
batch<const T extends readonly BatchedMethod[]>(methods: T): Promise<BatchResults<T>> {
|
|
157
|
+
return this.call('batch', methods);
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
/** Shuts down the worker thread and closes the transport. */
|
|
161
|
+
async stop(): Promise<void> {
|
|
162
|
+
this.client.close();
|
|
163
|
+
await this.worker.terminate();
|
|
164
|
+
}
|
|
165
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ExecutionPayloadSchema, SendOptionsSchema, WalletSchema } from '@aztec/aztec.js/wallet';
|
|
2
|
+
import { schemas } from '@aztec/foundation/schemas';
|
|
3
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
4
|
+
import { Tx } from '@aztec/stdlib/tx';
|
|
5
|
+
|
|
6
|
+
import { z } from 'zod';
|
|
7
|
+
|
|
8
|
+
/** Schema for the WorkerWallet API — extends WalletSchema with proveTx and registerAccount. */
|
|
9
|
+
export const WorkerWalletSchema = {
|
|
10
|
+
...WalletSchema,
|
|
11
|
+
proveTx: z.function().args(ExecutionPayloadSchema, SendOptionsSchema).returns(Tx.schema),
|
|
12
|
+
registerAccount: z.function().args(schemas.Fr, schemas.Fr).returns(AztecAddress.schema),
|
|
13
|
+
};
|