@aztec/end-to-end 0.0.1-commit.934299a21 → 0.0.1-commit.949a33fd8

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.
Files changed (149) hide show
  1. package/README.md +27 -0
  2. package/dest/bench/client_flows/client_flows_benchmark.d.ts +1 -1
  3. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
  4. package/dest/bench/client_flows/client_flows_benchmark.js +21 -28
  5. package/dest/bench/utils.d.ts +1 -1
  6. package/dest/bench/utils.d.ts.map +1 -1
  7. package/dest/bench/utils.js +6 -3
  8. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +3 -2
  9. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  10. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +15 -15
  11. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +1 -1
  12. package/dest/e2e_epochs/epochs_test.d.ts +18 -1
  13. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  14. package/dest/e2e_epochs/epochs_test.js +61 -10
  15. package/dest/e2e_fees/fees_test.d.ts +1 -1
  16. package/dest/e2e_fees/fees_test.d.ts.map +1 -1
  17. package/dest/e2e_fees/fees_test.js +16 -9
  18. package/dest/e2e_nested_contract/nested_contract_test.d.ts +1 -1
  19. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
  20. package/dest/e2e_nested_contract/nested_contract_test.js +4 -6
  21. package/dest/e2e_p2p/inactivity_slash_test.js +3 -3
  22. package/dest/e2e_p2p/p2p_network.d.ts +13 -11
  23. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  24. package/dest/e2e_p2p/p2p_network.js +65 -43
  25. package/dest/e2e_p2p/reqresp/utils.d.ts +1 -1
  26. package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -1
  27. package/dest/e2e_p2p/reqresp/utils.js +23 -7
  28. package/dest/e2e_p2p/shared.d.ts +25 -7
  29. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  30. package/dest/e2e_p2p/shared.js +69 -49
  31. package/dest/e2e_token_contract/token_contract_test.d.ts +1 -1
  32. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  33. package/dest/e2e_token_contract/token_contract_test.js +11 -11
  34. package/dest/fixtures/authwit_proxy.d.ts +3 -3
  35. package/dest/fixtures/authwit_proxy.d.ts.map +1 -1
  36. package/dest/fixtures/authwit_proxy.js +4 -0
  37. package/dest/fixtures/e2e_prover_test.d.ts +4 -3
  38. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  39. package/dest/fixtures/e2e_prover_test.js +11 -16
  40. package/dest/fixtures/fixtures.d.ts +12 -1
  41. package/dest/fixtures/fixtures.d.ts.map +1 -1
  42. package/dest/fixtures/fixtures.js +10 -0
  43. package/dest/fixtures/get_bb_config.d.ts +1 -1
  44. package/dest/fixtures/get_bb_config.d.ts.map +1 -1
  45. package/dest/fixtures/get_bb_config.js +5 -5
  46. package/dest/fixtures/ha_setup.d.ts +2 -2
  47. package/dest/fixtures/ha_setup.d.ts.map +1 -1
  48. package/dest/fixtures/ha_setup.js +1 -1
  49. package/dest/fixtures/schnorr_hardcoded_account_contract.d.ts +25 -0
  50. package/dest/fixtures/schnorr_hardcoded_account_contract.d.ts.map +1 -0
  51. package/dest/fixtures/schnorr_hardcoded_account_contract.js +39 -0
  52. package/dest/fixtures/setup.d.ts +24 -13
  53. package/dest/fixtures/setup.d.ts.map +1 -1
  54. package/dest/fixtures/setup.js +45 -25
  55. package/dest/fixtures/setup_p2p_test.d.ts +6 -6
  56. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  57. package/dest/fixtures/setup_p2p_test.js +8 -8
  58. package/dest/fixtures/token_utils.d.ts +1 -1
  59. package/dest/fixtures/token_utils.d.ts.map +1 -1
  60. package/dest/fixtures/token_utils.js +2 -5
  61. package/dest/forward-compatibility/wallet_rpc_client.d.ts +7 -0
  62. package/dest/forward-compatibility/wallet_rpc_client.d.ts.map +1 -0
  63. package/dest/forward-compatibility/wallet_rpc_client.js +15 -0
  64. package/dest/forward-compatibility/wallet_service.d.ts +3 -0
  65. package/dest/forward-compatibility/wallet_service.d.ts.map +1 -0
  66. package/dest/forward-compatibility/wallet_service.js +109 -0
  67. package/dest/legacy-jest-resolver.d.cts +3 -0
  68. package/dest/legacy-jest-resolver.d.cts.map +1 -0
  69. package/dest/shared/cross_chain_test_harness.d.ts +1 -1
  70. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  71. package/dest/shared/cross_chain_test_harness.js +13 -13
  72. package/dest/shared/gas_portal_test_harness.js +3 -3
  73. package/dest/shared/jest_setup.js +32 -1
  74. package/dest/shared/submit-transactions.d.ts +1 -1
  75. package/dest/shared/submit-transactions.d.ts.map +1 -1
  76. package/dest/shared/submit-transactions.js +1 -1
  77. package/dest/shared/uniswap_l1_l2.d.ts +1 -1
  78. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  79. package/dest/shared/uniswap_l1_l2.js +14 -21
  80. package/dest/simulators/lending_simulator.d.ts +1 -1
  81. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  82. package/dest/simulators/lending_simulator.js +4 -4
  83. package/dest/simulators/token_simulator.d.ts +1 -1
  84. package/dest/simulators/token_simulator.d.ts.map +1 -1
  85. package/dest/simulators/token_simulator.js +2 -2
  86. package/dest/spartan/setup_test_wallets.d.ts +4 -2
  87. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  88. package/dest/spartan/setup_test_wallets.js +69 -38
  89. package/dest/spartan/tx_metrics.d.ts +1 -1
  90. package/dest/spartan/tx_metrics.d.ts.map +1 -1
  91. package/dest/spartan/tx_metrics.js +19 -3
  92. package/dest/spartan/utils/config.d.ts +7 -1
  93. package/dest/spartan/utils/config.d.ts.map +1 -1
  94. package/dest/spartan/utils/config.js +3 -1
  95. package/dest/spartan/utils/index.d.ts +3 -1
  96. package/dest/spartan/utils/index.d.ts.map +1 -1
  97. package/dest/spartan/utils/index.js +4 -0
  98. package/dest/spartan/utils/nodes.js +1 -1
  99. package/dest/spartan/utils/pod_logs.d.ts +25 -0
  100. package/dest/spartan/utils/pod_logs.d.ts.map +1 -0
  101. package/dest/spartan/utils/pod_logs.js +74 -0
  102. package/dest/test-wallet/test_wallet.d.ts +24 -23
  103. package/dest/test-wallet/test_wallet.d.ts.map +1 -1
  104. package/dest/test-wallet/test_wallet.js +124 -83
  105. package/dest/test-wallet/worker_wallet.d.ts +4 -4
  106. package/dest/test-wallet/worker_wallet.d.ts.map +1 -1
  107. package/dest/test-wallet/worker_wallet_schema.d.ts +10 -5
  108. package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -1
  109. package/package.json +43 -44
  110. package/src/bench/client_flows/client_flows_benchmark.ts +29 -12
  111. package/src/bench/utils.ts +7 -2
  112. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +21 -20
  113. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +1 -1
  114. package/src/e2e_epochs/epochs_test.ts +70 -9
  115. package/src/e2e_fees/fees_test.ts +17 -8
  116. package/src/e2e_nested_contract/nested_contract_test.ts +6 -4
  117. package/src/e2e_p2p/inactivity_slash_test.ts +3 -3
  118. package/src/e2e_p2p/p2p_network.ts +82 -60
  119. package/src/e2e_p2p/reqresp/utils.ts +29 -7
  120. package/src/e2e_p2p/shared.ts +88 -63
  121. package/src/e2e_token_contract/token_contract_test.ts +16 -8
  122. package/src/fixtures/authwit_proxy.ts +4 -0
  123. package/src/fixtures/e2e_prover_test.ts +19 -18
  124. package/src/fixtures/fixtures.ts +22 -0
  125. package/src/fixtures/get_bb_config.ts +7 -6
  126. package/src/fixtures/ha_setup.ts +4 -2
  127. package/src/fixtures/schnorr_hardcoded_account_contract.ts +49 -0
  128. package/src/fixtures/setup.ts +69 -33
  129. package/src/fixtures/setup_p2p_test.ts +9 -9
  130. package/src/fixtures/token_utils.ts +1 -2
  131. package/src/forward-compatibility/wallet_rpc_client.ts +14 -0
  132. package/src/forward-compatibility/wallet_service.ts +104 -0
  133. package/src/guides/up_quick_start.sh +0 -2
  134. package/src/legacy-jest-resolver.cjs +135 -0
  135. package/src/shared/cross_chain_test_harness.ts +13 -9
  136. package/src/shared/gas_portal_test_harness.ts +1 -2
  137. package/src/shared/jest_setup.ts +36 -1
  138. package/src/shared/submit-transactions.ts +1 -4
  139. package/src/shared/uniswap_l1_l2.ts +35 -32
  140. package/src/simulators/lending_simulator.ts +8 -4
  141. package/src/simulators/token_simulator.ts +6 -2
  142. package/src/spartan/setup_test_wallets.ts +90 -35
  143. package/src/spartan/tx_metrics.ts +17 -5
  144. package/src/spartan/utils/config.ts +2 -0
  145. package/src/spartan/utils/index.ts +6 -0
  146. package/src/spartan/utils/nodes.ts +1 -1
  147. package/src/spartan/utils/pod_logs.ts +99 -0
  148. package/src/test-wallet/test_wallet.ts +152 -101
  149. package/src/test-wallet/worker_wallet.ts +3 -2
