@aztec/end-to-end 0.0.1-commit.d431d1c → 0.0.1-commit.db765a8
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 +39 -23
- package/dest/bench/client_flows/config.d.ts +2 -2
- package/dest/bench/client_flows/config.d.ts.map +1 -1
- package/dest/bench/client_flows/config.js +18 -0
- package/dest/bench/utils.d.ts +5 -4
- package/dest/bench/utils.d.ts.map +1 -1
- package/dest/bench/utils.js +13 -8
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +4 -2
- 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 +27 -18
- 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_cross_chain_messaging/cross_chain_messaging_test.js +3 -2
- 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_epochs/epochs_test.d.ts +15 -7
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +86 -39
- package/dest/e2e_fees/bridging_race.notest.js +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_fees/fees_test.js +16 -16
- package/dest/e2e_l1_publisher/write_json.d.ts +4 -3
- package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
- package/dest/e2e_l1_publisher/write_json.js +1 -7
- package/dest/e2e_nested_contract/nested_contract_test.js +4 -6
- package/dest/e2e_p2p/p2p_network.d.ts +4 -3
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.js +28 -7
- package/dest/e2e_p2p/reqresp/utils.d.ts +22 -0
- package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -0
- package/dest/e2e_p2p/reqresp/utils.js +177 -0
- package/dest/e2e_p2p/shared.d.ts +20 -6
- package/dest/e2e_p2p/shared.d.ts.map +1 -1
- package/dest/e2e_p2p/shared.js +38 -18
- package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts +2 -0
- package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts.map +1 -0
- package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.js +184 -0
- package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts +18 -0
- package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts.map +1 -0
- package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.js +120 -0
- package/dest/e2e_token_contract/token_contract_test.d.ts +4 -2
- package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
- package/dest/e2e_token_contract/token_contract_test.js +20 -10
- 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 +4 -4
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.js +41 -45
- package/dest/fixtures/elu_monitor.d.ts +21 -0
- package/dest/fixtures/elu_monitor.d.ts.map +1 -0
- package/dest/fixtures/elu_monitor.js +102 -0
- 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 +71 -0
- package/dest/fixtures/ha_setup.d.ts.map +1 -0
- package/dest/fixtures/ha_setup.js +116 -0
- package/dest/fixtures/index.d.ts +2 -1
- package/dest/fixtures/index.d.ts.map +1 -1
- package/dest/fixtures/index.js +1 -0
- package/dest/fixtures/setup.d.ts +43 -25
- package/dest/fixtures/setup.d.ts.map +1 -1
- package/dest/fixtures/setup.js +90 -169
- package/dest/fixtures/setup_p2p_test.d.ts +16 -9
- package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
- package/dest/fixtures/setup_p2p_test.js +40 -29
- package/dest/fixtures/token_utils.d.ts +2 -2
- package/dest/fixtures/token_utils.d.ts.map +1 -1
- package/dest/fixtures/token_utils.js +12 -8
- package/dest/shared/cross_chain_test_harness.d.ts +3 -4
- package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
- package/dest/shared/cross_chain_test_harness.js +24 -24
- package/dest/shared/gas_portal_test_harness.js +3 -3
- 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/jest_setup.js +41 -1
- 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/shared/submit-transactions.d.ts +4 -4
- package/dest/shared/submit-transactions.d.ts.map +1 -1
- package/dest/shared/submit-transactions.js +9 -11
- package/dest/shared/uniswap_l1_l2.d.ts +1 -1
- package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
- package/dest/shared/uniswap_l1_l2.js +24 -22
- package/dest/simulators/lending_simulator.d.ts +1 -1
- package/dest/simulators/lending_simulator.d.ts.map +1 -1
- package/dest/simulators/lending_simulator.js +4 -4
- 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 +3 -24
- package/dest/spartan/setup_test_wallets.d.ts +9 -2
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +93 -35
- package/dest/spartan/tx_metrics.d.ts +38 -2
- package/dest/spartan/tx_metrics.d.ts.map +1 -1
- package/dest/spartan/tx_metrics.js +179 -5
- package/dest/spartan/utils/bot.d.ts +28 -0
- package/dest/spartan/utils/bot.d.ts.map +1 -0
- package/dest/spartan/utils/bot.js +142 -0
- package/dest/spartan/utils/chaos.d.ts +79 -0
- package/dest/spartan/utils/chaos.d.ts.map +1 -0
- package/dest/spartan/utils/chaos.js +142 -0
- package/dest/spartan/utils/clients.d.ts +39 -0
- package/dest/spartan/utils/clients.d.ts.map +1 -0
- package/dest/spartan/utils/clients.js +90 -0
- package/dest/spartan/utils/config.d.ts +42 -0
- package/dest/spartan/utils/config.d.ts.map +1 -0
- package/dest/spartan/utils/config.js +22 -0
- package/dest/spartan/utils/health.d.ts +63 -0
- package/dest/spartan/utils/health.d.ts.map +1 -0
- package/dest/spartan/utils/health.js +202 -0
- package/dest/spartan/utils/helm.d.ts +15 -0
- package/dest/spartan/utils/helm.d.ts.map +1 -0
- package/dest/spartan/utils/helm.js +47 -0
- package/dest/spartan/utils/index.d.ts +10 -0
- package/dest/spartan/utils/index.d.ts.map +1 -0
- package/dest/spartan/utils/index.js +20 -0
- package/dest/spartan/utils/k8s.d.ts +128 -0
- package/dest/spartan/utils/k8s.d.ts.map +1 -0
- package/dest/spartan/utils/k8s.js +381 -0
- package/dest/spartan/utils/nodes.d.ts +40 -0
- package/dest/spartan/utils/nodes.d.ts.map +1 -0
- package/dest/spartan/utils/nodes.js +461 -0
- package/dest/spartan/utils/scripts.d.ts +30 -0
- package/dest/spartan/utils/scripts.d.ts.map +1 -0
- package/dest/spartan/utils/scripts.js +81 -0
- package/dest/spartan/utils.d.ts +2 -260
- package/dest/spartan/utils.d.ts.map +1 -1
- package/dest/spartan/utils.js +1 -942
- package/dest/test-wallet/test_wallet.d.ts +83 -0
- package/dest/test-wallet/test_wallet.d.ts.map +1 -0
- package/dest/test-wallet/test_wallet.js +214 -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/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 +48 -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 +151 -0
- package/dest/test-wallet/worker_wallet_schema.d.ts +274 -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 +46 -43
- package/src/bench/client_flows/client_flows_benchmark.ts +45 -57
- package/src/bench/client_flows/config.ts +9 -1
- package/src/bench/utils.ts +15 -8
- package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +33 -23
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +7 -8
- package/src/e2e_deploy_contract/deploy_test.ts +3 -3
- package/src/e2e_epochs/epochs_test.ts +129 -93
- package/src/e2e_fees/bridging_race.notest.ts +2 -5
- package/src/e2e_fees/fees_test.ts +24 -39
- package/src/e2e_l1_publisher/write_json.ts +3 -8
- package/src/e2e_nested_contract/nested_contract_test.ts +7 -7
- package/src/e2e_p2p/inactivity_slash_test.ts +4 -4
- package/src/e2e_p2p/p2p_network.ts +49 -17
- package/src/e2e_p2p/reqresp/utils.ts +235 -0
- package/src/e2e_p2p/shared.ts +66 -23
- package/src/e2e_storage_proof/fixtures/storage_proof.json +915 -0
- package/src/e2e_storage_proof/fixtures/storage_proof_fetcher.ts +190 -0
- package/src/e2e_storage_proof/fixtures/storage_proof_fixture.ts +173 -0
- package/src/e2e_token_contract/token_contract_test.ts +27 -12
- 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 +43 -52
- package/src/fixtures/elu_monitor.ts +126 -0
- package/src/fixtures/fixtures.ts +10 -0
- package/src/fixtures/ha_setup.ts +186 -0
- package/src/fixtures/index.ts +1 -0
- package/src/fixtures/setup.ts +120 -233
- package/src/fixtures/setup_p2p_test.ts +40 -44
- package/src/fixtures/token_utils.ts +10 -6
- package/src/guides/up_quick_start.sh +3 -3
- package/src/shared/cross_chain_test_harness.ts +24 -34
- package/src/shared/gas_portal_test_harness.ts +2 -2
- package/src/shared/index.ts +1 -0
- package/src/shared/jest_setup.ts +51 -1
- package/src/shared/mock_state_view.ts +188 -0
- package/src/shared/submit-transactions.ts +11 -16
- package/src/shared/uniswap_l1_l2.ts +26 -33
- package/src/simulators/lending_simulator.ts +6 -4
- package/src/simulators/token_simulator.ts +6 -30
- package/src/spartan/setup_test_wallets.ts +120 -25
- package/src/spartan/tx_metrics.ts +153 -8
- package/src/spartan/utils/bot.ts +188 -0
- package/src/spartan/utils/chaos.ts +253 -0
- package/src/spartan/utils/clients.ts +100 -0
- package/src/spartan/utils/config.ts +28 -0
- package/src/spartan/utils/health.ts +255 -0
- package/src/spartan/utils/helm.ts +84 -0
- package/src/spartan/utils/index.ts +68 -0
- package/src/spartan/utils/k8s.ts +535 -0
- package/src/spartan/utils/nodes.ts +543 -0
- package/src/spartan/utils/scripts.ts +99 -0
- package/src/spartan/utils.ts +1 -1246
- package/src/test-wallet/test_wallet.ts +306 -0
- package/src/test-wallet/utils.ts +112 -0
- package/src/test-wallet/wallet_worker_script.ts +60 -0
- package/src/test-wallet/worker_wallet.ts +213 -0
- package/src/test-wallet/worker_wallet_schema.ts +13 -0
|
@@ -0,0 +1,184 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Fetches a ERC20 balance storage proof from the Ethereum mainnet and saves it to a Prover.toml compatible JSON.
|
|
3
|
+
* The JSON can be converted to toml for use with nargo, or used directly as a JSON file when used in
|
|
4
|
+
* Aztec contracts. This script is not using any Aztec library code, so it's easily portable.
|
|
5
|
+
*/ import fs from 'fs';
|
|
6
|
+
import { dirname, join } from 'path';
|
|
7
|
+
import { fileURLToPath } from 'url';
|
|
8
|
+
import { createPublicClient, encodeAbiParameters, fromRlp, hexToBytes, http, keccak256 } from 'viem';
|
|
9
|
+
import { mainnet } from 'viem/chains';
|
|
10
|
+
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
11
|
+
const RPC_URL = process.env.RPC_URL;
|
|
12
|
+
const ERC20_CONTRACT = process.env.ERC20_CONTRACT || '0xdAC17F958D2ee523a2206206994597C13D831ec7';
|
|
13
|
+
const HOLDER = process.env.HOLDER || '0x23878914EFE38d27C4D67Ab83ed1b93A74D4086a';
|
|
14
|
+
const SLOT = BigInt(process.env.SLOT || '2');
|
|
15
|
+
const BLOCK_TAG = process.env.BLOCK_NUMBER ? BigInt(process.env.BLOCK_NUMBER) : 'latest';
|
|
16
|
+
const MAX_ACCOUNT_PATH = 15;
|
|
17
|
+
const MAX_STORAGE_PATH = 10;
|
|
18
|
+
function padTo(arr, len) {
|
|
19
|
+
return [
|
|
20
|
+
...arr,
|
|
21
|
+
...Array(len - arr.length).fill(0)
|
|
22
|
+
].slice(0, len);
|
|
23
|
+
}
|
|
24
|
+
function toBytes(hex) {
|
|
25
|
+
return Array.from(hexToBytes(hex));
|
|
26
|
+
}
|
|
27
|
+
function bytesToU64s(bytes) {
|
|
28
|
+
const paddedBytes = padTo(bytes, 32);
|
|
29
|
+
return Array.from({
|
|
30
|
+
length: 4
|
|
31
|
+
}, (_, i)=>{
|
|
32
|
+
let val = 0n;
|
|
33
|
+
for(let j = 0; j < 8; j++){
|
|
34
|
+
val += BigInt(paddedBytes[i * 8 + j]) << BigInt(j * 8);
|
|
35
|
+
}
|
|
36
|
+
return val.toString();
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
function toBytesAndLen(val) {
|
|
40
|
+
if (val === 0n || val === 0) {
|
|
41
|
+
return {
|
|
42
|
+
bytes: [
|
|
43
|
+
0
|
|
44
|
+
],
|
|
45
|
+
length: 0
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
let hex = val.toString(16);
|
|
49
|
+
if (hex.length % 2) {
|
|
50
|
+
hex = '0' + hex;
|
|
51
|
+
}
|
|
52
|
+
const bytes = toBytes(`0x${hex}`);
|
|
53
|
+
return {
|
|
54
|
+
bytes,
|
|
55
|
+
length: bytes.length
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
function parseNode(rlp) {
|
|
59
|
+
// Should be safe when working with branches and extensions without embedded children.
|
|
60
|
+
const decoded = fromRlp(rlp);
|
|
61
|
+
const node = {
|
|
62
|
+
rows: Array(16).fill(0).map(()=>Array(32).fill(0)),
|
|
63
|
+
row_exist: Array(16).fill(false),
|
|
64
|
+
node_type: 0
|
|
65
|
+
};
|
|
66
|
+
if (decoded.length === 17) {
|
|
67
|
+
for(let i = 0; i < 16; i++){
|
|
68
|
+
if (decoded[i] !== '0x') {
|
|
69
|
+
node.row_exist[i] = true;
|
|
70
|
+
node.rows[i] = padTo(toBytes(decoded[i]), 32);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
} else if (decoded.length === 2) {
|
|
74
|
+
const keyBytes = toBytes(decoded[0]);
|
|
75
|
+
const prefix = keyBytes[0];
|
|
76
|
+
if (prefix >> 4 >= 2) {
|
|
77
|
+
throw new Error('Unsupported: leaf node in proof path');
|
|
78
|
+
}
|
|
79
|
+
node.node_type = 1;
|
|
80
|
+
// Extension header format expected by the noir code: check out storage_proof types.nr.
|
|
81
|
+
node.rows[0][0] = prefix >> 4;
|
|
82
|
+
node.rows[0][8] = prefix & 0x0f;
|
|
83
|
+
node.rows[0][16] = keyBytes.length - 1;
|
|
84
|
+
for(let i = 1; i < keyBytes.length && i < 32; i++){
|
|
85
|
+
node.rows[1][i - 1] = keyBytes[i];
|
|
86
|
+
}
|
|
87
|
+
node.rows[2] = padTo(toBytes(decoded[1]), 32);
|
|
88
|
+
node.row_exist[0] = node.row_exist[1] = node.row_exist[2] = true;
|
|
89
|
+
}
|
|
90
|
+
return node;
|
|
91
|
+
}
|
|
92
|
+
function parseProof(proof, maxLen) {
|
|
93
|
+
const nodes = proof.slice(0, -1).slice(0, maxLen).map(parseNode);
|
|
94
|
+
while(nodes.length < maxLen){
|
|
95
|
+
nodes.push({
|
|
96
|
+
rows: Array(16).fill(0).map(()=>Array(32).fill(0)),
|
|
97
|
+
row_exist: Array(16).fill(false),
|
|
98
|
+
node_type: 0
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
return nodes;
|
|
102
|
+
}
|
|
103
|
+
function nodeToLibFormat(node) {
|
|
104
|
+
return {
|
|
105
|
+
rows: node.rows.map(bytesToU64s),
|
|
106
|
+
row_exist: node.row_exist,
|
|
107
|
+
node_type: String(node.node_type)
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
async function main() {
|
|
111
|
+
if (!RPC_URL) {
|
|
112
|
+
throw new Error('RPC_URL is not set');
|
|
113
|
+
}
|
|
114
|
+
const storageKey = keccak256(encodeAbiParameters([
|
|
115
|
+
{
|
|
116
|
+
type: 'address'
|
|
117
|
+
},
|
|
118
|
+
{
|
|
119
|
+
type: 'uint256'
|
|
120
|
+
}
|
|
121
|
+
], [
|
|
122
|
+
HOLDER,
|
|
123
|
+
SLOT
|
|
124
|
+
]));
|
|
125
|
+
console.log(`Fetching storage proof for ${ERC20_CONTRACT}, holder ${HOLDER}, slot ${SLOT}`);
|
|
126
|
+
console.log(`Storage key: ${storageKey}`);
|
|
127
|
+
const client = createPublicClient({
|
|
128
|
+
chain: mainnet,
|
|
129
|
+
transport: http(RPC_URL)
|
|
130
|
+
});
|
|
131
|
+
const [blockNumber, proof, block] = await Promise.all([
|
|
132
|
+
client.getBlockNumber(),
|
|
133
|
+
client.getProof({
|
|
134
|
+
address: ERC20_CONTRACT,
|
|
135
|
+
storageKeys: [
|
|
136
|
+
storageKey
|
|
137
|
+
],
|
|
138
|
+
blockNumber: BLOCK_TAG === 'latest' ? undefined : BLOCK_TAG
|
|
139
|
+
}),
|
|
140
|
+
client.getBlock({
|
|
141
|
+
blockNumber: BLOCK_TAG === 'latest' ? undefined : BLOCK_TAG
|
|
142
|
+
})
|
|
143
|
+
]);
|
|
144
|
+
const storageProof = proof.storageProof[0];
|
|
145
|
+
console.log(`Block: ${blockNumber}, Account nodes: ${proof.accountProof.length}, Storage nodes: ${storageProof.proof.length}`);
|
|
146
|
+
console.log(`Value: ${storageProof.value}`);
|
|
147
|
+
// The -1 is because the last node in the proof is the leaf, which is excluded from path verification.
|
|
148
|
+
const accountPathLen = proof.accountProof.length - 1;
|
|
149
|
+
const storagePathLen = storageProof.proof.length - 1;
|
|
150
|
+
if (accountPathLen > MAX_ACCOUNT_PATH) {
|
|
151
|
+
throw new Error(`Account proof path length ${accountPathLen} exceeds MAX_ACCOUNT_PATH ${MAX_ACCOUNT_PATH}. Increase the limit.`);
|
|
152
|
+
}
|
|
153
|
+
if (storagePathLen > MAX_STORAGE_PATH) {
|
|
154
|
+
throw new Error(`Storage proof path length ${storagePathLen} exceeds MAX_STORAGE_PATH ${MAX_STORAGE_PATH}. Increase the limit.`);
|
|
155
|
+
}
|
|
156
|
+
const nonce = toBytesAndLen(proof.nonce);
|
|
157
|
+
const balance = toBytesAndLen(proof.balance);
|
|
158
|
+
const slotValue = toBytesAndLen(storageProof.value);
|
|
159
|
+
const data = {
|
|
160
|
+
account_nodes: parseProof(proof.accountProof, MAX_ACCOUNT_PATH).map(nodeToLibFormat),
|
|
161
|
+
account_node_length: String(accountPathLen),
|
|
162
|
+
storage_nodes: parseProof(storageProof.proof, MAX_STORAGE_PATH).map(nodeToLibFormat),
|
|
163
|
+
storage_node_length: String(storagePathLen),
|
|
164
|
+
account: {
|
|
165
|
+
nonce: padTo(nonce.bytes, 8).map(String),
|
|
166
|
+
nonce_length: String(nonce.length),
|
|
167
|
+
balance: padTo(balance.bytes, 32).map(String),
|
|
168
|
+
balance_length: String(balance.length),
|
|
169
|
+
address: toBytes(ERC20_CONTRACT).map(String),
|
|
170
|
+
storage_hash: bytesToU64s(toBytes(proof.storageHash)),
|
|
171
|
+
code_hash: bytesToU64s(toBytes(proof.codeHash))
|
|
172
|
+
},
|
|
173
|
+
slot: {
|
|
174
|
+
value: padTo(slotValue.bytes, 32).map(String),
|
|
175
|
+
value_length: String(slotValue.length)
|
|
176
|
+
},
|
|
177
|
+
slot_key: toBytes(storageKey).map(String),
|
|
178
|
+
root: bytesToU64s(toBytes(block.stateRoot)),
|
|
179
|
+
block_number: String(blockNumber)
|
|
180
|
+
};
|
|
181
|
+
fs.writeFileSync(join(__dirname, 'storage_proof.json'), JSON.stringify(data, null, 2));
|
|
182
|
+
console.log('storage_proof.json generated');
|
|
183
|
+
}
|
|
184
|
+
main().catch(console.error);
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
+
import { Capsule } from '@aztec/stdlib/tx';
|
|
4
|
+
/** Parsed + typed fixture data ready for use as contract function arguments. */
|
|
5
|
+
export type StorageProofArgs = {
|
|
6
|
+
ethAddress: EthAddress;
|
|
7
|
+
slotKey: number[];
|
|
8
|
+
slotContents: {
|
|
9
|
+
value: number[];
|
|
10
|
+
value_length: number;
|
|
11
|
+
};
|
|
12
|
+
root: bigint[];
|
|
13
|
+
};
|
|
14
|
+
/** Loads the storage proof fixture from disk and returns the contract args. */
|
|
15
|
+
export declare function loadStorageProofArgs(): StorageProofArgs;
|
|
16
|
+
/** Builds all the capsules the StorageProofTest contract expects during private execution. */
|
|
17
|
+
export declare function buildStorageProofCapsules(contractAddress: AztecAddress): Promise<Capsule[]>;
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZV9wcm9vZl9maXh0dXJlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZTJlX3N0b3JhZ2VfcHJvb2YvZml4dHVyZXMvc3RvcmFnZV9wcm9vZl9maXh0dXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRzlELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUF3RjNDLGdGQUFnRjtBQUNoRixNQUFNLE1BQU0sZ0JBQWdCLEdBQUc7SUFDN0IsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2QixPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDbEIsWUFBWSxFQUFFO1FBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxDQUFDO1FBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQTtLQUFFLENBQUM7SUFDeEQsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDO0NBQ2hCLENBQUM7QUFFRiwrRUFBK0U7QUFDL0Usd0JBQWdCLG9CQUFvQixJQUFJLGdCQUFnQixDQWF2RDtBQUVELDhGQUE4RjtBQUM5Rix3QkFBc0IseUJBQXlCLENBQUMsZUFBZSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0F1RGpHIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storage_proof_fixture.d.ts","sourceRoot":"","sources":["../../../src/e2e_storage_proof/fixtures/storage_proof_fixture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAwF3C,gFAAgF;AAChF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,EAAE;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,+EAA+E;AAC/E,wBAAgB,oBAAoB,IAAI,gBAAgB,CAavD;AAED,8FAA8F;AAC9F,wBAAsB,yBAAyB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAuDjG"}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
|
|
2
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
|
+
import { Capsule } from '@aztec/stdlib/tx';
|
|
5
|
+
import { readFileSync } from 'fs';
|
|
6
|
+
import { dirname, join } from 'path';
|
|
7
|
+
import { fileURLToPath } from 'url';
|
|
8
|
+
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
9
|
+
const FIXTURE_PATH = join(__dirname, './storage_proof.json');
|
|
10
|
+
// Constants matching the Noir contract
|
|
11
|
+
const ACCOUNT_CAPSULE_KEY_SEPARATOR = 100;
|
|
12
|
+
const ACCOUNT_PROOF_CAPSULE_KEY_SEPARATOR = 101;
|
|
13
|
+
const STORAGE_PROOF_CAPSULE_KEY_SEPARATOR = 102;
|
|
14
|
+
const STORAGE_PROOF_NODE_CAPSULE_KEY_SEPARATOR = 103;
|
|
15
|
+
const MAX_ACCOUNT_PROOF_LENGTH = 15;
|
|
16
|
+
/** Node: rows [[u64;4];16] (64) + row_exist [bool;16] (16) + node_type u8 (1) = 81 fields */ const NODE_FIELD_COUNT = 81;
|
|
17
|
+
// --- Serialization helpers (Noir struct Serialize layout) ---
|
|
18
|
+
function serializeNode(node) {
|
|
19
|
+
const fields = [];
|
|
20
|
+
for (const row of node.rows){
|
|
21
|
+
for (const val of row){
|
|
22
|
+
fields.push(new Fr(BigInt(val)));
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
for (const exists of node.row_exist){
|
|
26
|
+
fields.push(new Fr(exists ? 1n : 0n));
|
|
27
|
+
}
|
|
28
|
+
fields.push(new Fr(BigInt(node.node_type)));
|
|
29
|
+
return fields;
|
|
30
|
+
}
|
|
31
|
+
/** Account: nonce [u8;8] + balance [u8;32] + address [u8;20] + nonce_length u8 + balance_length u8 + storage_hash [u64;4] + code_hash [u64;4] = 70 fields */ function serializeAccount(account) {
|
|
32
|
+
const fields = [];
|
|
33
|
+
for (const v of account.nonce){
|
|
34
|
+
fields.push(new Fr(BigInt(v)));
|
|
35
|
+
}
|
|
36
|
+
for (const v of account.balance){
|
|
37
|
+
fields.push(new Fr(BigInt(v)));
|
|
38
|
+
}
|
|
39
|
+
for (const v of account.address){
|
|
40
|
+
fields.push(new Fr(BigInt(v)));
|
|
41
|
+
}
|
|
42
|
+
fields.push(new Fr(BigInt(account.nonce_length)));
|
|
43
|
+
fields.push(new Fr(BigInt(account.balance_length)));
|
|
44
|
+
for (const v of account.storage_hash){
|
|
45
|
+
fields.push(new Fr(BigInt(v)));
|
|
46
|
+
}
|
|
47
|
+
for (const v of account.code_hash){
|
|
48
|
+
fields.push(new Fr(BigInt(v)));
|
|
49
|
+
}
|
|
50
|
+
return fields;
|
|
51
|
+
}
|
|
52
|
+
function zeroNode() {
|
|
53
|
+
return Array(NODE_FIELD_COUNT).fill(Fr.ZERO);
|
|
54
|
+
}
|
|
55
|
+
/** Loads the storage proof fixture from disk and returns the contract args. */ export function loadStorageProofArgs() {
|
|
56
|
+
const fixture = JSON.parse(readFileSync(FIXTURE_PATH, 'utf8'));
|
|
57
|
+
const addressBytes = Buffer.from(fixture.account.address.map((v)=>Number(v)));
|
|
58
|
+
return {
|
|
59
|
+
ethAddress: EthAddress.fromString('0x' + addressBytes.toString('hex')),
|
|
60
|
+
slotKey: fixture.slot_key.map((v)=>Number(v)),
|
|
61
|
+
slotContents: {
|
|
62
|
+
value: fixture.slot.value.map((v)=>Number(v)),
|
|
63
|
+
// eslint-disable-next-line camelcase
|
|
64
|
+
value_length: Number(fixture.slot.value_length)
|
|
65
|
+
},
|
|
66
|
+
root: fixture.root.map((v)=>BigInt(v))
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
/** Builds all the capsules the StorageProofTest contract expects during private execution. */ export async function buildStorageProofCapsules(contractAddress) {
|
|
70
|
+
const fixture = JSON.parse(readFileSync(FIXTURE_PATH, 'utf8'));
|
|
71
|
+
const root = fixture.root.map((v)=>BigInt(v));
|
|
72
|
+
const slotKey = fixture.slot_key.map((v)=>Number(v));
|
|
73
|
+
const accountNodeLength = Number(fixture.account_node_length);
|
|
74
|
+
const storageNodeLength = Number(fixture.storage_node_length);
|
|
75
|
+
const ethAddress = EthAddress.fromBuffer(Buffer.from(fixture.account.address.map((v)=>Number(v))));
|
|
76
|
+
// Compute capsule keys (must match the Noir contract's poseidon2_hash computations)
|
|
77
|
+
const addressCapsuleKey = await poseidon2Hash([
|
|
78
|
+
new Fr(ACCOUNT_CAPSULE_KEY_SEPARATOR),
|
|
79
|
+
...root.map((v)=>new Fr(v)),
|
|
80
|
+
ethAddress.toField()
|
|
81
|
+
]);
|
|
82
|
+
const accountProofCapsuleKey = await poseidon2Hash([
|
|
83
|
+
new Fr(ACCOUNT_PROOF_CAPSULE_KEY_SEPARATOR),
|
|
84
|
+
addressCapsuleKey
|
|
85
|
+
]);
|
|
86
|
+
const storageProofCapsuleKey = await poseidon2Hash([
|
|
87
|
+
new Fr(STORAGE_PROOF_CAPSULE_KEY_SEPARATOR),
|
|
88
|
+
addressCapsuleKey,
|
|
89
|
+
...slotKey.map((v)=>new Fr(v))
|
|
90
|
+
]);
|
|
91
|
+
// Build capsule data
|
|
92
|
+
// 1. Account data
|
|
93
|
+
const accountData = serializeAccount(fixture.account);
|
|
94
|
+
// 2. Account proof nodes padded to MAX_ACCOUNT_PROOF_LENGTH
|
|
95
|
+
const accountProofData = [
|
|
96
|
+
new Fr(accountNodeLength)
|
|
97
|
+
];
|
|
98
|
+
for(let i = 0; i < MAX_ACCOUNT_PROOF_LENGTH; i++){
|
|
99
|
+
accountProofData.push(...i < fixture.account_nodes.length ? serializeNode(fixture.account_nodes[i]) : zeroNode());
|
|
100
|
+
}
|
|
101
|
+
// 3. Storage proof length (u32)
|
|
102
|
+
const storageProofLengthData = [
|
|
103
|
+
new Fr(storageNodeLength)
|
|
104
|
+
];
|
|
105
|
+
const capsules = [
|
|
106
|
+
new Capsule(contractAddress, addressCapsuleKey, accountData),
|
|
107
|
+
new Capsule(contractAddress, accountProofCapsuleKey, accountProofData),
|
|
108
|
+
new Capsule(contractAddress, storageProofCapsuleKey, storageProofLengthData)
|
|
109
|
+
];
|
|
110
|
+
// 4. Individual storage node capsules for private recursion.
|
|
111
|
+
for(let i = 0; i < storageNodeLength; i++){
|
|
112
|
+
const nodeCapsuleKey = await poseidon2Hash([
|
|
113
|
+
new Fr(STORAGE_PROOF_NODE_CAPSULE_KEY_SEPARATOR),
|
|
114
|
+
storageProofCapsuleKey,
|
|
115
|
+
new Fr(i)
|
|
116
|
+
]);
|
|
117
|
+
capsules.push(new Capsule(contractAddress, nodeCapsuleKey, serializeNode(fixture.storage_nodes[i])));
|
|
118
|
+
}
|
|
119
|
+
return capsules;
|
|
120
|
+
}
|
|
@@ -2,10 +2,11 @@ import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
|
2
2
|
import { type Logger } from '@aztec/aztec.js/log';
|
|
3
3
|
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
4
4
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
5
|
+
import { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
|
|
5
6
|
import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
|
|
6
|
-
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
7
7
|
import { type EndToEndContext } from '../fixtures/setup.js';
|
|
8
8
|
import { TokenSimulator } from '../simulators/token_simulator.js';
|
|
9
|
+
import type { TestWallet } from '../test-wallet/test_wallet.js';
|
|
9
10
|
export declare class TokenContractTest {
|
|
10
11
|
static TOKEN_NAME: string;
|
|
11
12
|
static TOKEN_SYMBOL: string;
|
|
@@ -17,6 +18,7 @@ export declare class TokenContractTest {
|
|
|
17
18
|
tokenSim: TokenSimulator;
|
|
18
19
|
node: AztecNode;
|
|
19
20
|
badAccount: InvalidAccountContract;
|
|
21
|
+
authwitProxy: GenericProxyContract;
|
|
20
22
|
wallet: TestWallet;
|
|
21
23
|
adminAddress: AztecAddress;
|
|
22
24
|
account1Address: AztecAddress;
|
|
@@ -39,4 +41,4 @@ export declare class TokenContractTest {
|
|
|
39
41
|
teardown(): Promise<void>;
|
|
40
42
|
private applyMint;
|
|
41
43
|
}
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fY29udHJhY3RfdGVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV90b2tlbl9jb250cmFjdC90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBQ2xGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBSXRGLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBeUQsTUFBTSxzQkFBc0IsQ0FBQztBQUVuSCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFJaEUscUJBQWEsaUJBQWlCO0lBQzVCLE1BQU0sQ0FBQyxVQUFVLFNBQVU7SUFDM0IsTUFBTSxDQUFDLFlBQVksU0FBUztJQUM1QixNQUFNLENBQUMsY0FBYyxTQUFPO0lBQzVCLE9BQU8sRUFBRyxlQUFlLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQixLQUFLLEVBQUcsYUFBYSxDQUFDO0lBQ3RCLFFBQVEsRUFBRyxjQUFjLENBQUM7SUFDMUIsSUFBSSxFQUFHLFNBQVMsQ0FBQztJQUVqQixVQUFVLEVBQUcsc0JBQXNCLENBQUM7SUFDcEMsWUFBWSxFQUFHLG9CQUFvQixDQUFDO0lBQ3BDLE1BQU0sRUFBRyxVQUFVLENBQUM7SUFDcEIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixlQUFlLEVBQUcsWUFBWSxDQUFDO0lBQy9CLGVBQWUsRUFBRyxZQUFZLENBQUM7SUFFL0IsT0FBTyxDQUFDLG9CQUFvQixDQUFTO0lBQ3JDLE9BQU8sQ0FBQyxlQUFlLENBQVM7SUFFaEMsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUczQjtJQUVEOzs7T0FHRztJQUNILGtCQUFrQixTQUVqQjtJQUVEOzs7T0FHRztJQUNILGlCQUFpQixTQUVoQjtZQUthLGNBQWM7SUF3RHRCLEtBQUssa0JBY1Y7SUFFSyxRQUFRLGtCQUViO1lBRWEsU0FBUztDQStCeEIifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAItF,OAAO,EAAE,KAAK,eAAe,EAAyD,MAAM,sBAAsB,CAAC;AAEnH,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAIhE,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,IAAI,EAAG,SAAS,CAAC;IAEjB,UAAU,EAAG,sBAAsB,CAAC;IACpC,YAAY,EAAG,oBAAoB,CAAC;IACpC,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,eAAe,EAAG,YAAY,CAAC;IAC/B,eAAe,EAAG,YAAY,CAAC;IAE/B,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,eAAe,CAAS;IAEhC,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAED;;;OAGG;IACH,kBAAkB,SAEjB;IAED;;;OAGG;IACH,iBAAiB,SAEhB;YAKa,cAAc;IAwDtB,KAAK,kBAcV;IAEK,QAAQ,kBAEb;YAEa,SAAS;CA+BxB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createLogger } from '@aztec/aztec.js/log';
|
|
2
2
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
3
|
+
import { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
|
|
3
4
|
import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
|
|
4
5
|
import { jest } from '@jest/globals';
|
|
5
6
|
import { deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
|
|
@@ -17,6 +18,7 @@ export class TokenContractTest {
|
|
|
17
18
|
tokenSim;
|
|
18
19
|
node;
|
|
19
20
|
badAccount;
|
|
21
|
+
authwitProxy;
|
|
20
22
|
wallet;
|
|
21
23
|
adminAddress;
|
|
22
24
|
account1Address;
|
|
@@ -59,22 +61,30 @@ export class TokenContractTest {
|
|
|
59
61
|
this.account1Address
|
|
60
62
|
]);
|
|
61
63
|
this.logger.verbose(`Deploying TokenContract...`);
|
|
62
|
-
this.asset = await TokenContract.deploy(this.wallet, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
|
|
64
|
+
({ contract: this.asset } = await TokenContract.deploy(this.wallet, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
|
|
63
65
|
from: this.adminAddress
|
|
64
|
-
})
|
|
66
|
+
}));
|
|
65
67
|
this.logger.verbose(`Token deployed to ${this.asset.address}`);
|
|
66
68
|
this.logger.verbose(`Deploying bad account...`);
|
|
67
|
-
this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
|
|
69
|
+
({ contract: this.badAccount } = await InvalidAccountContract.deploy(this.wallet).send({
|
|
68
70
|
from: this.adminAddress
|
|
69
|
-
})
|
|
71
|
+
}));
|
|
70
72
|
this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
|
|
73
|
+
// Deploy a proxy contract for "on behalf of other" tests. The note owner must be the tx sender
|
|
74
|
+
// (so their notes are in scope), but msg_sender in the target must differ from the note owner
|
|
75
|
+
// to trigger authwit validation. The proxy forwards calls so that msg_sender != tx sender.
|
|
76
|
+
this.logger.verbose(`Deploying generic proxy...`);
|
|
77
|
+
({ contract: this.authwitProxy } = await GenericProxyContract.deploy(this.wallet).send({
|
|
78
|
+
from: this.adminAddress
|
|
79
|
+
}));
|
|
80
|
+
this.logger.verbose(`Deployed to ${this.authwitProxy.address}.`);
|
|
71
81
|
this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
|
|
72
82
|
this.adminAddress,
|
|
73
83
|
this.account1Address
|
|
74
84
|
]);
|
|
75
|
-
expect(await this.asset.methods.get_admin().simulate({
|
|
85
|
+
expect((await this.asset.methods.get_admin().simulate({
|
|
76
86
|
from: this.adminAddress
|
|
77
|
-
})).toBe(this.adminAddress.toBigInt());
|
|
87
|
+
})).result).toBe(this.adminAddress.toBigInt());
|
|
78
88
|
}
|
|
79
89
|
async setup() {
|
|
80
90
|
this.context = await setup(0, {
|
|
@@ -99,9 +109,9 @@ export class TokenContractTest {
|
|
|
99
109
|
this.logger.verbose(`Minting ${amount} publicly...`);
|
|
100
110
|
await asset.methods.mint_to_public(adminAddress, amount).send({
|
|
101
111
|
from: adminAddress
|
|
102
|
-
})
|
|
112
|
+
});
|
|
103
113
|
tokenSim.mintPublic(adminAddress, amount);
|
|
104
|
-
const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({
|
|
114
|
+
const { result: publicBalance } = await asset.methods.balance_of_public(adminAddress).simulate({
|
|
105
115
|
from: adminAddress
|
|
106
116
|
});
|
|
107
117
|
this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
|
|
@@ -109,12 +119,12 @@ export class TokenContractTest {
|
|
|
109
119
|
this.logger.verbose(`Minting ${amount} privately...`);
|
|
110
120
|
await mintTokensToPrivate(asset, adminAddress, adminAddress, amount);
|
|
111
121
|
tokenSim.mintPrivate(adminAddress, amount);
|
|
112
|
-
const privateBalance = await asset.methods.balance_of_private(adminAddress).simulate({
|
|
122
|
+
const { result: privateBalance } = await asset.methods.balance_of_private(adminAddress).simulate({
|
|
113
123
|
from: adminAddress
|
|
114
124
|
});
|
|
115
125
|
this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
|
|
116
126
|
expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(adminAddress));
|
|
117
|
-
const totalSupply = await asset.methods.total_supply().simulate({
|
|
127
|
+
const { result: totalSupply } = await asset.methods.total_supply().simulate({
|
|
118
128
|
from: adminAddress
|
|
119
129
|
});
|
|
120
130
|
this.logger.verbose(`Total supply: ${totalSupply}`);
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { ContractFunctionInteraction, SendInteractionOptions, SimulateInteractionOptions } from '@aztec/aztec.js/contracts';
|
|
2
|
+
import type { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
|
|
3
|
+
/**
|
|
4
|
+
* Sends a contract call through the authwit proxy.
|
|
5
|
+
* The proxy becomes msg_sender in the target (triggering authwit validation),
|
|
6
|
+
* while the actual tx sender retains their keys in scope.
|
|
7
|
+
*/
|
|
8
|
+
export declare function sendThroughAuthwitProxy(proxy: GenericProxyContract, action: ContractFunctionInteraction, options: SendInteractionOptions): Promise<import("@aztec/aztec.js/contracts").TxSendResultMined<import("@aztec/stdlib/tx").TxReceipt>>;
|
|
9
|
+
/**
|
|
10
|
+
* Simulates a contract call through the authwit proxy.
|
|
11
|
+
* The proxy becomes msg_sender in the target (triggering authwit validation),
|
|
12
|
+
* while the actual tx sender retains their keys in scope.
|
|
13
|
+
*/
|
|
14
|
+
export declare function simulateThroughAuthwitProxy(proxy: GenericProxyContract, action: ContractFunctionInteraction, options: SimulateInteractionOptions): Promise<import("@aztec/aztec.js/contracts").SimulationResult>;
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aHdpdF9wcm94eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZpeHR1cmVzL2F1dGh3aXRfcHJveHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQ1YsMkJBQTJCLEVBQzNCLHNCQUFzQixFQUN0QiwwQkFBMEIsRUFDM0IsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBa0J2Rjs7OztHQUlHO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxLQUFLLEVBQUUsb0JBQW9CLEVBQzNCLE1BQU0sRUFBRSwyQkFBMkIsRUFDbkMsT0FBTyxFQUFFLHNCQUFzQix3R0FJaEM7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQXNCLDJCQUEyQixDQUMvQyxLQUFLLEVBQUUsb0JBQW9CLEVBQzNCLE1BQU0sRUFBRSwyQkFBMkIsRUFDbkMsT0FBTyxFQUFFLDBCQUEwQixpRUFJcEMifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authwit_proxy.d.ts","sourceRoot":"","sources":["../../src/fixtures/authwit_proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2BAA2B,EAC3B,sBAAsB,EACtB,0BAA0B,EAC3B,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAkBvF;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,oBAAoB,EAC3B,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,sBAAsB,wGAIhC;AAED;;;;GAIG;AACH,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,oBAAoB,EAC3B,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,0BAA0B,iEAIpC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Builds a proxy forwarding call from an action, selecting the right forward_private_N method.
|
|
3
|
+
*/ async function buildProxyCall(proxy, action) {
|
|
4
|
+
const call = await action.getFunctionCall();
|
|
5
|
+
const argCount = call.args.length;
|
|
6
|
+
if (argCount === 2) {
|
|
7
|
+
return proxy.methods.forward_private_2(call.to, call.selector, call.args);
|
|
8
|
+
} else if (argCount === 3) {
|
|
9
|
+
return proxy.methods.forward_private_3(call.to, call.selector, call.args);
|
|
10
|
+
} else if (argCount === 4) {
|
|
11
|
+
return proxy.methods.forward_private_4(call.to, call.selector, call.args);
|
|
12
|
+
}
|
|
13
|
+
throw new Error(`No forward_private_${argCount} method on proxy`);
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Sends a contract call through the authwit proxy.
|
|
17
|
+
* The proxy becomes msg_sender in the target (triggering authwit validation),
|
|
18
|
+
* while the actual tx sender retains their keys in scope.
|
|
19
|
+
*/ export async function sendThroughAuthwitProxy(proxy, action, options) {
|
|
20
|
+
const proxyCall = await buildProxyCall(proxy, action);
|
|
21
|
+
return proxyCall.send(options);
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Simulates a contract call through the authwit proxy.
|
|
25
|
+
* The proxy becomes msg_sender in the target (triggering authwit validation),
|
|
26
|
+
* while the actual tx sender retains their keys in scope.
|
|
27
|
+
*/ export async function simulateThroughAuthwitProxy(proxy, action, options) {
|
|
28
|
+
const proxyCall = await buildProxyCall(proxy, action);
|
|
29
|
+
return proxyCall.simulate(options);
|
|
30
|
+
}
|
|
@@ -8,8 +8,8 @@ import type { DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-az
|
|
|
8
8
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
9
9
|
import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
|
|
10
10
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
11
|
-
import { TestWallet } from '@aztec/test-wallet/server';
|
|
12
11
|
import { TokenSimulator } from '../simulators/token_simulator.js';
|
|
12
|
+
import { TestWallet } from '../test-wallet/test_wallet.js';
|
|
13
13
|
import { type EndToEndContext } from './setup.js';
|
|
14
14
|
/**
|
|
15
15
|
* Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
|
|
@@ -38,8 +38,8 @@ export declare class FullProverTest {
|
|
|
38
38
|
circuitProofVerifier?: ClientProtocolCircuitVerifier;
|
|
39
39
|
provenAsset: TokenContract;
|
|
40
40
|
context: EndToEndContext;
|
|
41
|
-
private
|
|
42
|
-
private
|
|
41
|
+
private proverAztecNode;
|
|
42
|
+
private simulatedProverAztecNode;
|
|
43
43
|
l1Contracts: DeployAztecL1ContractsReturnType;
|
|
44
44
|
proverAddress: EthAddress;
|
|
45
45
|
private minNumberOfTxsPerBlock;
|
|
@@ -52,4 +52,4 @@ export declare class FullProverTest {
|
|
|
52
52
|
teardown(): Promise<void>;
|
|
53
53
|
private applyMint;
|
|
54
54
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFFTCxLQUFLLDZCQUE2QixFQUduQyxNQUFNLGtCQUFrQixDQUFDO0FBRTFCLE9BQU8sS0FBSyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFJbEcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFNdEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBUXJCLE1BQU0sWUFBWSxDQUFDO0FBT3BCOzs7OztHQUtHO0FBRUgscUJBQWEsY0FBYztJQUN6QixNQUFNLENBQUMsVUFBVSxTQUFVO0lBQzNCLE1BQU0sQ0FBQyxZQUFZLFNBQVM7SUFDNUIsTUFBTSxDQUFDLGNBQWMsU0FBTztJQUM1QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsVUFBVSxDQUFDO0lBQzFCLFFBQVEsRUFBRSxZQUFZLEVBQUUsQ0FBTTtJQUM5QixnQkFBZ0IsRUFBRyxrQkFBa0IsRUFBRSxDQUFDO0lBQ3hDLGVBQWUsRUFBRyxhQUFhLENBQUM7SUFDaEMsdUJBQXVCLEVBQUcsMkJBQTJCLENBQUM7SUFDdEQsUUFBUSxFQUFHLGNBQWMsQ0FBQztJQUMxQixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGNBQWMsRUFBRyxjQUFjLENBQUM7SUFDaEMsVUFBVSxFQUFHLFVBQVUsQ0FBQztJQUN4QixPQUFPLENBQUMsZ0JBQWdCLENBQXFCO0lBQzdDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBc0I7SUFDOUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQXNCO0lBQ2hELG9CQUFvQixDQUFDLEVBQUUsNkJBQTZCLENBQUM7SUFDckQsV0FBVyxFQUFHLGFBQWEsQ0FBQztJQUM1QixPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLE9BQU8sQ0FBQyxlQUFlLENBQW9CO0lBQzNDLE9BQU8sQ0FBQyx3QkFBd0IsQ0FBb0I7SUFDN0MsV0FBVyxFQUFHLGdDQUFnQyxDQUFDO0lBQy9DLGFBQWEsRUFBRyxVQUFVLENBQUM7SUFDbEMsT0FBTyxDQUFDLHNCQUFzQixDQUFTO0lBQ3ZDLE9BQU8sQ0FBQyxRQUFRLENBQWE7SUFDN0IsT0FBTyxDQUFDLFVBQVUsQ0FBVTtJQUU1QixZQUFZLFFBQVEsRUFBRSxNQUFNLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxVQUFVLEVBQUUsVUFBVSxVQUFPLEVBS3BHO1lBS2EsY0FBYztJQXVDdEIsS0FBSyxrQkF3SVY7WUFFYSxZQUFZO0lBU3BCLFFBQVEsa0JBY2I7WUFFYSxTQUFTO0NBc0N4QiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAEL,KAAK,6BAA6B,EAGnC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAEL,KAAK,6BAA6B,EAGnC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMtE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EACL,KAAK,eAAe,EAQrB,MAAM,YAAY,CAAC;AAOpB;;;;;GAKG;AAEH,qBAAa,cAAc;IACzB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,UAAU,CAAC;IAC1B,QAAQ,EAAE,YAAY,EAAE,CAAM;IAC9B,gBAAgB,EAAG,kBAAkB,EAAE,CAAC;IACxC,eAAe,EAAG,aAAa,CAAC;IAChC,uBAAuB,EAAG,2BAA2B,CAAC;IACtD,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,WAAW,EAAG,aAAa,CAAC;IAC5B,OAAO,EAAG,eAAe,CAAC;IAC1B,OAAO,CAAC,eAAe,CAAoB;IAC3C,OAAO,CAAC,wBAAwB,CAAoB;IAC7C,WAAW,EAAG,gCAAgC,CAAC;IAC/C,aAAa,EAAG,UAAU,CAAC;IAClC,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,UAAU,CAAU;IAE5B,YAAY,QAAQ,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,UAAO,EAKpG;YAKa,cAAc;IAuCtB,KAAK,kBAwIV;YAEa,YAAY;IASpB,QAAQ,kBAcb;YAEa,SAAS;CAsCxB"}
|