@aztec/end-to-end 0.0.1-commit.d431d1c → 0.0.1-commit.e2b2873ed
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 +31 -16
- 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 +9 -7
- 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 +17 -8
- 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 +7 -1
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +38 -10
- 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 +11 -11
- 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.d.ts +1 -1
- package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
- package/dest/e2e_nested_contract/nested_contract_test.js +2 -2
- 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/p2p_network.js +6 -2
- 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 +153 -0
- package/dest/e2e_p2p/shared.d.ts +6 -6
- package/dest/e2e_p2p/shared.d.ts.map +1 -1
- package/dest/e2e_p2p/shared.js +14 -17
- 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 +13 -3
- package/dest/fixtures/e2e_prover_test.d.ts +2 -2
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.js +8 -5
- 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 +114 -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 +19 -17
- package/dest/fixtures/setup.d.ts.map +1 -1
- package/dest/fixtures/setup.js +42 -95
- package/dest/fixtures/setup_p2p_test.d.ts +12 -8
- package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
- package/dest/fixtures/setup_p2p_test.js +29 -21
- package/dest/fixtures/token_utils.d.ts +1 -1
- package/dest/fixtures/token_utils.d.ts.map +1 -1
- package/dest/fixtures/token_utils.js +7 -4
- 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 +11 -11
- package/dest/shared/gas_portal_test_harness.js +1 -1
- 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 +20 -18
- package/dest/simulators/lending_simulator.js +2 -2
- 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 +2 -2
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +64 -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 +178 -4
- package/dest/spartan/utils/bot.d.ts +27 -0
- package/dest/spartan/utils/bot.d.ts.map +1 -0
- package/dest/spartan/utils/bot.js +141 -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 +39 -0
- package/dest/spartan/utils/config.d.ts.map +1 -0
- package/dest/spartan/utils/config.js +21 -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 +9 -0
- package/dest/spartan/utils/index.d.ts.map +1 -0
- package/dest/spartan/utils/index.js +18 -0
- package/dest/spartan/utils/k8s.d.ts +126 -0
- package/dest/spartan/utils/k8s.d.ts.map +1 -0
- package/dest/spartan/utils/k8s.js +375 -0
- package/dest/spartan/utils/nodes.d.ts +41 -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 +82 -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/package.json +43 -39
- package/src/bench/client_flows/client_flows_benchmark.ts +19 -36
- package/src/bench/client_flows/config.ts +9 -1
- package/src/bench/utils.ts +10 -8
- package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +20 -14
- 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 +71 -35
- package/src/e2e_fees/bridging_race.notest.ts +2 -5
- package/src/e2e_fees/fees_test.ts +21 -40
- package/src/e2e_l1_publisher/write_json.ts +3 -8
- package/src/e2e_nested_contract/nested_contract_test.ts +3 -5
- package/src/e2e_p2p/inactivity_slash_test.ts +4 -4
- package/src/e2e_p2p/p2p_network.ts +20 -14
- package/src/e2e_p2p/reqresp/utils.ts +207 -0
- package/src/e2e_p2p/shared.ts +22 -22
- 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 +14 -7
- package/src/fixtures/dumps/epoch_proof_result.json +1 -1
- package/src/fixtures/e2e_prover_test.ts +8 -13
- package/src/fixtures/ha_setup.ts +184 -0
- package/src/fixtures/index.ts +1 -0
- package/src/fixtures/setup.ts +50 -128
- package/src/fixtures/setup_p2p_test.ts +31 -27
- package/src/fixtures/token_utils.ts +6 -5
- package/src/guides/up_quick_start.sh +3 -3
- package/src/shared/cross_chain_test_harness.ts +13 -27
- package/src/shared/gas_portal_test_harness.ts +1 -1
- package/src/shared/submit-transactions.ts +11 -16
- package/src/shared/uniswap_l1_l2.ts +21 -30
- package/src/simulators/lending_simulator.ts +2 -2
- package/src/simulators/token_simulator.ts +1 -29
- package/src/spartan/setup_test_wallets.ts +75 -25
- package/src/spartan/tx_metrics.ts +152 -7
- package/src/spartan/utils/bot.ts +185 -0
- package/src/spartan/utils/chaos.ts +253 -0
- package/src/spartan/utils/clients.ts +100 -0
- package/src/spartan/utils/config.ts +27 -0
- package/src/spartan/utils/health.ts +255 -0
- package/src/spartan/utils/helm.ts +84 -0
- package/src/spartan/utils/index.ts +64 -0
- package/src/spartan/utils/k8s.ts +527 -0
- package/src/spartan/utils/nodes.ts +538 -0
- package/src/spartan/utils/scripts.ts +99 -0
- package/src/spartan/utils.ts +1 -1246
- package/src/test-wallet/test_wallet.ts +305 -0
- package/src/test-wallet/utils.ts +112 -0
package/dest/e2e_p2p/shared.d.ts
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import type { InitialAccountData } from '@aztec/accounts/testing';
|
|
2
2
|
import type { AztecNodeService } from '@aztec/aztec-node';
|
|
3
3
|
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
4
|
-
import { type SentTx } from '@aztec/aztec.js/contracts';
|
|
5
4
|
import type { Logger } from '@aztec/aztec.js/log';
|
|
6
|
-
import {
|
|
5
|
+
import { TxHash } from '@aztec/aztec.js/tx';
|
|
7
6
|
import type { RollupCheatCodes } from '@aztec/aztec/testing';
|
|
8
7
|
import type { EmpireSlashingProposerContract, RollupContract, TallySlashingProposerContract } from '@aztec/ethereum/contracts';
|
|
9
8
|
import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
|
|
10
9
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
11
10
|
import type { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
|
|
11
|
+
import { type ProvenTx } from '../test-wallet/utils.js';
|
|
12
12
|
export declare const submitComplexTxsTo: (logger: Logger, from: AztecAddress, spamContract: SpamContract, numTxs: number, opts?: {
|
|
13
13
|
callPublic?: boolean | undefined;
|
|
14
|
-
}) => Promise<
|
|
15
|
-
export declare const submitTransactions: (logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData) => Promise<
|
|
16
|
-
export declare function prepareTransactions(logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData): Promise<
|
|
14
|
+
}) => Promise<TxHash[]>;
|
|
15
|
+
export declare const submitTransactions: (logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData) => Promise<TxHash[]>;
|
|
16
|
+
export declare function prepareTransactions(logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData): Promise<ProvenTx[]>;
|
|
17
17
|
export declare function awaitProposalExecution(slashingProposer: EmpireSlashingProposerContract | TallySlashingProposerContract, timeoutSeconds: number, logger: Logger): Promise<bigint>;
|
|
18
18
|
export declare function awaitCommitteeExists({ rollup, logger }: {
|
|
19
19
|
rollup: RollupContract;
|
|
@@ -43,4 +43,4 @@ export declare function awaitCommitteeKicked({ rollup, cheatCodes, committee, sl
|
|
|
43
43
|
logger: Logger;
|
|
44
44
|
offenseEpoch: number;
|
|
45
45
|
}): Promise<void>;
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX3AycC9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUd6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFDViw4QkFBOEIsRUFDOUIsY0FBYyxFQUNkLDZCQUE2QixFQUM5QixNQUFNLDJCQUEyQixDQUFDO0FBTW5DLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBSXZFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFJdkUsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFvQixNQUFNLHlCQUF5QixDQUFDO0FBRzFFLGVBQU8sTUFBTSxrQkFBa0I7O3VCQWtCOUIsQ0FBQztBQUdGLGVBQU8sTUFBTSxrQkFBa0Isa0hBZTlCLENBQUM7QUFFRix3QkFBc0IsbUJBQW1CLENBQ3ZDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLGdCQUFnQixFQUN0QixNQUFNLEVBQUUsTUFBTSxFQUNkLGFBQWEsRUFBRSxrQkFBa0IsR0FDaEMsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBd0JyQjtBQUVELHdCQUFnQixzQkFBc0IsQ0FDcEMsZ0JBQWdCLEVBQUUsOEJBQThCLEdBQUcsNkJBQTZCLEVBQ2hGLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEdBQ2IsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQTBCakI7QUFFRCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLE1BQU0sRUFDUCxFQUFFO0lBQ0QsTUFBTSxFQUFFLGNBQWMsQ0FBQztJQUN2QixNQUFNLEVBQUUsTUFBTSxDQUFDO0NBQ2hCLEdBQUcsT0FBTyxDQUFDLFNBQVMsS0FBSyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBYXBDO0FBRUQsd0JBQXNCLG9CQUFvQixDQUFDLEVBQ3pDLE1BQU0sRUFDTixTQUFTLEVBQ1QsaUJBQWlCLEVBQ2pCLGFBQWEsRUFDYixxQkFBcUIsRUFDckIsY0FBb0IsRUFDckIsRUFBRTtJQUNELFNBQVMsRUFBRSxjQUFjLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQy9CLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUN6QiwrQ0FrQkE7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLFVBQVUsRUFDVixTQUFTLEVBQ1QsWUFBWSxFQUNaLGdCQUFnQixFQUNoQixpQkFBaUIsRUFDakIsaUJBQWlCLEVBQ2pCLGtCQUFrQixFQUNsQixNQUFNLEVBQ04sWUFBWSxFQUNiLEVBQUU7SUFDRCxNQUFNLEVBQUUsY0FBYyxDQUFDO0lBQ3ZCLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQztJQUM3QixTQUFTLEVBQUUsU0FBUyxLQUFLLE1BQU0sRUFBRSxFQUFFLENBQUM7SUFDcEMsWUFBWSxFQUFFLG9CQUFvQixDQUFDO0lBQ25DLGdCQUFnQixFQUFFLDhCQUE4QixHQUFHLDZCQUE2QixHQUFHLFNBQVMsQ0FBQztJQUM3RixpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsWUFBWSxFQUFFLE1BQU0sQ0FBQztDQUN0QixpQkE2RUEifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EACV,8BAA8B,EAC9B,cAAc,EACd,6BAA6B,EAC9B,MAAM,2BAA2B,CAAC;AAMnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAIvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAIvE,OAAO,EAAE,KAAK,QAAQ,EAAoB,MAAM,yBAAyB,CAAC;AAG1E,eAAO,MAAM,kBAAkB;;uBAkB9B,CAAC;AAGF,eAAO,MAAM,kBAAkB,kHAe9B,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAwBrB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,8BAA8B,GAAG,6BAA6B,EAChF,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CA0BjB;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,MAAM,EACP,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC,CAapC;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,qBAAqB,EACrB,cAAoB,EACrB,EAAE;IACD,SAAS,EAAE,cAAc,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,+CAkBA;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,UAAU,EACV,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,MAAM,EACN,YAAY,EACb,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC;IACpC,YAAY,EAAE,oBAAoB,CAAC;IACnC,gBAAgB,EAAE,8BAA8B,GAAG,6BAA6B,GAAG,SAAS,CAAC;IAC7F,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB,iBA6EA"}
|
package/dest/e2e_p2p/shared.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
|
|
1
|
+
import { NO_WAIT, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
|
|
2
2
|
import { Fr } from '@aztec/aztec.js/fields';
|
|
3
|
-
import { TxStatus } from '@aztec/aztec.js/tx';
|
|
4
3
|
import { EpochNumber } from '@aztec/foundation/branded-types';
|
|
5
4
|
import { timesAsync, unique } from '@aztec/foundation/collection';
|
|
6
5
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
@@ -8,26 +7,22 @@ import { pluralize } from '@aztec/foundation/string';
|
|
|
8
7
|
import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
|
|
9
8
|
import { getPXEConfig, getPXEConfig as getRpcConfig } from '@aztec/pxe/server';
|
|
10
9
|
import { getRoundForOffense } from '@aztec/slasher';
|
|
11
|
-
import { TestWallet, proveInteraction } from '@aztec/test-wallet/server';
|
|
12
10
|
import { submitTxsTo } from '../shared/submit-transactions.js';
|
|
11
|
+
import { TestWallet } from '../test-wallet/test_wallet.js';
|
|
12
|
+
import { proveInteraction } from '../test-wallet/utils.js';
|
|
13
13
|
// submits a set of transactions to the provided Private eXecution Environment (PXE)
|
|
14
14
|
export const submitComplexTxsTo = async (logger, from, spamContract, numTxs, opts = {})=>{
|
|
15
15
|
const txs = [];
|
|
16
16
|
const seed = 1234n;
|
|
17
17
|
const spamCount = 15;
|
|
18
18
|
for(let i = 0; i < numTxs; i++){
|
|
19
|
-
const
|
|
20
|
-
|
|
19
|
+
const method = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic);
|
|
20
|
+
const txHash = await method.send({
|
|
21
|
+
from,
|
|
22
|
+
wait: NO_WAIT
|
|
21
23
|
});
|
|
22
|
-
const txHash = await tx.getTxHash();
|
|
23
24
|
logger.info(`Tx sent with hash ${txHash.toString()}`);
|
|
24
|
-
|
|
25
|
-
expect(receipt).toEqual(expect.objectContaining({
|
|
26
|
-
status: TxStatus.PENDING,
|
|
27
|
-
error: ''
|
|
28
|
-
}));
|
|
29
|
-
logger.info(`Receipt received for ${txHash.toString()}`);
|
|
30
|
-
txs.push(tx);
|
|
25
|
+
txs.push(txHash);
|
|
31
26
|
}
|
|
32
27
|
return txs;
|
|
33
28
|
};
|
|
@@ -39,7 +34,7 @@ export const submitTransactions = async (logger, node, numTxs, fundedAccount)=>{
|
|
|
39
34
|
...getPXEConfig(),
|
|
40
35
|
proverEnabled: false
|
|
41
36
|
}, {
|
|
42
|
-
|
|
37
|
+
loggerActorLabel: 'pxe-tx'
|
|
43
38
|
});
|
|
44
39
|
const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
|
|
45
40
|
return submitTxsTo(wallet, fundedAccountManager.address, numTxs, logger);
|
|
@@ -51,7 +46,7 @@ export async function prepareTransactions(logger, node, numTxs, fundedAccount) {
|
|
|
51
46
|
...getPXEConfig(),
|
|
52
47
|
proverEnabled: false
|
|
53
48
|
}, {
|
|
54
|
-
|
|
49
|
+
loggerActorLabel: 'pxe-tx'
|
|
55
50
|
});
|
|
56
51
|
const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
|
|
57
52
|
const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {
|
|
@@ -63,8 +58,7 @@ export async function prepareTransactions(logger, node, numTxs, fundedAccount) {
|
|
|
63
58
|
const tx = await proveInteraction(wallet, contract.methods.emit_nullifier(Fr.random()), {
|
|
64
59
|
from: fundedAccountManager.address
|
|
65
60
|
});
|
|
66
|
-
|
|
67
|
-
logger.info(`Tx prepared with hash ${txHash}`);
|
|
61
|
+
logger.info(`Tx prepared with hash ${tx.getTxHash()}`);
|
|
68
62
|
return tx;
|
|
69
63
|
});
|
|
70
64
|
}
|
|
@@ -101,6 +95,9 @@ export async function awaitCommitteeExists({ rollup, logger }) {
|
|
|
101
95
|
committee = await rollup.getCurrentEpochCommittee();
|
|
102
96
|
return committee && committee.length > 0;
|
|
103
97
|
}, 'non-empty committee', 60);
|
|
98
|
+
logger.warn(`Committee has been formed`, {
|
|
99
|
+
committee: committee.map((c)=>c.toString())
|
|
100
|
+
});
|
|
104
101
|
return committee.map((c)=>c.toString());
|
|
105
102
|
}
|
|
106
103
|
export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount, timeoutSeconds = 120 }) {
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export {};
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZV9wcm9vZl9mZXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZTJlX3N0b3JhZ2VfcHJvb2YvZml4dHVyZXMvc3RvcmFnZV9wcm9vZl9mZXRjaGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storage_proof_fetcher.d.ts","sourceRoot":"","sources":["../../../src/e2e_storage_proof/fixtures/storage_proof_fetcher.ts"],"names":[],"mappings":""}
|
|
@@ -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
|
+
proxy: 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fY29udHJhY3RfdGVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV90b2tlbl9jb250cmFjdC90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBQ2xGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBSXRGLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBeUQsTUFBTSxzQkFBc0IsQ0FBQztBQUVuSCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFJaEUscUJBQWEsaUJBQWlCO0lBQzVCLE1BQU0sQ0FBQyxVQUFVLFNBQVU7SUFDM0IsTUFBTSxDQUFDLFlBQVksU0FBUztJQUM1QixNQUFNLENBQUMsY0FBYyxTQUFPO0lBQzVCLE9BQU8sRUFBRyxlQUFlLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQixLQUFLLEVBQUcsYUFBYSxDQUFDO0lBQ3RCLFFBQVEsRUFBRyxjQUFjLENBQUM7SUFDMUIsSUFBSSxFQUFHLFNBQVMsQ0FBQztJQUVqQixVQUFVLEVBQUcsc0JBQXNCLENBQUM7SUFDcEMsS0FBSyxFQUFHLG9CQUFvQixDQUFDO0lBQzdCLE1BQU0sRUFBRyxVQUFVLENBQUM7SUFDcEIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixlQUFlLEVBQUcsWUFBWSxDQUFDO0lBQy9CLGVBQWUsRUFBRyxZQUFZLENBQUM7SUFFL0IsT0FBTyxDQUFDLG9CQUFvQixDQUFTO0lBQ3JDLE9BQU8sQ0FBQyxlQUFlLENBQVM7SUFFaEMsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUczQjtJQUVEOzs7T0FHRztJQUNILGtCQUFrQixTQUVqQjtJQUVEOzs7T0FHRztJQUNILGlCQUFpQixTQUVoQjtZQUthLGNBQWM7SUFvRHRCLEtBQUssa0JBY1Y7SUFFSyxRQUFRLGtCQUViO1lBRWEsU0FBUztDQTJCeEIifQ==
|
|
@@ -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,KAAK,EAAG,oBAAoB,CAAC;IAC7B,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;IAoDtB,KAAK,kBAcV;IAEK,QAAQ,kBAEb;YAEa,SAAS;CA2BxB"}
|
|
@@ -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
|
+
proxy;
|
|
20
22
|
wallet;
|
|
21
23
|
adminAddress;
|
|
22
24
|
account1Address;
|
|
@@ -61,13 +63,21 @@ export class TokenContractTest {
|
|
|
61
63
|
this.logger.verbose(`Deploying TokenContract...`);
|
|
62
64
|
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
69
|
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
|
+
this.proxy = await GenericProxyContract.deploy(this.wallet).send({
|
|
78
|
+
from: this.adminAddress
|
|
79
|
+
});
|
|
80
|
+
this.logger.verbose(`Deployed to ${this.proxy.address}.`);
|
|
71
81
|
this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
|
|
72
82
|
this.adminAddress,
|
|
73
83
|
this.account1Address
|
|
@@ -99,7 +109,7 @@ 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
114
|
const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({
|
|
105
115
|
from: adminAddress
|
|
@@ -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.
|
|
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFFTCxLQUFLLDZCQUE2QixFQUduQyxNQUFNLGtCQUFrQixDQUFDO0FBRzFCLE9BQU8sS0FBSyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFJbEcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFNdEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBUXJCLE1BQU0sWUFBWSxDQUFDO0FBT3BCOzs7OztHQUtHO0FBRUgscUJBQWEsY0FBYztJQUN6QixNQUFNLENBQUMsVUFBVSxTQUFVO0lBQzNCLE1BQU0sQ0FBQyxZQUFZLFNBQVM7SUFDNUIsTUFBTSxDQUFDLGNBQWMsU0FBTztJQUM1QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsVUFBVSxDQUFDO0lBQzFCLFFBQVEsRUFBRSxZQUFZLEVBQUUsQ0FBTTtJQUM5QixnQkFBZ0IsRUFBRyxrQkFBa0IsRUFBRSxDQUFDO0lBQ3hDLGVBQWUsRUFBRyxhQUFhLENBQUM7SUFDaEMsdUJBQXVCLEVBQUcsMkJBQTJCLENBQUM7SUFDdEQsUUFBUSxFQUFHLGNBQWMsQ0FBQztJQUMxQixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGNBQWMsRUFBRyxjQUFjLENBQUM7SUFDaEMsVUFBVSxFQUFHLFVBQVUsQ0FBQztJQUN4QixPQUFPLENBQUMsZ0JBQWdCLENBQXFCO0lBQzdDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBc0I7SUFDOUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQXNCO0lBQ2hELG9CQUFvQixDQUFDLEVBQUUsNkJBQTZCLENBQUM7SUFDckQsV0FBVyxFQUFHLGFBQWEsQ0FBQztJQUM1QixPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLE9BQU8sQ0FBQyxVQUFVLENBQWM7SUFDaEMsT0FBTyxDQUFDLG1CQUFtQixDQUFjO0lBQ2xDLFdBQVcsRUFBRyxnQ0FBZ0MsQ0FBQztJQUMvQyxhQUFhLEVBQUcsVUFBVSxDQUFDO0lBQ2xDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBUztJQUN2QyxPQUFPLENBQUMsUUFBUSxDQUFhO0lBQzdCLE9BQU8sQ0FBQyxVQUFVLENBQVU7SUFFNUIsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsVUFBVSxFQUFFLFVBQVUsVUFBTyxFQUtwRztZQUthLGNBQWM7SUFxQ3RCLEtBQUssa0JBZ0pWO1lBRWEsWUFBWTtJQVNwQixRQUFRLGtCQWNiO1lBRWEsU0FBUztDQWtDeEIifQ==
|
|
@@ -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;AAG1B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,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;AAG1B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/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,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,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;IAqCtB,KAAK,kBAgJV;YAEa,YAAY;IASpB,QAAQ,kBAcb;YAEa,SAAS;CAkCxB"}
|
|
@@ -70,8 +70,11 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
70
70
|
await publicDeployAccounts(this.wallet, this.accounts.slice(0, 2));
|
|
71
71
|
this.logger.info('Applying base setup: deploying token contract');
|
|
72
72
|
const { contract: asset, instance } = await TokenContract.deploy(this.wallet, this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
|
|
73
|
-
from: this.accounts[0]
|
|
74
|
-
|
|
73
|
+
from: this.accounts[0],
|
|
74
|
+
wait: {
|
|
75
|
+
returnReceipt: true
|
|
76
|
+
}
|
|
77
|
+
});
|
|
75
78
|
this.logger.verbose(`Token deployed to ${asset.address}`);
|
|
76
79
|
this.fakeProofsAsset = asset;
|
|
77
80
|
this.fakeProofsAssetInstance = instance;
|
|
@@ -141,7 +144,7 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
141
144
|
this.logger.verbose(`Main setup completed, initializing full prover PXE, Node, and Prover Node`);
|
|
142
145
|
const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(this.aztecNode, {
|
|
143
146
|
proverEnabled: this.realProofs
|
|
144
|
-
}, undefined,
|
|
147
|
+
}, undefined, 'pxe-proven');
|
|
145
148
|
this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
|
|
146
149
|
await provenWallet.registerContract(this.fakeProofsAssetInstance, TokenContract.artifact);
|
|
147
150
|
for(let i = 0; i < 2; i++){
|
|
@@ -247,11 +250,11 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
247
250
|
this.logger.verbose(`Minting ${privateAmount + publicAmount} publicly...`);
|
|
248
251
|
await asset.methods.mint_to_public(accounts[0], privateAmount + publicAmount).send({
|
|
249
252
|
from: accounts[0]
|
|
250
|
-
})
|
|
253
|
+
});
|
|
251
254
|
this.logger.verbose(`Transferring ${privateAmount} to private...`);
|
|
252
255
|
await asset.methods.transfer_to_private(accounts[0], privateAmount).send({
|
|
253
256
|
from: accounts[0]
|
|
254
|
-
})
|
|
257
|
+
});
|
|
255
258
|
this.logger.info(`Minting complete`);
|
|
256
259
|
const { fakeProofsAsset, accounts: [address], tokenSim } = this;
|
|
257
260
|
tokenSim.mintPublic(address, publicAmount);
|