@@ -11,10 +11,10 @@ export declare const WorkerWalletSchema: {
11
11
  getAddressBook: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").Aliased<AztecAddress>[], z.ZodTypeDef, any>>;
12
12
  getAccounts: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").Aliased<AztecAddress>[], z.ZodTypeDef, any>>;
13
13
  registerContract: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/contract").ContractInstanceWithAddress, z.ZodTypeDef, any>, artifact?: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodType<import("@aztec/stdlib/abi").ContractArtifact | undefined, z.ZodTypeDef, any>> | undefined, secretKey?: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodType<import("@aztec/foundation/schemas").Fr | undefined, z.ZodTypeDef, any>> | undefined], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/contract").ContractInstanceWithAddress, z.ZodTypeDef, any>>;
14
- simulateTx: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/tx").ExecutionPayload, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").SimulateOptions, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/tx").TxSimulationResult, z.ZodTypeDef, any>>;
14
+ simulateTx: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/tx").ExecutionPayload, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").SimulateOptions, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").TxSimulationResultWithAppOffset, z.ZodTypeDef, any>>;
15
15
  executeUtility: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/abi").FunctionCall, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").ExecuteUtilityOptions, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/tx").UtilityExecutionResult, z.ZodTypeDef, any>>;
16
16
  profileTx: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/tx").ExecutionPayload, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").ProfileOptions, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/tx").TxProfileResult, z.ZodTypeDef, any>>;
