@aztec/aztec.js 0.76.4 → 0.77.0-testnet-ignition.21
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/account/contract.d.ts +9 -5
- package/dest/account/contract.d.ts.map +1 -1
- package/dest/account/contract.js +15 -2
- package/dest/account/index.d.ts +2 -2
- package/dest/account/index.d.ts.map +1 -1
- package/dest/account/index.js +8 -1
- package/dest/account/interface.d.ts +5 -4
- package/dest/account/interface.d.ts.map +1 -1
- package/dest/account/interface.js +4 -3
- package/dest/account/wallet.d.ts +4 -3
- package/dest/account/wallet.d.ts.map +1 -1
- package/dest/account/wallet.js +3 -2
- package/dest/account_manager/deploy_account_method.d.ts +5 -5
- package/dest/account_manager/deploy_account_method.d.ts.map +1 -1
- package/dest/account_manager/deploy_account_method.js +22 -25
- package/dest/account_manager/deploy_account_sent_tx.d.ts +4 -3
- package/dest/account_manager/deploy_account_sent_tx.d.ts.map +1 -1
- package/dest/account_manager/deploy_account_sent_tx.js +16 -17
- package/dest/account_manager/index.d.ts +20 -11
- package/dest/account_manager/index.d.ts.map +1 -1
- package/dest/account_manager/index.js +89 -87
- package/dest/api/abi.d.ts +2 -3
- package/dest/api/abi.d.ts.map +1 -1
- package/dest/api/abi.js +1 -3
- package/dest/api/account.d.ts +1 -2
- package/dest/api/account.d.ts.map +1 -1
- package/dest/api/account.js +1 -2
- package/dest/api/addresses.d.ts +2 -2
- package/dest/api/addresses.d.ts.map +1 -1
- package/dest/api/addresses.js +2 -3
- package/dest/api/cheat_codes.d.ts +4 -4
- package/dest/api/cheat_codes.d.ts.map +1 -1
- package/dest/api/cheat_codes.js +10 -15
- package/dest/api/deployment.js +0 -1
- package/dest/api/entrypoint.js +0 -1
- package/dest/api/eth_address.js +0 -1
- package/dest/api/ethereum/anvil_test_watcher.d.ts +10 -6
- package/dest/api/ethereum/anvil_test_watcher.d.ts.map +1 -1
- package/dest/api/ethereum/anvil_test_watcher.js +43 -18
- package/dest/api/ethereum/chain_monitor.d.ts +6 -2
- package/dest/api/ethereum/chain_monitor.d.ts.map +1 -1
- package/dest/api/ethereum/chain_monitor.js +24 -8
- package/dest/api/ethereum/cheat_codes.d.ts +14 -3
- package/dest/api/ethereum/cheat_codes.d.ts.map +1 -1
- package/dest/api/ethereum/cheat_codes.js +106 -53
- package/dest/api/ethereum/index.d.ts +1 -1
- package/dest/api/ethereum/index.d.ts.map +1 -1
- package/dest/api/ethereum/index.js +1 -2
- package/dest/api/ethereum/l1_contracts.d.ts +1 -1
- package/dest/api/ethereum/l1_contracts.d.ts.map +1 -1
- package/dest/api/ethereum/l1_contracts.js +4 -6
- package/dest/api/ethereum/portal_manager.d.ts +16 -12
- package/dest/api/ethereum/portal_manager.d.ts.map +1 -1
- package/dest/api/ethereum/portal_manager.js +134 -115
- package/dest/api/fee.d.ts +0 -1
- package/dest/api/fee.d.ts.map +1 -1
- package/dest/api/fee.js +0 -2
- package/dest/api/fields.js +0 -1
- package/dest/api/interfaces/pxe.d.ts +1 -1
- package/dest/api/interfaces/pxe.d.ts.map +1 -1
- package/dest/api/interfaces/pxe.js +1 -2
- package/dest/api/log.js +0 -1
- package/dest/api/log_id.d.ts +1 -1
- package/dest/api/log_id.d.ts.map +1 -1
- package/dest/api/log_id.js +1 -2
- package/dest/api/tx_hash.d.ts +1 -1
- package/dest/api/tx_hash.d.ts.map +1 -1
- package/dest/api/tx_hash.js +1 -2
- package/dest/api/wallet.d.ts +1 -1
- package/dest/api/wallet.d.ts.map +1 -1
- package/dest/api/wallet.js +1 -2
- package/dest/contract/base_contract_interaction.d.ts +21 -5
- package/dest/contract/base_contract_interaction.d.ts.map +1 -1
- package/dest/contract/base_contract_interaction.js +97 -55
- package/dest/contract/batch_call.d.ts +3 -2
- package/dest/contract/batch_call.d.ts.map +1 -1
- package/dest/contract/batch_call.js +64 -40
- package/dest/contract/checker.d.ts +1 -1
- package/dest/contract/checker.d.ts.map +1 -1
- package/dest/contract/checker.js +29 -20
- package/dest/contract/contract.d.ts +4 -4
- package/dest/contract/contract.d.ts.map +1 -1
- package/dest/contract/contract.js +30 -28
- package/dest/contract/contract_base.d.ts +5 -5
- package/dest/contract/contract_base.d.ts.map +1 -1
- package/dest/contract/contract_base.js +22 -31
- package/dest/contract/contract_function_interaction.d.ts +9 -8
- package/dest/contract/contract_function_interaction.d.ts.map +1 -1
- package/dest/contract/contract_function_interaction.js +63 -51
- package/dest/contract/deploy_method.d.ts +14 -11
- package/dest/contract/deploy_method.d.ts.map +1 -1
- package/dest/contract/deploy_method.js +115 -87
- package/dest/contract/deploy_proven_tx.d.ts +6 -4
- package/dest/contract/deploy_proven_tx.d.ts.map +1 -1
- package/dest/contract/deploy_proven_tx.js +8 -11
- package/dest/contract/deploy_sent_tx.d.ts +8 -6
- package/dest/contract/deploy_sent_tx.d.ts.map +1 -1
- package/dest/contract/deploy_sent_tx.js +19 -22
- package/dest/contract/get_gas_limits.d.ts +2 -2
- package/dest/contract/get_gas_limits.d.ts.map +1 -1
- package/dest/contract/get_gas_limits.js +2 -4
- package/dest/contract/index.js +2 -4
- package/dest/{deployment → contract}/protocol_contracts.d.ts +4 -2
- package/dest/contract/protocol_contracts.d.ts.map +1 -0
- package/dest/contract/protocol_contracts.js +26 -0
- package/dest/contract/proven_tx.d.ts +3 -2
- package/dest/contract/proven_tx.d.ts.map +1 -1
- package/dest/contract/proven_tx.js +8 -11
- package/dest/contract/sent_tx.d.ts +3 -2
- package/dest/contract/sent_tx.d.ts.map +1 -1
- package/dest/contract/sent_tx.js +33 -35
- package/dest/contract/unsafe_contract.d.ts +3 -3
- package/dest/contract/unsafe_contract.d.ts.map +1 -1
- package/dest/contract/unsafe_contract.js +2 -10
- package/dest/deployment/broadcast_function.d.ts +3 -3
- package/dest/deployment/broadcast_function.d.ts.map +1 -1
- package/dest/deployment/broadcast_function.js +39 -32
- package/dest/deployment/contract_deployer.d.ts +3 -3
- package/dest/deployment/contract_deployer.d.ts.map +1 -1
- package/dest/deployment/contract_deployer.js +16 -15
- package/dest/deployment/deploy_instance.d.ts +3 -3
- package/dest/deployment/deploy_instance.d.ts.map +1 -1
- package/dest/deployment/deploy_instance.js +3 -5
- package/dest/deployment/index.js +0 -1
- package/dest/deployment/register_class.d.ts +3 -3
- package/dest/deployment/register_class.d.ts.map +1 -1
- package/dest/deployment/register_class.js +19 -14
- package/dest/entrypoint/default_entrypoint.d.ts +2 -2
- package/dest/entrypoint/default_entrypoint.d.ts.map +1 -1
- package/dest/entrypoint/default_entrypoint.js +11 -9
- package/dest/entrypoint/default_multi_call_entrypoint.d.ts +2 -2
- package/dest/entrypoint/default_multi_call_entrypoint.d.ts.map +1 -1
- package/dest/entrypoint/default_multi_call_entrypoint.js +68 -25
- package/dest/entrypoint/entrypoint.d.ts +7 -3
- package/dest/entrypoint/entrypoint.d.ts.map +1 -1
- package/dest/entrypoint/entrypoint.js +0 -1
- package/dest/entrypoint/payload.d.ts +8 -5
- package/dest/entrypoint/payload.d.ts.map +1 -1
- package/dest/entrypoint/payload.js +78 -85
- package/dest/fee/fee_juice_payment_method.d.ts +3 -3
- package/dest/fee/fee_juice_payment_method.d.ts.map +1 -1
- package/dest/fee/fee_juice_payment_method.js +5 -4
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts +5 -4
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts.map +1 -1
- package/dest/fee/fee_juice_payment_method_with_claim.js +18 -20
- package/dest/fee/fee_payment_method.d.ts +3 -3
- package/dest/fee/fee_payment_method.d.ts.map +1 -1
- package/dest/fee/fee_payment_method.js +3 -2
- package/dest/fee/private_fee_payment_method.d.ts +5 -5
- package/dest/fee/private_fee_payment_method.d.ts.map +1 -1
- package/dest/fee/private_fee_payment_method.js +40 -38
- package/dest/fee/public_fee_payment_method.d.ts +5 -5
- package/dest/fee/public_fee_payment_method.d.ts.map +1 -1
- package/dest/fee/public_fee_payment_method.js +38 -35
- package/dest/index.d.ts +25 -12
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +24 -14
- package/dest/rpc_clients/index.js +0 -1
- package/dest/rpc_clients/node/index.d.ts +2 -1
- package/dest/rpc_clients/node/index.d.ts.map +1 -1
- package/dest/rpc_clients/node/index.js +35 -18
- package/dest/rpc_clients/pxe_client.d.ts +2 -2
- package/dest/rpc_clients/pxe_client.d.ts.map +1 -1
- package/dest/rpc_clients/pxe_client.js +9 -7
- package/dest/utils/abi_types.d.ts +4 -1
- package/dest/utils/abi_types.d.ts.map +1 -1
- package/dest/utils/abi_types.js +1 -2
- package/dest/utils/authwit.d.ts +3 -2
- package/dest/utils/authwit.d.ts.map +1 -1
- package/dest/utils/authwit.js +18 -17
- package/dest/utils/aztec_cheatcodes.d.ts +4 -2
- package/dest/utils/aztec_cheatcodes.d.ts.map +1 -1
- package/dest/utils/aztec_cheatcodes.js +32 -41
- package/dest/utils/field_compressed_string.js +3 -5
- package/dest/utils/index.d.ts +1 -1
- package/dest/utils/index.d.ts.map +1 -1
- package/dest/utils/index.js +1 -2
- package/dest/utils/node.d.ts +3 -3
- package/dest/utils/node.d.ts.map +1 -1
- package/dest/utils/node.js +4 -6
- package/dest/utils/pub_key.d.ts +2 -1
- package/dest/utils/pub_key.d.ts.map +1 -1
- package/dest/utils/pub_key.js +2 -4
- package/dest/utils/pxe.d.ts +2 -2
- package/dest/utils/pxe.d.ts.map +1 -1
- package/dest/utils/pxe.js +3 -5
- package/dest/wallet/account_wallet.d.ts +8 -5
- package/dest/wallet/account_wallet.d.ts.map +1 -1
- package/dest/wallet/account_wallet.js +120 -83
- package/dest/wallet/account_wallet_with_private_key.d.ts +5 -5
- package/dest/wallet/account_wallet_with_private_key.d.ts.map +1 -1
- package/dest/wallet/account_wallet_with_private_key.js +10 -16
- package/dest/wallet/base_wallet.d.ts +19 -10
- package/dest/wallet/base_wallet.d.ts.map +1 -1
- package/dest/wallet/base_wallet.js +12 -13
- package/dest/wallet/index.d.ts +3 -3
- package/dest/wallet/index.d.ts.map +1 -1
- package/dest/wallet/index.js +2 -4
- package/dest/wallet/signerless_wallet.d.ts +7 -4
- package/dest/wallet/signerless_wallet.d.ts.map +1 -1
- package/dest/wallet/signerless_wallet.js +4 -6
- package/package.json +10 -14
- package/src/account/contract.ts +22 -5
- package/src/account/index.ts +2 -2
- package/src/account/interface.ts +5 -4
- package/src/account/wallet.ts +4 -3
- package/src/account_manager/deploy_account_method.ts +5 -5
- package/src/account_manager/deploy_account_sent_tx.ts +4 -3
- package/src/account_manager/index.ts +51 -24
- package/src/api/abi.ts +10 -3
- package/src/api/account.ts +8 -3
- package/src/api/addresses.ts +2 -2
- package/src/api/cheat_codes.ts +6 -6
- package/src/api/ethereum/anvil_test_watcher.ts +31 -7
- package/src/api/ethereum/chain_monitor.ts +9 -2
- package/src/api/ethereum/cheat_codes.ts +65 -24
- package/src/api/ethereum/index.ts +5 -1
- package/src/api/ethereum/l1_contracts.ts +1 -1
- package/src/api/ethereum/portal_manager.ts +27 -32
- package/src/api/fee.ts +0 -1
- package/src/api/interfaces/pxe.ts +1 -1
- package/src/api/log_id.ts +1 -1
- package/src/api/tx_hash.ts +1 -1
- package/src/api/wallet.ts +1 -1
- package/src/contract/base_contract_interaction.ts +35 -9
- package/src/contract/batch_call.ts +9 -7
- package/src/contract/checker.ts +1 -1
- package/src/contract/contract.ts +11 -4
- package/src/contract/contract_base.ts +3 -3
- package/src/contract/contract_function_interaction.ts +24 -13
- package/src/contract/deploy_method.ts +27 -18
- package/src/contract/deploy_proven_tx.ts +6 -4
- package/src/contract/deploy_sent_tx.ts +8 -6
- package/src/contract/get_gas_limits.ts +2 -2
- package/src/contract/protocol_contracts.ts +35 -0
- package/src/contract/proven_tx.ts +3 -2
- package/src/contract/sent_tx.ts +3 -2
- package/src/contract/unsafe_contract.ts +3 -3
- package/src/deployment/broadcast_function.ts +47 -40
- package/src/deployment/contract_deployer.ts +4 -3
- package/src/deployment/deploy_instance.ts +5 -5
- package/src/deployment/register_class.ts +25 -18
- package/src/entrypoint/default_entrypoint.ts +5 -5
- package/src/entrypoint/default_multi_call_entrypoint.ts +5 -4
- package/src/entrypoint/entrypoint.ts +7 -3
- package/src/entrypoint/payload.ts +11 -6
- package/src/fee/fee_juice_payment_method.ts +5 -3
- package/src/fee/fee_juice_payment_method_with_claim.ts +11 -10
- package/src/fee/fee_payment_method.ts +3 -3
- package/src/fee/private_fee_payment_method.ts +10 -11
- package/src/fee/public_fee_payment_method.ts +11 -11
- package/src/index.ts +35 -58
- package/src/rpc_clients/node/index.ts +2 -1
- package/src/rpc_clients/pxe_client.ts +2 -2
- package/src/utils/abi_types.ts +4 -7
- package/src/utils/authwit.ts +5 -2
- package/src/utils/aztec_cheatcodes.ts +5 -3
- package/src/utils/field_compressed_string.ts +1 -1
- package/src/utils/index.ts +1 -1
- package/src/utils/node.ts +3 -3
- package/src/utils/pub_key.ts +3 -2
- package/src/utils/pxe.ts +2 -2
- package/src/wallet/account_wallet.ts +8 -5
- package/src/wallet/account_wallet_with_private_key.ts +5 -4
- package/src/wallet/base_wallet.ts +37 -46
- package/src/wallet/index.ts +3 -3
- package/src/wallet/signerless_wallet.ts +7 -4
- package/dest/deployment/protocol_contracts.d.ts.map +0 -1
- package/dest/deployment/protocol_contracts.js +0 -14
- package/dest/fee/no_fee_payment_method.d.ts +0 -13
- package/dest/fee/no_fee_payment_method.d.ts.map +0 -1
- package/dest/fee/no_fee_payment_method.js +0 -17
- package/src/deployment/protocol_contracts.ts +0 -17
- package/src/fee/no_fee_payment_method.ts +0 -23
|
@@ -1,7 +1,16 @@
|
|
|
1
1
|
import { createLogger } from '@aztec/foundation/log';
|
|
2
|
-
/** Utility class that polls the chain on quick intervals and logs new L1 blocks, L2 blocks, and L2 proofs. */
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
/** Utility class that polls the chain on quick intervals and logs new L1 blocks, L2 blocks, and L2 proofs. */ export class ChainMonitor {
|
|
3
|
+
rollup;
|
|
4
|
+
logger;
|
|
5
|
+
intervalMs;
|
|
6
|
+
l1Client;
|
|
7
|
+
handle;
|
|
8
|
+
/** Current L1 block number */ l1BlockNumber;
|
|
9
|
+
/** Current L2 block number */ l2BlockNumber;
|
|
10
|
+
/** Current L2 proven block number */ l2ProvenBlockNumber;
|
|
11
|
+
/** L1 timestamp for the current L2 block */ l2BlockTimestamp;
|
|
12
|
+
/** L1 timestamp for the proven L2 block */ l2ProvenBlockTimestamp;
|
|
13
|
+
constructor(rollup, logger = createLogger('aztecjs:utils:chain_monitor'), intervalMs = 200){
|
|
5
14
|
this.rollup = rollup;
|
|
6
15
|
this.logger = logger;
|
|
7
16
|
this.intervalMs = intervalMs;
|
|
@@ -12,6 +21,7 @@ export class ChainMonitor {
|
|
|
12
21
|
throw new Error('Chain monitor already started');
|
|
13
22
|
}
|
|
14
23
|
this.handle = setInterval(this.safeRun.bind(this), this.intervalMs);
|
|
24
|
+
return this;
|
|
15
25
|
}
|
|
16
26
|
stop() {
|
|
17
27
|
if (this.handle) {
|
|
@@ -20,17 +30,22 @@ export class ChainMonitor {
|
|
|
20
30
|
}
|
|
21
31
|
}
|
|
22
32
|
safeRun() {
|
|
23
|
-
void this.run().catch(error
|
|
33
|
+
void this.run().catch((error)=>{
|
|
24
34
|
this.logger.error('Error in chain monitor loop', error);
|
|
25
35
|
});
|
|
26
36
|
}
|
|
27
37
|
async run() {
|
|
28
|
-
const newL1BlockNumber = Number(await this.l1Client.getBlockNumber({
|
|
38
|
+
const newL1BlockNumber = Number(await this.l1Client.getBlockNumber({
|
|
39
|
+
cacheTime: 0
|
|
40
|
+
}));
|
|
29
41
|
if (this.l1BlockNumber === newL1BlockNumber) {
|
|
30
42
|
return;
|
|
31
43
|
}
|
|
32
44
|
this.l1BlockNumber = newL1BlockNumber;
|
|
33
|
-
const block = await this.l1Client.getBlock({
|
|
45
|
+
const block = await this.l1Client.getBlock({
|
|
46
|
+
blockNumber: BigInt(newL1BlockNumber),
|
|
47
|
+
includeTransactions: false
|
|
48
|
+
});
|
|
34
49
|
const timestamp = block.timestamp;
|
|
35
50
|
const timestampString = new Date(Number(timestamp) * 1000).toTimeString().split(' ')[0];
|
|
36
51
|
let msg = `L1 block ${newL1BlockNumber} mined at ${timestampString}`;
|
|
@@ -39,20 +54,21 @@ export class ChainMonitor {
|
|
|
39
54
|
const epochNumber = await this.rollup.getEpochNumber(BigInt(newL2BlockNumber));
|
|
40
55
|
msg += ` with new L2 block ${newL2BlockNumber} for epoch ${epochNumber}`;
|
|
41
56
|
this.l2BlockNumber = newL2BlockNumber;
|
|
57
|
+
this.l2BlockTimestamp = timestamp;
|
|
42
58
|
}
|
|
43
59
|
const newL2ProvenBlockNumber = Number(await this.rollup.getProvenBlockNumber());
|
|
44
60
|
if (this.l2ProvenBlockNumber !== newL2ProvenBlockNumber) {
|
|
45
61
|
const epochNumber = await this.rollup.getEpochNumber(BigInt(newL2ProvenBlockNumber));
|
|
46
62
|
msg += ` with proof up to L2 block ${newL2ProvenBlockNumber} for epoch ${epochNumber}`;
|
|
47
63
|
this.l2ProvenBlockNumber = newL2ProvenBlockNumber;
|
|
64
|
+
this.l2ProvenBlockTimestamp = timestamp;
|
|
48
65
|
}
|
|
49
66
|
this.logger.info(msg, {
|
|
50
67
|
l1Timestamp: timestamp,
|
|
51
68
|
l1BlockNumber: this.l1BlockNumber,
|
|
52
69
|
l2SlotNumber: await this.rollup.getSlotNumber(),
|
|
53
70
|
l2BlockNumber: this.l2BlockNumber,
|
|
54
|
-
l2ProvenBlockNumber: this.l2ProvenBlockNumber
|
|
71
|
+
l2ProvenBlockNumber: this.l2ProvenBlockNumber
|
|
55
72
|
});
|
|
56
73
|
}
|
|
57
74
|
}
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbW9uaXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcGkvZXRoZXJldW0vY2hhaW5fbW9uaXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFJckQsOEdBQThHO0FBQzlHLE1BQU0sT0FBTyxZQUFZO0lBV3ZCLFlBQ21CLE1BQXNCLEVBQy9CLFNBQVMsWUFBWSxDQUFDLDZCQUE2QixDQUFDLEVBQzNDLGFBQWEsR0FBRztRQUZoQixXQUFNLEdBQU4sTUFBTSxDQUFnQjtRQUMvQixXQUFNLEdBQU4sTUFBTSxDQUE4QztRQUMzQyxlQUFVLEdBQVYsVUFBVSxDQUFNO1FBRWpDLElBQUksQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUNoQyxDQUFDO0lBRUQsS0FBSztRQUNILElBQUksSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2hCLE1BQU0sSUFBSSxLQUFLLENBQUMsK0JBQStCLENBQUMsQ0FBQztRQUNuRCxDQUFDO1FBQ0QsSUFBSSxDQUFDLE1BQU0sR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQ3RFLENBQUM7SUFFRCxJQUFJO1FBQ0YsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDaEIsYUFBYSxDQUFDLElBQUksQ0FBQyxNQUFPLENBQUMsQ0FBQztZQUM1QixJQUFJLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQztRQUMxQixDQUFDO0lBQ0gsQ0FBQztJQUVPLE9BQU87UUFDYixLQUFLLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDNUIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsNkJBQTZCLEVBQUUsS0FBSyxDQUFD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
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import type { ViemPublicClient } from '@aztec/ethereum';
|
|
1
2
|
import { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
|
|
2
|
-
import {
|
|
3
|
+
import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
|
|
3
4
|
import { RollupAbi } from '@aztec/l1-artifacts';
|
|
4
|
-
import { type GetContractReturnType, type Hex
|
|
5
|
+
import { type GetContractReturnType, type Hex } from 'viem';
|
|
5
6
|
export { EthCheatCodes };
|
|
6
7
|
/** Cheat codes for the L1 rollup contract. */
|
|
7
8
|
export declare class RollupCheatCodes {
|
|
@@ -45,8 +46,18 @@ export declare class RollupCheatCodes {
|
|
|
45
46
|
* Executes an action impersonated as the owner of the Rollup contract.
|
|
46
47
|
* @param action - The action to execute
|
|
47
48
|
*/
|
|
48
|
-
asOwner(action: (owner: Hex, rollup: GetContractReturnType<typeof RollupAbi,
|
|
49
|
+
asOwner(action: (owner: Hex, rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>) => Promise<void>): Promise<void>;
|
|
49
50
|
/** Directly calls the L1 gas fee oracle. */
|
|
50
51
|
updateL1GasFeeOracle(): Promise<void>;
|
|
52
|
+
/**
|
|
53
|
+
* Bumps proving cost per mana.
|
|
54
|
+
* @param bumper - Callback to calculate the new proving cost per mana based on current value.
|
|
55
|
+
*/
|
|
56
|
+
bumpProvingCostPerMana(bumper: (before: bigint) => bigint): Promise<void>;
|
|
57
|
+
/**
|
|
58
|
+
* Directly updates proving cost per mana.
|
|
59
|
+
* @param ethValue - The new proving cost per mana in ETH
|
|
60
|
+
*/
|
|
61
|
+
setProvingCostPerMana(ethValue: bigint): Promise<void>;
|
|
51
62
|
}
|
|
52
63
|
//# sourceMappingURL=cheat_codes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAGjF,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,GAAG,EAA8D,MAAM,MAAM,CAAC;AAGxH,OAAO,EAAE,aAAa,EAAE,CAAC;AAEzB,8CAA8C;AAC9C,qBAAa,gBAAgB;IAMf,OAAO,CAAC,aAAa;IALjC,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,MAAM,CAA4D;IAE1E,OAAO,CAAC,MAAM,CAAuC;gBAEjC,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC;IAYvG,+BAA+B;IAClB,OAAO;IAKpB,gCAAgC;IACnB,QAAQ;IAKrB;;;OAGG;IACU,OAAO,IAAI,OAAO,CAAC;QAC9B,4BAA4B,CAAC,OAAO,EAAE,MAAM,CAAC;QAC7C,2BAA2B,CAAC,MAAM,EAAE,MAAM,CAAC;KAC5C,CAAC;IAQF,0EAA0E;IAC7D,SAAS,IAAI,OAAO,CAAC;QAChC,qBAAqB,CAAC,aAAa,EAAE,MAAM,CAAC;QAC5C,oBAAoB,CAAC,YAAY,EAAE,MAAM,CAAC;KAC3C,CAAC;IAQF,4CAA4C;IAC/B,kBAAkB;IAU/B,6DAA6D;IAChD,iBAAiB;IAQ9B;;;OAGG;IACU,YAAY,CAAC,OAAO,EAAE,MAAM;IASzC;;;OAGG;IACU,YAAY,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;IAiC5D;;;OAGG;IACU,OAAO,CAClB,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,qBAAqB,CAAC,OAAO,SAAS,EAAE,gBAAgB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAQ1G,4CAA4C;IAC/B,oBAAoB;IAQjC;;;OAGG;IACU,sBAAsB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM;IAMtE;;;OAGG;IACU,qBAAqB,CAAC,QAAQ,EAAE,MAAM;CAOpD"}
|
|
@@ -1,109 +1,162 @@
|
|
|
1
1
|
import { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
|
|
2
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
3
4
|
import { RollupAbi } from '@aztec/l1-artifacts';
|
|
4
|
-
import {
|
|
5
|
+
import { createPublicClient, fallback, getContract, http, keccak256 } from 'viem';
|
|
5
6
|
import { foundry } from 'viem/chains';
|
|
6
7
|
export { EthCheatCodes };
|
|
7
|
-
/** Cheat codes for the L1 rollup contract. */
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
/** Cheat codes for the L1 rollup contract. */ export class RollupCheatCodes {
|
|
9
|
+
ethCheatCodes;
|
|
10
|
+
client;
|
|
11
|
+
rollup;
|
|
12
|
+
logger;
|
|
13
|
+
constructor(ethCheatCodes, addresses){
|
|
10
14
|
this.ethCheatCodes = ethCheatCodes;
|
|
11
15
|
this.logger = createLogger('aztecjs:cheat_codes');
|
|
12
|
-
this.client =
|
|
16
|
+
this.client = createPublicClient({
|
|
17
|
+
chain: foundry,
|
|
18
|
+
transport: fallback(ethCheatCodes.rpcUrls.map((url)=>http(url)))
|
|
19
|
+
});
|
|
13
20
|
this.rollup = getContract({
|
|
14
21
|
abi: RollupAbi,
|
|
15
22
|
address: addresses.rollupAddress.toString(),
|
|
16
|
-
client: this.client
|
|
23
|
+
client: this.client
|
|
17
24
|
});
|
|
18
25
|
}
|
|
19
|
-
/** Returns the current slot */
|
|
20
|
-
async getSlot() {
|
|
26
|
+
/** Returns the current slot */ async getSlot() {
|
|
21
27
|
const ts = BigInt((await this.client.getBlock()).timestamp);
|
|
22
|
-
return await this.rollup.read.getSlotAt([
|
|
28
|
+
return await this.rollup.read.getSlotAt([
|
|
29
|
+
ts
|
|
30
|
+
]);
|
|
23
31
|
}
|
|
24
|
-
/** Returns the current epoch */
|
|
25
|
-
async getEpoch() {
|
|
32
|
+
/** Returns the current epoch */ async getEpoch() {
|
|
26
33
|
const slotNumber = await this.getSlot();
|
|
27
|
-
return await this.rollup.read.getEpochAtSlot([
|
|
34
|
+
return await this.rollup.read.getEpochAtSlot([
|
|
35
|
+
slotNumber
|
|
36
|
+
]);
|
|
28
37
|
}
|
|
29
38
|
/**
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
async getTips() {
|
|
39
|
+
* Returns the pending and proven chain tips
|
|
40
|
+
* @returns The pending and proven chain tips
|
|
41
|
+
*/ async getTips() {
|
|
34
42
|
const res = await this.rollup.read.getTips();
|
|
35
43
|
return {
|
|
36
44
|
pending: res.pendingBlockNumber,
|
|
37
|
-
proven: res.provenBlockNumber
|
|
45
|
+
proven: res.provenBlockNumber
|
|
38
46
|
};
|
|
39
47
|
}
|
|
40
|
-
/** Fetches the epoch and slot duration config from the rollup contract */
|
|
41
|
-
async getConfig() {
|
|
48
|
+
/** Fetches the epoch and slot duration config from the rollup contract */ async getConfig() {
|
|
42
49
|
const [epochDuration, slotDuration] = await Promise.all([
|
|
43
50
|
this.rollup.read.getEpochDuration(),
|
|
44
|
-
this.rollup.read.getSlotDuration()
|
|
51
|
+
this.rollup.read.getSlotDuration()
|
|
45
52
|
]);
|
|
46
|
-
return {
|
|
53
|
+
return {
|
|
54
|
+
epochDuration,
|
|
55
|
+
slotDuration
|
|
56
|
+
};
|
|
47
57
|
}
|
|
48
|
-
/** Warps time in L1 until the next epoch */
|
|
49
|
-
async advanceToNextEpoch() {
|
|
58
|
+
/** Warps time in L1 until the next epoch */ async advanceToNextEpoch() {
|
|
50
59
|
const slot = await this.getSlot();
|
|
51
60
|
const { epochDuration, slotDuration } = await this.getConfig();
|
|
52
|
-
const slotsUntilNextEpoch = epochDuration -
|
|
61
|
+
const slotsUntilNextEpoch = epochDuration - slot % epochDuration + 1n;
|
|
53
62
|
const timeToNextEpoch = slotsUntilNextEpoch * slotDuration;
|
|
54
63
|
const l1Timestamp = BigInt((await this.client.getBlock()).timestamp);
|
|
55
64
|
await this.ethCheatCodes.warp(Number(l1Timestamp + timeToNextEpoch), true);
|
|
56
65
|
this.logger.warn(`Advanced to next epoch`);
|
|
57
66
|
}
|
|
58
|
-
/** Warps time in L1 until the beginning of the next slot. */
|
|
59
|
-
async advanceToNextSlot() {
|
|
67
|
+
/** Warps time in L1 until the beginning of the next slot. */ async advanceToNextSlot() {
|
|
60
68
|
const currentSlot = await this.getSlot();
|
|
61
|
-
const timestamp = await this.rollup.read.getTimestampForSlot([
|
|
69
|
+
const timestamp = await this.rollup.read.getTimestampForSlot([
|
|
70
|
+
currentSlot + 1n
|
|
71
|
+
]);
|
|
62
72
|
await this.ethCheatCodes.warp(Number(timestamp));
|
|
63
73
|
this.logger.warn(`Advanced to slot ${currentSlot + 1n}`);
|
|
64
|
-
return [
|
|
74
|
+
return [
|
|
75
|
+
timestamp,
|
|
76
|
+
currentSlot + 1n
|
|
77
|
+
];
|
|
65
78
|
}
|
|
66
79
|
/**
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
async advanceSlots(howMany) {
|
|
80
|
+
* Warps time in L1 equivalent to however many slots.
|
|
81
|
+
* @param howMany - The number of slots to advance.
|
|
82
|
+
*/ async advanceSlots(howMany) {
|
|
71
83
|
const l1Timestamp = (await this.client.getBlock()).timestamp;
|
|
72
84
|
const slotDuration = await this.rollup.read.getSlotDuration();
|
|
73
85
|
const timeToWarp = BigInt(howMany) * slotDuration;
|
|
74
86
|
await this.ethCheatCodes.warp(l1Timestamp + timeToWarp, true);
|
|
75
|
-
const [slot, epoch] = await Promise.all([
|
|
87
|
+
const [slot, epoch] = await Promise.all([
|
|
88
|
+
this.getSlot(),
|
|
89
|
+
this.getEpoch()
|
|
90
|
+
]);
|
|
76
91
|
this.logger.warn(`Advanced ${howMany} slots up to slot ${slot} in epoch ${epoch}`);
|
|
77
92
|
}
|
|
78
93
|
/**
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
this.logger.warn(`
|
|
89
|
-
|
|
94
|
+
* Marks the specified block (or latest if none) as proven
|
|
95
|
+
* @param maybeBlockNumber - The block number to mark as proven (defaults to latest pending)
|
|
96
|
+
*/ async markAsProven(maybeBlockNumber) {
|
|
97
|
+
const { pending, proven } = await this.getTips();
|
|
98
|
+
let blockNumber = maybeBlockNumber;
|
|
99
|
+
if (blockNumber === undefined || blockNumber > pending) {
|
|
100
|
+
blockNumber = pending;
|
|
101
|
+
}
|
|
102
|
+
if (blockNumber <= proven) {
|
|
103
|
+
this.logger.warn(`Block ${blockNumber} is already proven`);
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
// @note @LHerskind this is heavily dependent on the storage layout and size of values
|
|
107
|
+
// The rollupStore is a struct and if the size of elements or the struct changes, this can break
|
|
108
|
+
// Convert string to bytes and then compute keccak256
|
|
109
|
+
const storageSlot = keccak256(Buffer.from('aztec.stf.storage', 'utf-8'));
|
|
110
|
+
const provenBlockNumberSlot = BigInt(storageSlot) + 1n;
|
|
111
|
+
const tipsBefore = await this.getTips();
|
|
112
|
+
await this.ethCheatCodes.store(EthAddress.fromString(this.rollup.address), provenBlockNumberSlot, BigInt(blockNumber));
|
|
113
|
+
const tipsAfter = await this.getTips();
|
|
114
|
+
this.logger.info(`Proven tip moved: ${tipsBefore.proven} -> ${tipsAfter.proven}. Pending tip: ${tipsAfter.pending}.`);
|
|
90
115
|
}
|
|
91
116
|
/**
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
async asOwner(action) {
|
|
117
|
+
* Executes an action impersonated as the owner of the Rollup contract.
|
|
118
|
+
* @param action - The action to execute
|
|
119
|
+
*/ async asOwner(action) {
|
|
96
120
|
const owner = await this.rollup.read.owner();
|
|
97
121
|
await this.ethCheatCodes.startImpersonating(owner);
|
|
98
122
|
await action(owner, this.rollup);
|
|
99
123
|
await this.ethCheatCodes.stopImpersonating(owner);
|
|
100
124
|
}
|
|
101
|
-
/** Directly calls the L1 gas fee oracle. */
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
125
|
+
/** Directly calls the L1 gas fee oracle. */ async updateL1GasFeeOracle() {
|
|
126
|
+
await this.asOwner(async (account, rollup)=>{
|
|
127
|
+
const hash = await rollup.write.updateL1GasFeeOracle({
|
|
128
|
+
account,
|
|
129
|
+
chain: this.client.chain
|
|
130
|
+
});
|
|
131
|
+
await this.client.waitForTransactionReceipt({
|
|
132
|
+
hash
|
|
133
|
+
});
|
|
105
134
|
this.logger.warn(`Updated L1 gas fee oracle`);
|
|
106
135
|
});
|
|
107
136
|
}
|
|
137
|
+
/**
|
|
138
|
+
* Bumps proving cost per mana.
|
|
139
|
+
* @param bumper - Callback to calculate the new proving cost per mana based on current value.
|
|
140
|
+
*/ async bumpProvingCostPerMana(bumper) {
|
|
141
|
+
const currentCost = await this.rollup.read.getProvingCostPerManaInEth();
|
|
142
|
+
const newCost = bumper(currentCost);
|
|
143
|
+
await this.setProvingCostPerMana(newCost);
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* Directly updates proving cost per mana.
|
|
147
|
+
* @param ethValue - The new proving cost per mana in ETH
|
|
148
|
+
*/ async setProvingCostPerMana(ethValue) {
|
|
149
|
+
await this.asOwner(async (account, rollup)=>{
|
|
150
|
+
const hash = await rollup.write.setProvingCostPerMana([
|
|
151
|
+
ethValue
|
|
152
|
+
], {
|
|
153
|
+
account,
|
|
154
|
+
chain: this.client.chain
|
|
155
|
+
});
|
|
156
|
+
await this.client.waitForTransactionReceipt({
|
|
157
|
+
hash
|
|
158
|
+
});
|
|
159
|
+
this.logger.warn(`Updated proving cost per mana to ${ethValue}`);
|
|
160
|
+
});
|
|
161
|
+
}
|
|
108
162
|
}
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXBpL2V0aGVyZXVtL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUUvRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRWhELE9BQU8sRUFLTCxrQkFBa0IsRUFDbEIsV0FBVyxFQUNYLElBQUksRUFDSixhQUFhLEdBQ2QsTUFBTSxNQUFNLENBQUM7QUFDZCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXRDLE9BQU8sRUFBRSxhQUFhLEVBQUUsQ0FBQztBQUV6Qiw4Q0FBOEM7QUFDOUMsTUFBTSxPQUFPLGdCQUFnQjtJQU0zQixZQUFvQixhQUE0QixFQUFFLFNBQXFEO1FBQW5GLGtCQUFhLEdBQWIsYUFBYSxDQUFlO1FBRnhDLFdBQU0sR0FBRyxZQUFZLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUduRCxJQUFJLENBQUMsTUFBTSxHQUFHLGtCQUFrQixDQUFDLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ2xILElBQUksQ0FBQyxNQUFNLEdBQUcsV0FBVyxDQUFDO1lBQ3hCLEdBQUcsRUFBRSxTQUFTO1lBQ2QsT0FBTyxFQUFFLFNBQVMsQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFO1lBQzNDLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtTQUNwQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsK0JBQStCO0lBQ3hCLEtBQUssQ0FBQyxPQUFPO1FBQ2xCLE1BQU0sRUFBRSxHQUFHLE1BQU0s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
|
|
@@ -3,5 +3,5 @@ export { getL1ContractAddresses } from './l1_contracts.js';
|
|
|
3
3
|
export { RollupCheatCodes, EthCheatCodes } from './cheat_codes.js';
|
|
4
4
|
export { ChainMonitor } from './chain_monitor.js';
|
|
5
5
|
export { AnvilTestWatcher } from './anvil_test_watcher.js';
|
|
6
|
-
export { deployL1Contract, deployL1Contracts,
|
|
6
|
+
export { deployL1Contract, deployL1Contracts, type DeployL1ContractsReturnType, } from '@aztec/ethereum/deploy-l1-contracts';
|
|
7
7
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,wBAAwB,EACxB,cAAc,EACd,oBAAoB,EACpB,KAAK,aAAa,EAClB,KAAK,0BAA0B,EAC/B,KAAK,OAAO,EACZ,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,wBAAwB,EACxB,cAAc,EACd,oBAAoB,EACpB,KAAK,aAAa,EAClB,KAAK,0BAA0B,EAC/B,KAAK,OAAO,EACZ,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,2BAA2B,GACjC,MAAM,qCAAqC,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
export { L1FeeJuicePortalManager, L1ToL2TokenPortalManager, L1TokenManager, L1TokenPortalManager, generateClaimSecret
|
|
1
|
+
export { L1FeeJuicePortalManager, L1ToL2TokenPortalManager, L1TokenManager, L1TokenPortalManager, generateClaimSecret } from './portal_manager.js';
|
|
2
2
|
export { getL1ContractAddresses } from './l1_contracts.js';
|
|
3
3
|
export { RollupCheatCodes, EthCheatCodes } from './cheat_codes.js';
|
|
4
4
|
export { ChainMonitor } from './chain_monitor.js';
|
|
5
5
|
export { AnvilTestWatcher } from './anvil_test_watcher.js';
|
|
6
6
|
export { deployL1Contract, deployL1Contracts } from '@aztec/ethereum/deploy-l1-contracts';
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXBpL2V0aGVyZXVtL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCx1QkFBdUIsRUFDdkIsd0JBQXdCLEVBQ3hCLGNBQWMsRUFDZCxvQkFBb0IsRUFJcEIsbUJBQW1CLEdBQ3BCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDM0QsT0FBTyxFQUFFLGdCQUFnQixFQUFFLGFBQWEsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ25FLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsaUJBQWlCLEVBQXFCLE1BQU0scUNBQXFDLENBQUMifQ==
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
|
|
2
2
|
export declare const getL1ContractAddresses: (url: string) => Promise<L1ContractAddresses>;
|
|
3
3
|
//# sourceMappingURL=l1_contracts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/l1_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/l1_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAKjF,eAAO,MAAM,sBAAsB,QAAe,MAAM,KAAG,QAAQ,mBAAmB,CAerF,CAAC"}
|
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
2
2
|
import { createPXEClient } from '../../rpc_clients/index.js';
|
|
3
|
-
export const getL1ContractAddresses = async (url)
|
|
3
|
+
export const getL1ContractAddresses = async (url)=>{
|
|
4
4
|
const pxeClient = createPXEClient(url, {});
|
|
5
|
-
const response = await retryUntil(async ()
|
|
5
|
+
const response = await retryUntil(async ()=>{
|
|
6
6
|
try {
|
|
7
7
|
return (await pxeClient.getNodeInfo()).l1ContractAddresses;
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
// do nothing
|
|
8
|
+
} catch (err) {
|
|
9
|
+
// do nothing
|
|
11
10
|
}
|
|
12
11
|
}, 'isNodeReady', 120, 1);
|
|
13
12
|
return response;
|
|
14
13
|
};
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfY29udHJhY3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FwaS9ldGhlcmV1bS9sMV9jb250cmFjdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXJELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUU3RCxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxLQUFLLEVBQUUsR0FBVyxFQUFnQyxFQUFFO0lBQ3hGLE1BQU0sU0FBUyxHQUFHLGVBQWUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDM0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxVQUFVLENBQy9CLEtBQUssSUFBSSxFQUFFO1FBQ1QsSUFBSSxDQUFDO1lBQ0gsT0FBTyxDQUFDLE1BQU0sU0FBUyxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsbUJBQW1CLENBQUM7UUFDN0QsQ0FBQztRQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7WUFDYixhQUFhO1FBQ2YsQ0FBQztJQUNILENBQUMsRUFDRCxhQUFhLEVBQ2IsR0FBRyxFQUNILENBQUMsQ0FDRixDQUFDO0lBQ0YsT0FBTyxRQUFRLENBQUM7QUFDbEIsQ0FBQyxDQUFDIn0=
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import type { ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
|
|
2
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
4
|
+
import type { Logger } from '@aztec/foundation/log';
|
|
5
|
+
import type { SiblingPath } from '@aztec/foundation/trees';
|
|
4
6
|
import { TokenPortalAbi } from '@aztec/l1-artifacts';
|
|
5
|
-
import
|
|
7
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
8
|
+
import type { PXE } from '@aztec/stdlib/interfaces/client';
|
|
9
|
+
import { type GetContractReturnType, type Hex } from 'viem';
|
|
6
10
|
/** L1 to L2 message info to claim it on L2. */
|
|
7
11
|
export type L2Claim = {
|
|
8
12
|
/** Secret for claiming. */
|
|
@@ -34,7 +38,7 @@ export declare class L1TokenManager {
|
|
|
34
38
|
private contract;
|
|
35
39
|
constructor(
|
|
36
40
|
/** Address of the ERC20 contract. */
|
|
37
|
-
address: EthAddress, publicClient:
|
|
41
|
+
address: EthAddress, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
|
|
38
42
|
/**
|
|
39
43
|
* Returns the balance of the given address.
|
|
40
44
|
* @param address - Address to get the balance of.
|
|
@@ -62,7 +66,7 @@ export declare class L1FeeJuicePortalManager {
|
|
|
62
66
|
private readonly logger;
|
|
63
67
|
private readonly tokenManager;
|
|
64
68
|
private readonly contract;
|
|
65
|
-
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, publicClient:
|
|
69
|
+
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
|
|
66
70
|
/** Returns the associated token manager for the L1 ERC20. */
|
|
67
71
|
getTokenManager(): L1TokenManager;
|
|
68
72
|
/**
|
|
@@ -79,16 +83,16 @@ export declare class L1FeeJuicePortalManager {
|
|
|
79
83
|
* @param walletClient - L1 wallet client.
|
|
80
84
|
* @param logger - Logger.
|
|
81
85
|
*/
|
|
82
|
-
static new(pxe: PXE, publicClient:
|
|
86
|
+
static new(pxe: PXE, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger): Promise<L1FeeJuicePortalManager>;
|
|
83
87
|
}
|
|
84
88
|
/** Helper for interacting with a test TokenPortal on L1 for sending tokens to L2. */
|
|
85
89
|
export declare class L1ToL2TokenPortalManager {
|
|
86
|
-
protected publicClient:
|
|
87
|
-
protected walletClient:
|
|
90
|
+
protected publicClient: ViemPublicClient;
|
|
91
|
+
protected walletClient: ViemWalletClient;
|
|
88
92
|
protected logger: Logger;
|
|
89
|
-
protected readonly portal: GetContractReturnType<typeof TokenPortalAbi,
|
|
93
|
+
protected readonly portal: GetContractReturnType<typeof TokenPortalAbi, ViemWalletClient>;
|
|
90
94
|
protected readonly tokenManager: L1TokenManager;
|
|
91
|
-
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, publicClient:
|
|
95
|
+
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
|
|
92
96
|
/** Returns the token manager for the underlying L1 token. */
|
|
93
97
|
getTokenManager(): L1TokenManager;
|
|
94
98
|
/**
|
|
@@ -110,7 +114,7 @@ export declare class L1ToL2TokenPortalManager {
|
|
|
110
114
|
/** Helper for interacting with a test TokenPortal on L1 for both withdrawing from and bridging to L2. */
|
|
111
115
|
export declare class L1TokenPortalManager extends L1ToL2TokenPortalManager {
|
|
112
116
|
private readonly outbox;
|
|
113
|
-
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, outboxAddress: EthAddress, publicClient:
|
|
117
|
+
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, outboxAddress: EthAddress, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
|
|
114
118
|
/**
|
|
115
119
|
* Withdraws funds from the portal by consuming an L2 to L1 message. Returns once the tx is mined on L1.
|
|
116
120
|
* @param amount - Amount to withdraw.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portal_manager.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/portal_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"portal_manager.d.ts","sourceRoot":"","sources":["../../../src/api/ethereum/portal_manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAG1E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAA8C,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAE3D,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,GAAG,EAAmC,MAAM,MAAM,CAAC;AAI7F,+CAA+C;AAC/C,MAAM,MAAM,OAAO,GAAG;IACpB,2BAA2B;IAC3B,WAAW,EAAE,EAAE,CAAC;IAChB,uCAAuC;IACvC,eAAe,EAAE,EAAE,CAAC;IACpB,2BAA2B;IAC3B,WAAW,EAAE,GAAG,CAAC;IACjB,+CAA+C;IAC/C,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAGF,oEAAoE;AACpE,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG;IAAyB,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC;AAGrF,8FAA8F;AAC9F,MAAM,MAAM,0BAA0B,GAAG,aAAa,GAAG;IACvD,wDAAwD,CAAC,SAAS,EAAE,YAAY,CAAC;CAClF,CAAC;AAOF,8CAA8C;AAC9C,wBAAsB,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAK5E;AAED,0CAA0C;AAC1C,qBAAa,cAAc;IAIvB,qCAAqC;aACrB,OAAO,EAAE,UAAU;IACnC,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IAPhB,OAAO,CAAC,QAAQ,CAA+D;;IAG7E,qCAAqC;IACrB,OAAO,EAAE,UAAU,EAC3B,YAAY,EAAE,gBAAgB,EAC9B,YAAY,EAAE,gBAAgB,EAC9B,MAAM,EAAE,MAAM;IASxB;;;OAGG;IACU,iBAAiB,CAAC,OAAO,EAAE,GAAG;IAI3C;;;;;OAKG;IACU,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM;IAOpE;;;;;OAKG;IACU,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,SAAK;CAMpE;AAED,4DAA4D;AAC5D,qBAAa,uBAAuB;IAOhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAiB;IAC9C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoE;gBAG3F,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,UAAU,EACP,YAAY,EAAE,gBAAgB,EAC9B,YAAY,EAAE,gBAAgB,EAC9B,MAAM,EAAE,MAAM;IAUjC,6DAA6D;IACtD,eAAe;IAItB;;;;;OAKG;IACU,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,aAAa,CAAC;IAwCvG;;;;;;OAMG;WACiB,GAAG,CACrB,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,gBAAgB,EAC9B,YAAY,EAAE,gBAAgB,EAC9B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,uBAAuB,CAAC;CAWpC;AAED,qFAAqF;AACrF,qBAAa,wBAAwB;IAOjC,SAAS,CAAC,YAAY,EAAE,gBAAgB;IACxC,SAAS,CAAC,YAAY,EAAE,gBAAgB;IACxC,SAAS,CAAC,MAAM,EAAE,MAAM;IAR1B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC,OAAO,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAC1F,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAC;gBAG9C,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,UAAU,EACd,YAAY,EAAE,gBAAgB,EAC9B,YAAY,EAAE,gBAAgB,EAC9B,MAAM,EAAE,MAAM;IAU1B,6DAA6D;IACtD,eAAe;IAItB;;;;;OAKG;IACU,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,aAAa,CAAC;IAmCvG;;;;;OAKG;IACU,mBAAmB,CAC9B,EAAE,EAAE,YAAY,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,UAAQ,GACX,OAAO,CAAC,0BAA0B,CAAC;YAiCxB,WAAW;CAO1B;AAED,yGAAyG;AACzG,qBAAa,oBAAqB,SAAQ,wBAAwB;IAChE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4D;gBAGjF,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,UAAU,EACxB,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,gBAAgB,EAC9B,YAAY,EAAE,gBAAgB,EAC9B,MAAM,EAAE,MAAM;IAUhB;;;;;;;OAOG;IACU,aAAa,CACxB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,UAAU,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC;IA6BlC;;;;;;OAMG;IACI,oBAAoB,CACzB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,UAAU,EACrB,QAAQ,EAAE,YAAY,EACtB,UAAU,GAAE,UAA4B,GACvC,EAAE;CAiBN"}
|