17
- sendTx: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/tx").ExecutionPayload, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").SendOptions<import("@aztec/aztec.js/contracts").InteractionWaitOptions>, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/tx").TxHash | import("@aztec/stdlib/tx").TxReceipt, z.ZodTypeDef, any>>;
17
+ sendTx: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/stdlib/tx").ExecutionPayload, z.ZodTypeDef, any>, opts: z.ZodType<import("@aztec/aztec.js/wallet").SendOptions<import("@aztec/aztec.js/contracts").InteractionWaitOptions>, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/contracts").TxSendResultImmediate | import("@aztec/aztec.js/contracts").TxSendResultMined<import("@aztec/stdlib/tx").TxReceipt>, z.ZodTypeDef, any>>;
18
18
  createAuthWit: z.ZodFunction<z.ZodTuple<[z.ZodType<AztecAddress, z.ZodTypeDef, any>, messageHashOrIntent: z.ZodType<import("@aztec/aztec.js/authorization").CallIntent | import("@aztec/aztec.js/authorization").IntentInnerHash, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/stdlib/auth-witness").AuthWitness, z.ZodTypeDef, any>>;
19
19
  requestCapabilities: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/aztec.js/wallet").AppCapabilities, z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<import("@aztec/aztec.js/wallet").WalletCapabilities, z.ZodTypeDef, any>>;
20
20
  batch: z.ZodFunction<z.ZodTuple<[z.ZodType<readonly import("@aztec/aztec.js/wallet").BatchedMethod[], z.ZodTypeDef, any>], z.ZodUnknown>, z.ZodType<readonly import("@aztec/aztec.js/wallet").BatchedMethodResultWrapper<import("@aztec/aztec.js/wallet").BatchedMethod>[], z.ZodTypeDef, any>>;
@@ -82,7 +82,7 @@ export declare const WorkerWalletSchema: {
82
82
  extraHashedArgs: any[];
83
83
  feePayer?: any;
84
84
  }>, z.ZodObject<{
85
- from: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
85
+ from: z.ZodUnion<[import("@aztec/foundation/schemas").ZodFor<AztecAddress>, z.ZodLiteral<"NO_FROM">]>;
86
86
  authWitnesses: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<z.ZodType<import("@aztec/stdlib/auth-witness").AuthWitness, any, string>, "many">>;
87
87
  capsules: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<z.ZodType<import("@aztec/stdlib/tx").Capsule, any, string>, "many">>;
88
88
  fee: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodObject<{
@@ -162,6 +162,7 @@ export declare const WorkerWalletSchema: {
162
162
  feePerL2Gas: string | number | bigint;
163
163
  } | undefined;
164
164
  }>>;
165
+ congestionEstimate: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNativeEnum<typeof import("@aztec/stdlib/gas").ManaUsageEstimate>>;
165
166
  }, "strip", z.ZodTypeAny, {
166
167
  gasSettings?: {
167
168
  gasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
@@ -175,6 +176,7 @@ export declare const WorkerWalletSchema: {
175
176
  feePerL2Gas: bigint;
176
177
  } | undefined;
177
178
  } | undefined;
179
+ congestionEstimate?: import("@aztec/stdlib/gas").ManaUsageEstimate | undefined;
178
180
  }, {
179
181
  gasSettings?: {
180
182
  gasLimits?: {
@@ -194,6 +196,7 @@ export declare const WorkerWalletSchema: {
194
196
  feePerL2Gas: string | number | bigint;
195
197
  } | undefined;
196
198
  } | undefined;
199
+ congestionEstimate?: import("@aztec/stdlib/gas").ManaUsageEstimate | undefined;
197
200
  }>>;
198
201
  wait: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodUnion<[z.ZodLiteral<"NO_WAIT">, z.ZodObject<{
199
202
  ignoreDroppedReceiptsFor: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
@@ -213,7 +216,7 @@ export declare const WorkerWalletSchema: {
213
216
  }>]>>;
214
217
  additionalScopes: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<import("@aztec/foundation/schemas").ZodFor<AztecAddress>, "many">>;
215
218
  }, "strip", z.ZodTypeAny, {
216
- from: AztecAddress;
219
+ from: "NO_FROM" | AztecAddress;
217
220
  authWitnesses?: import("@aztec/stdlib/auth-witness").AuthWitness[] | undefined;
218
221
  capsules?: import("@aztec/stdlib/tx").Capsule[] | undefined;
219
222
  fee?: {
@@ -229,6 +232,7 @@ export declare const WorkerWalletSchema: {
229
232
  feePerL2Gas: bigint;
230
233
  } | undefined;
231
234
  } | undefined;
235
+ congestionEstimate?: import("@aztec/stdlib/gas").ManaUsageEstimate | undefined;
232
236
  } | undefined;
233
237
  wait?: "NO_WAIT" | {
234
238
  ignoreDroppedReceiptsFor?: number | undefined;
@@ -260,6 +264,7 @@ export declare const WorkerWalletSchema: {
260
264
  feePerL2Gas: string | number | bigint;
261
265
  } | undefined;
262
266
  } | undefined;
267
+ congestionEstimate?: import("@aztec/stdlib/gas").ManaUsageEstimate | undefined;
263
268
  } | undefined;
264
269
  wait?: "NO_WAIT" | {
265
270
  ignoreDroppedReceiptsFor?: number | undefined;
@@ -271,4 +276,4 @@ export declare const WorkerWalletSchema: {
271
276
  }>], z.ZodUnknown>, import("@aztec/foundation/schemas").ZodFor<Tx>>;
272
277
  registerAccount: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>, z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>], z.ZodUnknown>, import("@aztec/foundation/schemas").ZodFor<AztecAddress>>;
273
278
  };
274
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3dhbGxldF9zY2hlbWEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC93b3JrZXJfd2FsbGV0X3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXRDLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsaUdBQStGO0FBQy9GLGVBQU8sTUFBTSxrQkFBa0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FJOUIsQ0FBQyJ9
279
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3dhbGxldF9zY2hlbWEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC93b3JrZXJfd2FsbGV0X3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXRDLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsaUdBQStGO0FBQy9GLGVBQU8sTUFBTSxrQkFBa0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQUk5QixDQUFDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"worker_wallet_schema.d.ts","sourceRoot":"","sources":["../../src/test-wallet/worker_wallet_schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,iGAA+F;AAC/F,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAI9B,CAAC"}
1
+ {"version":3,"file":"worker_wallet_schema.d.ts","sourceRoot":"","sources":["../../src/test-wallet/worker_wallet_schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,iGAA+F;AAC/F,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAI9B,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/end-to-end",
3
- "version": "0.0.1-commit.934299a21",
3
+ "version": "0.0.1-commit.949a33fd8",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "inherits": [
@@ -12,12 +12,12 @@
12
12
  "build:dev": "../scripts/tsc.sh --watch",
13
13
  "clean": "rm -rf ./dest .tsbuildinfo",
14
14
  "test:with-alerts": "./scripts/test-with-alerts.sh",
15
- "test:e2e": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit",
15
+ "test:e2e": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000",
16
16
  "test:e2e-docker": "./scripts/run_test.sh simple",
17
17
  "test:e2e-no-docker": "echo 'The command test:e2e-no-docker is now the same as test:e2e. You can now run this dropping the no-docker suffix.'; yarn test:e2e",
18
- "test:profile": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 0x --output-dir \"flame_graph/{pid}.0x\" -- node --experimental-vm-modules ../node_modules/jest/bin/jest.js --runInBand --testTimeout=300000 --forceExit",
18
+ "test:profile": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 0x --output-dir \"flame_graph/{pid}.0x\" -- node --experimental-vm-modules ../node_modules/jest/bin/jest.js --runInBand --testTimeout=300000",
19
19
  "serve:flames": "python3 -m http.server --directory \"flame_graph\" 8000",
20
- "test:debug": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --inspect --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit",
20
+ "test:debug": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --inspect --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000",
21
21
  "test:integration": "concurrently -k -s first -c reset,dim -n test,anvil \"yarn test:integration:run\" \"anvil\"",
22
22
  "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --no-cache --runInBand --config jest.integration.config.json",
23
23
  "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests src/fixtures",
@@ -26,45 +26,44 @@
26
26
  "formatting": "run -T prettier --check ./src && run -T eslint ./src"
27
27
  },
28
28
  "dependencies": {
29
- "@aztec/accounts": "0.0.1-commit.934299a21",
30
- "@aztec/archiver": "0.0.1-commit.934299a21",
31
- "@aztec/aztec": "0.0.1-commit.934299a21",
32
- "@aztec/aztec-node": "0.0.1-commit.934299a21",
33
- "@aztec/aztec.js": "0.0.1-commit.934299a21",
34
- "@aztec/bb-prover": "0.0.1-commit.934299a21",
35
- "@aztec/bb.js": "0.0.1-commit.934299a21",
36
- "@aztec/blob-client": "0.0.1-commit.934299a21",
37
- "@aztec/blob-lib": "0.0.1-commit.934299a21",
38
- "@aztec/bot": "0.0.1-commit.934299a21",
39
- "@aztec/cli": "0.0.1-commit.934299a21",
40
- "@aztec/constants": "0.0.1-commit.934299a21",
41
- "@aztec/entrypoints": "0.0.1-commit.934299a21",
42
- "@aztec/epoch-cache": "0.0.1-commit.934299a21",
43
- "@aztec/ethereum": "0.0.1-commit.934299a21",
44
- "@aztec/foundation": "0.0.1-commit.934299a21",
45
- "@aztec/kv-store": "0.0.1-commit.934299a21",
46
- "@aztec/l1-artifacts": "0.0.1-commit.934299a21",
47
- "@aztec/merkle-tree": "0.0.1-commit.934299a21",
48
- "@aztec/node-keystore": "0.0.1-commit.934299a21",
49
- "@aztec/noir-contracts.js": "0.0.1-commit.934299a21",
50
- "@aztec/noir-noirc_abi": "0.0.1-commit.934299a21",
51
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.934299a21",
52
- "@aztec/noir-test-contracts.js": "0.0.1-commit.934299a21",
53
- "@aztec/p2p": "0.0.1-commit.934299a21",
54
- "@aztec/protocol-contracts": "0.0.1-commit.934299a21",
55
- "@aztec/prover-client": "0.0.1-commit.934299a21",
56
- "@aztec/prover-node": "0.0.1-commit.934299a21",
57
- "@aztec/pxe": "0.0.1-commit.934299a21",
58
- "@aztec/sequencer-client": "0.0.1-commit.934299a21",
59
- "@aztec/simulator": "0.0.1-commit.934299a21",
60
- "@aztec/slasher": "0.0.1-commit.934299a21",
61
- "@aztec/stdlib": "0.0.1-commit.934299a21",
62
- "@aztec/telemetry-client": "0.0.1-commit.934299a21",
63
- "@aztec/validator-client": "0.0.1-commit.934299a21",
64
- "@aztec/validator-ha-signer": "0.0.1-commit.934299a21",
65
- "@aztec/wallet-sdk": "0.0.1-commit.934299a21",
66
- "@aztec/wallets": "0.0.1-commit.934299a21",
67
- "@aztec/world-state": "0.0.1-commit.934299a21",
29
+ "@aztec/accounts": "0.0.1-commit.949a33fd8",
30
+ "@aztec/archiver": "0.0.1-commit.949a33fd8",
31
+ "@aztec/aztec": "0.0.1-commit.949a33fd8",
32
+ "@aztec/aztec-node": "0.0.1-commit.949a33fd8",
33
+ "@aztec/aztec.js": "0.0.1-commit.949a33fd8",
34
+ "@aztec/bb-prover": "0.0.1-commit.949a33fd8",
35
+ "@aztec/bb.js": "0.0.1-commit.949a33fd8",
36
+ "@aztec/blob-client": "0.0.1-commit.949a33fd8",
37
+ "@aztec/blob-lib": "0.0.1-commit.949a33fd8",
38
+ "@aztec/bot": "0.0.1-commit.949a33fd8",
39
+ "@aztec/cli": "0.0.1-commit.949a33fd8",
40
+ "@aztec/constants": "0.0.1-commit.949a33fd8",
41
+ "@aztec/entrypoints": "0.0.1-commit.949a33fd8",
42
+ "@aztec/epoch-cache": "0.0.1-commit.949a33fd8",
43
+ "@aztec/ethereum": "0.0.1-commit.949a33fd8",
44
+ "@aztec/foundation": "0.0.1-commit.949a33fd8",
45
+ "@aztec/kv-store": "0.0.1-commit.949a33fd8",
46
+ "@aztec/l1-artifacts": "0.0.1-commit.949a33fd8",
47
+ "@aztec/node-keystore": "0.0.1-commit.949a33fd8",
48
+ "@aztec/noir-contracts.js": "0.0.1-commit.949a33fd8",
49
+ "@aztec/noir-noirc_abi": "0.0.1-commit.949a33fd8",
50
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.949a33fd8",
51
+ "@aztec/noir-test-contracts.js": "0.0.1-commit.949a33fd8",
52
+ "@aztec/p2p": "0.0.1-commit.949a33fd8",
53
+ "@aztec/protocol-contracts": "0.0.1-commit.949a33fd8",
54
+ "@aztec/prover-client": "0.0.1-commit.949a33fd8",
55
+ "@aztec/prover-node": "0.0.1-commit.949a33fd8",
56
+ "@aztec/pxe": "0.0.1-commit.949a33fd8",
57
+ "@aztec/sequencer-client": "0.0.1-commit.949a33fd8",
58
+ "@aztec/simulator": "0.0.1-commit.949a33fd8",
59
+ "@aztec/slasher": "0.0.1-commit.949a33fd8",
60
+ "@aztec/stdlib": "0.0.1-commit.949a33fd8",
61
+ "@aztec/telemetry-client": "0.0.1-commit.949a33fd8",
62
+ "@aztec/validator-client": "0.0.1-commit.949a33fd8",
63
+ "@aztec/validator-ha-signer": "0.0.1-commit.949a33fd8",
64
+ "@aztec/wallet-sdk": "0.0.1-commit.949a33fd8",
65
+ "@aztec/wallets": "0.0.1-commit.949a33fd8",
66
+ "@aztec/world-state": "0.0.1-commit.949a33fd8",
68
67
  "@iarna/toml": "^2.2.5",
69
68
  "@jest/globals": "^30.0.0",
70
69
  "@noble/curves": "=1.0.0",
@@ -76,7 +75,6 @@
76
75
  "@types/koa-static": "^4.0.2",
77
76
  "@types/lodash.every": "^4.6.7",
78
77
  "@types/node": "^22.15.17",
79
- "@viem/anvil": "^0.0.9",
80
78
  "buffer": "^6.0.3",
81
79
  "crypto-browserify": "^3.12.1",
82
80
  "fs-extra": "^11.2.0",
@@ -161,6 +159,7 @@
161
159
  "moduleNameMapper": {
162
160
  "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
163
161
  },
162
+ "resolver": "<rootDir>/legacy-jest-resolver.cjs",
164
163
  "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
165
164
  "rootDir": "./src",
166
165
  "testTimeout": 120000,
@@ -1,10 +1,11 @@
1
+ import { NO_FROM } from '@aztec/aztec.js/account';
1
2
  import { AztecAddress } from '@aztec/aztec.js/addresses';
2
3
  import { FeeJuicePaymentMethodWithClaim } from '@aztec/aztec.js/fee';
3
4
  import { type FeePaymentMethod, PrivateFeePaymentMethod, SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee';
4
5
  import { type Logger, createLogger } from '@aztec/aztec.js/log';
5
6
  import type { AztecNode } from '@aztec/aztec.js/node';
6
7
  import type { Wallet } from '@aztec/aztec.js/wallet';
7
- import { CheatCodes } from '@aztec/aztec/testing';
8
+ import { CheatCodes, getTokenAllowedSetupFunctions } from '@aztec/aztec/testing';
8
9
  import { createExtendedL1Client } from '@aztec/ethereum/client';
9
10
  import { RollupContract } from '@aztec/ethereum/contracts';
10
11
  import type { DeployAztecL1ContractsArgs } from '@aztec/ethereum/deploy-aztec-l1-contracts';
@@ -27,7 +28,7 @@ import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
27
28
  import { GasSettings } from '@aztec/stdlib/gas';
28
29
  import { deriveSigningKey } from '@aztec/stdlib/keys';
29
30
 
30
- import { MNEMONIC } from '../../fixtures/fixtures.js';
31
+ import { MNEMONIC, getPaddedMaxFeesPerGas } from '../../fixtures/fixtures.js';
31
32
  import { type EndToEndContext, type SetupOptions, deployAccounts, setup, teardown } from '../../fixtures/setup.js';
32
33
  import { mintTokensToPrivate } from '../../fixtures/token_utils.js';
33
34
  import { setupSponsoredFPC } from '../../fixtures/utils.js';
@@ -130,11 +131,14 @@ export class ClientFlowsBenchmark {
130
131
 
131
132
  async setup() {
132
133
  this.logger.info('Setting up subsystems from fresh');
134
+ // Token allowlist entries are test-only: FPC-based fee payment with custom tokens won't work on mainnet alpha.
135
+ const tokenAllowList = await getTokenAllowedSetupFunctions();
133
136
  this.context = await setup(0, {
134
137
  ...this.setupOptions,
135
138
  fundSponsoredFPC: true,
136
139
  skipAccountDeployment: true,
137
140
  l1ContractsArgs: this.setupOptions,
141
+ txPublicSetupAllowListExtend: [...(this.setupOptions.txPublicSetupAllowListExtend ?? []), ...tokenAllowList],
138
142
  });
139
143
  await this.applyBaseSetup();
140
144
 
@@ -148,6 +152,7 @@ export class ClientFlowsBenchmark {
148
152
 
149
153
  async teardown() {
150
154
  await this.chainMonitor.stop();
155
+ await this.userWallet?.stop();
151
156
  await teardown(this.context);
152
157
  }
153
158
 
@@ -161,11 +166,15 @@ export class ClientFlowsBenchmark {
161
166
 
162
167
  /** Admin mints bananaCoin tokens privately to the target address and redeems them. */
163
168
  async mintPrivateBananas(amount: bigint, address: AztecAddress) {
164
- const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate({ from: address });
169
+ const { result: balanceBefore } = await this.bananaCoin.methods
170
+ .balance_of_private(address)
171
+ .simulate({ from: address });
165
172
 
166
173
  await mintTokensToPrivate(this.bananaCoin, this.adminAddress, address, amount);
167
174
 
168
- const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate({ from: address });
175
+ const { result: balanceAfter } = await this.bananaCoin.methods
176
+ .balance_of_private(address)
177
+ .simulate({ from: address });
169
178
  expect(balanceAfter).toEqual(balanceBefore + amount);
170
179
  }
171
180
 
@@ -247,7 +256,9 @@ export class ClientFlowsBenchmark {
247
256
  'BC',
248
257
  'BC',
249
258
  18n,
250
- ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
259
+ ).send({
260
+ from: this.adminAddress,
261
+ });
251
262
  this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
252
263
  this.bananaCoin = bananaCoin;
253
264
  this.bananaCoinInstance = bananaCoinInstance;
@@ -261,7 +272,9 @@ export class ClientFlowsBenchmark {
261
272
  'CBC',
262
273
  'CBC',
263
274
  18n,
264
- ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
275
+ ).send({
276
+ from: this.adminAddress,
277
+ });
265
278
  this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
266
279
  this.candyBarCoin = candyBarCoin;
267
280
  this.candyBarCoinInstance = candyBarCoinInstance;
@@ -277,7 +290,9 @@ export class ClientFlowsBenchmark {
277
290
  this.adminWallet,
278
291
  bananaCoin.address,
279
292
  this.adminAddress,
280
- ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
293
+ ).send({
294
+ from: this.adminAddress,
295
+ });
281
296
 
282
297
  this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
283
298
 
@@ -326,7 +341,7 @@ export class ClientFlowsBenchmark {
326
341
  const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
327
342
  const behchysDeployMethod = await benchysAccountManager.getDeployMethod();
328
343
  await behchysDeployMethod.send({
329
- from: AztecAddress.ZERO,
344
+ from: NO_FROM,
330
345
  fee: { paymentMethod: new FeeJuicePaymentMethodWithClaim(benchysAddress, claim) },
331
346
  });
332
347
  // Register benchy on the user's Wallet, where we're going to be interacting from
@@ -346,13 +361,15 @@ export class ClientFlowsBenchmark {
346
361
  'LPT',
347
362
  'LPT',
348
363
  18n,
349
- ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
364
+ ).send({
365
+ from: this.adminAddress,
366
+ });
350
367
  const { contract: amm, instance: ammInstance } = await AMMContract.deploy(
351
368
  this.adminWallet,
352
369
  this.bananaCoin.address,
353
370
  this.candyBarCoin.address,
354
371
  liquidityToken.address,
355
- ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
372
+ ).send({ from: this.adminAddress });
356
373
  this.logger.info(`AMM deployed at ${amm.address}`);
357
374
  await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress });
358
375
  this.liquidityToken = liquidityToken;
@@ -369,8 +386,8 @@ export class ClientFlowsBenchmark {
369
386
  public async getPrivateFPCPaymentMethodForWallet(wallet: Wallet, sender: AztecAddress) {
370
387
  // The private fee paying method assembled on the app side requires knowledge of the maximum
371
388
  // fee the user is willing to pay
372
- const maxFeesPerGas = (await this.aztecNode.getCurrentMinFees()).mul(1.5);
373
- const gasSettings = GasSettings.default({ maxFeesPerGas });
389
+ const maxFeesPerGas = await getPaddedMaxFeesPerGas(this.aztecNode);
390
+ const gasSettings = GasSettings.fallback({ maxFeesPerGas });
374
391
  return new PrivateFeePaymentMethod(this.bananaFPC.address, sender, wallet, gasSettings);
375
392
  }
376
393
 
@@ -25,7 +25,7 @@ export async function benchmarkSetup(
25
25
  ) {
26
26
  const context = await setup(1, { ...opts, telemetryConfig: { benchmark: true } });
27
27
  const defaultAccountAddress = context.accounts[0];
28
- const contract = await BenchmarkingContract.deploy(context.wallet).send({ from: defaultAccountAddress });
28
+ const { contract } = await BenchmarkingContract.deploy(context.wallet).send({ from: defaultAccountAddress });
29
29
  context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
30
30
  const sequencer = (context.aztecNode as AztecNodeService).getSequencer()!;
31
31
  const telemetry = context.telemetryClient as BenchmarkTelemetryClient;
@@ -149,7 +149,12 @@ export async function sendTxs(
149
149
  context.logger.info(`Creating ${txCount} txs`);
150
150
  const [from] = context.accounts;
151
151
  context.logger.info(`Sending ${txCount} txs`);
152
- return Promise.all(calls.map(call => call.send({ from, wait: NO_WAIT })));
152
+ return Promise.all(
153
+ calls.map(async call => {
154
+ const { txHash } = await call.send({ from, wait: NO_WAIT });
155
+ return txHash;
156
+ }),
157
+ );
153
158
  }
154
159
 
155
160
  export async function waitTxs(txs: TxHash[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
@@ -10,6 +10,7 @@ import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist'
10
10
  import { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
11
11
  import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
12
12
  import type { SequencerClient } from '@aztec/sequencer-client';
13
+ import type { AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
13
14
 
14
15
  import { jest } from '@jest/globals';
15
16
 
@@ -57,7 +58,7 @@ export class BlacklistTokenContractTest {
57
58
  authwitProxy!: GenericProxyContract;
58
59
  cheatCodes!: CheatCodes;
59
60
  sequencer!: SequencerClient;
60
- aztecNode!: AztecNode;
61
+ aztecNode!: AztecNode & AztecNodeDebug;
61
62
 
62
63
  adminAddress!: AztecAddress;
63
64
  otherAddress!: AztecAddress;
@@ -68,11 +69,7 @@ export class BlacklistTokenContractTest {
68
69
  }
69
70
 
70
71
  async crossTimestampOfChange() {
71
- await this.cheatCodes.warpL2TimeAtLeastBy(
72
- this.sequencer,
73
- this.aztecNode,
74
- BlacklistTokenContractTest.CHANGE_ROLES_DELAY,
75
- );
72
+ await this.cheatCodes.warpL2TimeAtLeastBy(this.aztecNode, BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
76
73
  }
77
74
 
78
75
  /**
@@ -107,20 +104,24 @@ export class BlacklistTokenContractTest {
107
104
  await publicDeployAccounts(this.wallet, [this.adminAddress, this.otherAddress, this.blacklistedAddress]);
108
105
 
109
106
  this.logger.verbose(`Deploying TokenContract...`);
110
- this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
107
+ ({ contract: this.asset } = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
111
108
  from: this.adminAddress,
112
- });
109
+ }));
113
110
  this.logger.verbose(`Token deployed to ${this.asset.address}`);
114
111
 
115
112
  this.logger.verbose(`Deploying bad account...`);
116
- this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress });
113
+ ({ contract: this.badAccount } = await InvalidAccountContract.deploy(this.wallet).send({
114
+ from: this.adminAddress,
115
+ }));
117
116
  this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
118
117
 
119
118
  // Deploy a proxy contract for "on behalf of other" tests. The note owner must be the tx sender
120
119
  // (so their notes are in scope), but msg_sender in the target must differ from the note owner
121
120
  // to trigger authwit validation. The proxy forwards calls so that msg_sender != tx sender.
122
121
  this.logger.verbose(`Deploying generic proxy...`);
123
- this.authwitProxy = await GenericProxyContract.deploy(this.wallet).send({ from: this.adminAddress });
122
+ ({ contract: this.authwitProxy } = await GenericProxyContract.deploy(this.wallet).send({
123
+ from: this.adminAddress,
124
+ }));
124
125
  this.logger.verbose(`Deployed to ${this.authwitProxy.address}.`);
125
126
 
126
127
  await this.crossTimestampOfChange();
@@ -133,9 +134,9 @@ export class BlacklistTokenContractTest {
133
134
  [this.adminAddress, this.otherAddress, this.blacklistedAddress],
134
135
  );
135
136
 
136
- expect(await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).toEqual(
137
- new Role().withAdmin().toNoirStruct(),
138
- );
137
+ expect(
138
+ (await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).result,
139
+ ).toEqual(new Role().withAdmin().toNoirStruct());
139
140
  }
140
141
 
141
142
  async setup() {
@@ -189,9 +190,9 @@ export class BlacklistTokenContractTest {
189
190
 
190
191
  await this.crossTimestampOfChange();
191
192
 
192
- expect(await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).toEqual(
193
- adminMinterRole.toNoirStruct(),
194
- );
193
+ expect(
194
+ (await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).result,
195
+ ).toEqual(adminMinterRole.toNoirStruct());
195
196
 
196
197
  this.logger.verbose(`Minting ${amount} publicly...`);
197
198
  await asset.methods.mint_public(this.adminAddress, amount).send({ from: this.adminAddress });
@@ -199,7 +200,7 @@ export class BlacklistTokenContractTest {
199
200
  this.logger.verbose(`Minting ${amount} privately...`);
200
201
  const secret = Fr.random();
201
202
  const secretHash = await computeSecretHash(secret);
202
- const receipt = await asset.methods.mint_private(amount, secretHash).send({ from: this.adminAddress });
203
+ const { receipt } = await asset.methods.mint_private(amount, secretHash).send({ from: this.adminAddress });
203
204
 
204
205
  await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
205
206
  await asset.methods.redeem_shield(this.adminAddress, amount, secret).send({ from: this.adminAddress });
@@ -207,20 +208,20 @@ export class BlacklistTokenContractTest {
207
208
 
208
209
  tokenSim.mintPublic(this.adminAddress, amount);
209
210
 
210
- const publicBalance = await asset.methods
211
+ const { result: publicBalance } = await asset.methods
211
212
  .balance_of_public(this.adminAddress)
212
213
  .simulate({ from: this.adminAddress });
213
214
  this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
214
215
  expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
215
216
 
216
217
  tokenSim.mintPrivate(this.adminAddress, amount);
217
- const privateBalance = await asset.methods
218
+ const { result: privateBalance } = await asset.methods
218
219
  .balance_of_private(this.adminAddress)
219
220
  .simulate({ from: this.adminAddress });
220
221
  this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
221
222
  expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
222
223
 
223
- const totalSupply = await asset.methods.total_supply().simulate({ from: this.adminAddress });
224
+ const { result: totalSupply } = await asset.methods.total_supply().simulate({ from: this.adminAddress });
224
225
  this.logger.verbose(`Total supply: ${totalSupply}`);
225
226
  expect(totalSupply).toEqual(tokenSim.totalSupply);
226
227
  }
@@ -98,7 +98,7 @@ export class CrossChainMessagingTest {
98
98
 
99
99
  async catchUpProvenChain() {
100
100
  const bn = await this.aztecNode.getBlockNumber();
101
- while ((await this.aztecNode.getProvenBlockNumber()) < bn) {
101
+ while ((await this.aztecNode.getBlockNumber('proven')) < bn) {
102
102
  await sleep(1000);
103
103
  }
104
104
  }