@aztec/bot 0.0.1-commit.c2595eba → 0.0.1-commit.c2eed6949

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 (46) hide show
  1. package/dest/amm_bot.d.ts +4 -4
  2. package/dest/amm_bot.d.ts.map +1 -1
  3. package/dest/amm_bot.js +23 -16
  4. package/dest/base_bot.d.ts +4 -4
  5. package/dest/base_bot.d.ts.map +1 -1
  6. package/dest/base_bot.js +9 -10
  7. package/dest/bot.d.ts +4 -4
  8. package/dest/bot.d.ts.map +1 -1
  9. package/dest/bot.js +4 -3
  10. package/dest/config.d.ts +32 -16
  11. package/dest/config.d.ts.map +1 -1
  12. package/dest/config.js +37 -10
  13. package/dest/cross_chain_bot.d.ts +54 -0
  14. package/dest/cross_chain_bot.d.ts.map +1 -0
  15. package/dest/cross_chain_bot.js +134 -0
  16. package/dest/factory.d.ts +20 -5
  17. package/dest/factory.d.ts.map +1 -1
  18. package/dest/factory.js +191 -42
  19. package/dest/index.d.ts +2 -1
  20. package/dest/index.d.ts.map +1 -1
  21. package/dest/index.js +1 -0
  22. package/dest/l1_to_l2_seeding.d.ts +8 -0
  23. package/dest/l1_to_l2_seeding.d.ts.map +1 -0
  24. package/dest/l1_to_l2_seeding.js +63 -0
  25. package/dest/runner.d.ts +3 -3
  26. package/dest/runner.d.ts.map +1 -1
  27. package/dest/runner.js +17 -1
  28. package/dest/store/bot_store.d.ts +30 -5
  29. package/dest/store/bot_store.d.ts.map +1 -1
  30. package/dest/store/bot_store.js +37 -6
  31. package/dest/store/index.d.ts +2 -2
  32. package/dest/store/index.d.ts.map +1 -1
  33. package/dest/utils.js +3 -3
  34. package/package.json +16 -13
  35. package/src/amm_bot.ts +23 -18
  36. package/src/base_bot.ts +8 -18
  37. package/src/bot.ts +7 -6
  38. package/src/config.ts +40 -12
  39. package/src/cross_chain_bot.ts +203 -0
  40. package/src/factory.ts +195 -52
  41. package/src/index.ts +1 -0
  42. package/src/l1_to_l2_seeding.ts +79 -0
  43. package/src/runner.ts +18 -5
  44. package/src/store/bot_store.ts +60 -5
  45. package/src/store/index.ts +1 -1
  46. package/src/utils.ts +3 -3
@@ -0,0 +1,134 @@
1
+ /**
2
+ * CrossChainBot exercises L2->L1 and L1->L2 messaging.
3
+ *
4
+ * createAndSendTx onTxMined
5
+ * ────────────────────────────────────── ──────────────────────────────
6
+ *
7
+ * 1. SEED (fire-and-forget) 3. VERIFY L2->L1
8
+ * if store has fewer pending messages Query getTxEffect, confirm
9
+ * than seedCount and no seed is the expected L2->L1 messages
10
+ * in-flight: appeared in tx effects.
11
+ * * kick off L1 inbox tx
12
+ * * store msg on completion
13
+ *
14
+ * 2. BUILD & SEND BATCH
15
+ * Always:
16
+ * N x create_l2_to_l1_message
17
+ * (random content, fixed
18
+ * L1 recipient)
19
+ * If a ready L1->L2 msg exists:
20
+ * 1 x consume_message_from_
21
+ * arbitrary_sender_public
22
+ * delete consumed msg from store
23
+ * Send batch tx (no wait)
24
+ *
25
+ */ import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
26
+ import { isL1ToL2MessageReady } from '@aztec/aztec.js/messaging';
27
+ import { Fr } from '@aztec/foundation/curves/bn254';
28
+ import { EthAddress } from '@aztec/foundation/eth-address';
29
+ import { BaseBot } from './base_bot.js';
30
+ import { BotFactory } from './factory.js';
31
+ import { seedL1ToL2Message } from './l1_to_l2_seeding.js';
32
+ /** Stale message threshold: messages older than this are removed. */ const STALE_MESSAGE_THRESHOLD_MS = 2 * 60 * 60 * 1000; // 2 hours
33
+ /** Bot that exercises both L2→L1 and L1→L2 cross-chain messaging. */ export class CrossChainBot extends BaseBot {
34
+ contract;
35
+ l1Client;
36
+ l1Recipient;
37
+ inboxAddress;
38
+ rollupVersion;
39
+ store;
40
+ l2ToL1Sent;
41
+ l1ToL2Consumed;
42
+ pendingSeedPromise;
43
+ constructor(node, wallet, defaultAccountAddress, contract, l1Client, l1Recipient, inboxAddress, rollupVersion, store, config){
44
+ super(node, wallet, defaultAccountAddress, config), this.contract = contract, this.l1Client = l1Client, this.l1Recipient = l1Recipient, this.inboxAddress = inboxAddress, this.rollupVersion = rollupVersion, this.store = store, this.l2ToL1Sent = 0, this.l1ToL2Consumed = 0;
45
+ }
46
+ static async create(config, wallet, aztecNode, aztecNodeAdmin, store) {
47
+ if (config.followChain === 'NONE') {
48
+ throw new Error(`CrossChainBot requires followChain to be set (got NONE)`);
49
+ }
50
+ const factory = new BotFactory(config, wallet, store, aztecNode, aztecNodeAdmin);
51
+ const { defaultAccountAddress, contract, l1Client, rollupVersion } = await factory.setupCrossChain();
52
+ const l1Recipient = EthAddress.fromString(l1Client.account.address);
53
+ const { l1ContractAddresses } = await aztecNode.getNodeInfo();
54
+ const inboxAddress = EthAddress.fromString(l1ContractAddresses.inboxAddress.toString());
55
+ return new CrossChainBot(aztecNode, wallet, defaultAccountAddress, contract, l1Client, l1Recipient, inboxAddress, rollupVersion, store, config);
56
+ }
57
+ async createAndSendTx(logCtx) {
58
+ const pendingMessages = await this.store.getUnconsumedL1ToL2Messages();
59
+ // Send an L1→L2 message if we're below the threshold and not already seeding one
60
+ if (pendingMessages.length < this.config.l1ToL2SeedCount && !this.pendingSeedPromise) {
61
+ this.pendingSeedPromise = this.seedNewL1ToL2Message().catch((err)=>this.log.warn(`Failed to seed L1→L2 message: ${err}`, logCtx)).finally(()=>{
62
+ this.pendingSeedPromise = undefined;
63
+ });
64
+ }
65
+ // Build batch: always L2→L1, optionally consume L1→L2
66
+ const calls = [];
67
+ // L2→L1: create messages with random content
68
+ for(let i = 0; i < this.config.l2ToL1MessagesPerTx; i++){
69
+ calls.push(this.contract.methods.create_l2_to_l1_message_arbitrary_recipient_public(Fr.random(), this.l1Recipient));
70
+ }
71
+ // L1→L2: consume oldest ready message if available
72
+ const readyMsg = await this.getReadyL1ToL2Message(pendingMessages);
73
+ if (readyMsg) {
74
+ calls.push(this.contract.methods.consume_message_from_arbitrary_sender_public(Fr.fromHexString(readyMsg.content), Fr.fromHexString(readyMsg.secret), EthAddress.fromString(readyMsg.sender), new Fr(BigInt(readyMsg.globalLeafIndex))));
75
+ // Delete consumed message immediately so it works with FOLLOW_CHAIN=NONE
76
+ await this.store.deleteL1ToL2Message(readyMsg.msgHash);
77
+ this.l1ToL2Consumed++;
78
+ } else {
79
+ this.log.warn(`No ready L1→L2 message to consume`, {
80
+ ...logCtx,
81
+ pendingCount: pendingMessages.length
82
+ });
83
+ }
84
+ const batch = new BatchCall(this.wallet, calls);
85
+ const opts = await this.getSendMethodOpts(batch);
86
+ this.log.verbose(`Sending cross-chain batch with ${calls.length} calls`, logCtx);
87
+ const { txHash } = await batch.send({
88
+ ...opts,
89
+ wait: NO_WAIT
90
+ });
91
+ return txHash;
92
+ }
93
+ async onTxMined(receipt, logCtx) {
94
+ // Verify L2→L1 messages appeared in this tx's effects
95
+ const indexed = await this.node.getTxEffect(receipt.txHash);
96
+ if (indexed) {
97
+ const l2ToL1Msgs = indexed.data.l2ToL1Msgs.filter((m)=>!m.isZero());
98
+ if (l2ToL1Msgs.length >= this.config.l2ToL1MessagesPerTx) {
99
+ this.l2ToL1Sent += l2ToL1Msgs.length;
100
+ } else {
101
+ this.log.error(`Expected ${this.config.l2ToL1MessagesPerTx} L2→L1 messages but found ${l2ToL1Msgs.length}`, {
102
+ ...logCtx,
103
+ blockNumber: receipt.blockNumber,
104
+ txHash: receipt.txHash.toString()
105
+ });
106
+ }
107
+ }
108
+ const pendingCount = (await this.store.getUnconsumedL1ToL2Messages()).length;
109
+ this.log.info(`CrossChainBot txs mined`, {
110
+ ...logCtx,
111
+ l2ToL1Sent: this.l2ToL1Sent,
112
+ l1ToL2Consumed: this.l1ToL2Consumed,
113
+ l1ToL2Pending: pendingCount
114
+ });
115
+ }
116
+ /** Finds the oldest pending message that is ready for consumption. */ async getReadyL1ToL2Message(pendingMessages) {
117
+ const now = Date.now();
118
+ for (const msg of pendingMessages){
119
+ const ready = await isL1ToL2MessageReady(this.node, Fr.fromHexString(msg.msgHash));
120
+ if (ready) {
121
+ return msg;
122
+ }
123
+ // Time-based stale detection: if the message is old and still not ready, remove it
124
+ if (now - msg.timestamp > STALE_MESSAGE_THRESHOLD_MS) {
125
+ await this.store.deleteL1ToL2Message(msg.msgHash);
126
+ this.log.warn(`Removed stale L1→L2 message ${msg.msgHash}`);
127
+ }
128
+ }
129
+ return undefined;
130
+ }
131
+ /** Seeds a new L1→L2 message on L1 and stores it. */ async seedNewL1ToL2Message() {
132
+ await seedL1ToL2Message(this.l1Client, this.inboxAddress, this.contract.address, this.rollupVersion, this.store, this.log);
133
+ }
134
+ }
package/dest/factory.d.ts CHANGED
@@ -1,9 +1,11 @@
1
1
  import { AztecAddress } from '@aztec/aztec.js/addresses';
2
+ import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
2
3
  import { AMMContract } from '@aztec/noir-contracts.js/AMM';
3
4
  import { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
4
5
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
6
+ import { TestContract } from '@aztec/noir-test-contracts.js/Test';
5
7
  import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
6
- import { TestWallet } from '@aztec/test-wallet/server';
8
+ import { EmbeddedWallet } from '@aztec/wallets/embedded';
7
9
  import { type BotConfig } from './config.js';
8
10
  import type { BotStore } from './store/index.js';
9
11
  export declare class BotFactory {
@@ -13,26 +15,39 @@ export declare class BotFactory {
13
15
  private readonly aztecNode;
14
16
  private readonly aztecNodeAdmin?;
15
17
  private log;
16
- constructor(config: BotConfig, wallet: TestWallet, store: BotStore, aztecNode: AztecNode, aztecNodeAdmin?: AztecNodeAdmin | undefined);
18
+ constructor(config: BotConfig, wallet: EmbeddedWallet, store: BotStore, aztecNode: AztecNode, aztecNodeAdmin?: AztecNodeAdmin | undefined);
17
19
  /**
18
20
  * Initializes a new bot by setting up the sender account, registering the recipient,
19
21
  * deploying the token contract, and minting tokens if necessary.
20
22
  */
21
23
  setup(): Promise<{
22
- wallet: TestWallet;
24
+ wallet: EmbeddedWallet;
23
25
  defaultAccountAddress: AztecAddress;
24
26
  token: TokenContract | PrivateTokenContract;
25
27
  node: AztecNode;
26
28
  recipient: AztecAddress;
27
29
  }>;
28
30
  setupAmm(): Promise<{
29
- wallet: TestWallet;
31
+ wallet: EmbeddedWallet;
30
32
  defaultAccountAddress: AztecAddress;
31
33
  amm: AMMContract;
32
34
  token0: TokenContract;
33
35
  token1: TokenContract;
34
36
  node: AztecNode;
35
37
  }>;
38
+ /**
39
+ * Initializes the cross-chain bot by deploying TestContract, creating an L1 client,
40
+ * seeding initial L1→L2 messages, and waiting for the first to be ready.
41
+ */
42
+ setupCrossChain(): Promise<{
43
+ wallet: EmbeddedWallet;
44
+ defaultAccountAddress: AztecAddress;
45
+ contract: TestContract;
46
+ node: AztecNode;
47
+ l1Client: ExtendedViemWalletClient;
48
+ rollupVersion: bigint;
49
+ }>;
50
+ private setupTestContract;
36
51
  private setupAccount;
37
52
  private setupAccountWithPrivateKey;
38
53
  private setupTestAccount;
@@ -46,4 +61,4 @@ export declare class BotFactory {
46
61
  private bridgeL1FeeJuice;
47
62
  private withNoMinTxsPerBlock;
48
63
  }
49
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBb0J6RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDM0QsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDN0UsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRy9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFdkQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUEyQixNQUFNLGFBQWEsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU1qRCxxQkFBYSxVQUFVO0lBSW5CLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQztJQVBsQyxPQUFPLENBQUMsR0FBRyxDQUF1QjtJQUVsQyxZQUNtQixNQUFNLEVBQUUsU0FBUyxFQUNqQixNQUFNLEVBQUUsVUFBVSxFQUNsQixLQUFLLEVBQUUsUUFBUSxFQUNmLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGNBQWMsQ0FBQyw0QkFBZ0IsRUFDOUM7SUFFSjs7O09BR0c7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDO1FBQzVCLE1BQU0sRUFBRSxVQUFVLENBQUM7UUFDbkIscUJBQXFCLEVBQUUsWUFBWSxDQUFDO1FBQ3BDLEtBQUssRUFBRSxhQUFhLEdBQUcsb0JBQW9CLENBQUM7UUFDNUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUNoQixTQUFTLEVBQUUsWUFBWSxDQUFDO0tBQ3pCLENBQUMsQ0FNRDtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUM7UUFDL0IsTUFBTSxFQUFFLFVBQVUsQ0FBQztRQUNuQixxQkFBcUIsRUFBRSxZQUFZLENBQUM7UUFDcEMsR0FBRyxFQUFFLFdBQVcsQ0FBQztRQUNqQixNQUFNLEVBQUUsYUFBYSxDQUFDO1FBQ3RCLE1BQU0sRUFBRSxhQUFhLENBQUM7UUFDdEIsSUFBSSxFQUFFLFNBQVMsQ0FBQztLQUNqQixDQUFDLENBc0JEO1lBTWEsWUFBWTtZQVdaLDBCQUEwQjtZQThDMUIsZ0JBQWdCO1lBZ0JoQixVQUFVO1lBb0RWLGtCQUFrQjtZQWFsQixnQkFBZ0I7WUFzQmhCLE9BQU87WUE2RVAsd0JBQXdCO1lBMEJ4QixVQUFVO1lBMENWLHNCQUFzQjtZQTRCdEIsZ0JBQWdCO1lBZ0NoQixvQkFBb0I7Q0FlbkMifQ==
64
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBb0J6RCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSXRFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBR2xFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUEyQixNQUFNLGFBQWEsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU1qRCxxQkFBYSxVQUFVO0lBSW5CLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQztJQVBsQyxPQUFPLENBQUMsR0FBRyxDQUF1QjtJQUVsQyxZQUNtQixNQUFNLEVBQUUsU0FBUyxFQUNqQixNQUFNLEVBQUUsY0FBYyxFQUN0QixLQUFLLEVBQUUsUUFBUSxFQUNmLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGNBQWMsQ0FBQyw0QkFBZ0IsRUFLakQ7SUFFRDs7O09BR0c7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDO1FBQzVCLE1BQU0sRUFBRSxjQUFjLENBQUM7UUFDdkIscUJBQXFCLEVBQUUsWUFBWSxDQUFDO1FBQ3BDLEtBQUssRUFBRSxhQUFhLEdBQUcsb0JBQW9CLENBQUM7UUFDNUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUNoQixTQUFTLEVBQUUsWUFBWSxDQUFDO0tBQ3pCLENBQUMsQ0FNRDtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUM7UUFDL0IsTUFBTSxFQUFFLGNBQWMsQ0FBQztRQUN2QixxQkFBcUIsRUFBRSxZQUFZLENBQUM7UUFDcEMsR0FBRyxFQUFFLFdBQVcsQ0FBQztRQUNqQixNQUFNLEVBQUUsYUFBYSxDQUFDO1FBQ3RCLE1BQU0sRUFBRSxhQUFhLENBQUM7UUFDdEIsSUFBSSxFQUFFLFNBQVMsQ0FBQztLQUNqQixDQUFDLENBc0JEO0lBRUQ7OztPQUdHO0lBQ1UsZUFBZSxJQUFJLE9BQU8sQ0FBQztRQUN0QyxNQUFNLEVBQUUsY0FBYyxDQUFDO1FBQ3ZCLHFCQUFxQixFQUFFLFlBQVksQ0FBQztRQUNwQyxRQUFRLEVBQUUsWUFBWSxDQUFDO1FBQ3ZCLElBQUksRUFBRSxTQUFTLENBQUM7UUFDaEIsUUFBUSxFQUFFLHdCQUF3QixDQUFDO1FBQ25DLGFBQWEsRUFBRSxNQUFNLENBQUM7S0FDdkIsQ0FBQyxDQTJERDtZQUVhLGlCQUFpQjtZQWVqQixZQUFZO1lBV1osMEJBQTBCO1lBOEMxQixnQkFBZ0I7WUFlaEIsVUFBVTtZQXVEVixrQkFBa0I7WUFhbEIsZ0JBQWdCO1lBK0JoQixPQUFPO1lBNEdQLHdCQUF3QjtZQTJCeEIsVUFBVTtZQW1EVixzQkFBc0I7WUEyQnRCLGdCQUFnQjtZQStCaEIsb0JBQW9CO0NBZW5DIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAoBzD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAMjD,qBAAa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAPlC,OAAO,CAAC,GAAG,CAAuB;IAElC,YACmB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,4BAAgB,EAC9C;IAEJ;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC;QAC5B,MAAM,EAAE,UAAU,CAAC;QACnB,qBAAqB,EAAE,YAAY,CAAC;QACpC,KAAK,EAAE,aAAa,GAAG,oBAAoB,CAAC;QAC5C,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,YAAY,CAAC;KACzB,CAAC,CAMD;IAEY,QAAQ,IAAI,OAAO,CAAC;QAC/B,MAAM,EAAE,UAAU,CAAC;QACnB,qBAAqB,EAAE,YAAY,CAAC;QACpC,GAAG,EAAE,WAAW,CAAC;QACjB,MAAM,EAAE,aAAa,CAAC;QACtB,MAAM,EAAE,aAAa,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC,CAsBD;YAMa,YAAY;YAWZ,0BAA0B;YA8C1B,gBAAgB;YAgBhB,UAAU;YAoDV,kBAAkB;YAalB,gBAAgB;YAsBhB,OAAO;YA6EP,wBAAwB;YA0BxB,UAAU;YA0CV,sBAAsB;YA4BtB,gBAAgB;YAgChB,oBAAoB;CAenC"}
1
+ {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAoBzD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAItE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,aAAa,CAAC;AAEtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAMjD,qBAAa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAPlC,OAAO,CAAC,GAAG,CAAuB;IAElC,YACmB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,4BAAgB,EAKjD;IAED;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC;QAC5B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,KAAK,EAAE,aAAa,GAAG,oBAAoB,CAAC;QAC5C,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,YAAY,CAAC;KACzB,CAAC,CAMD;IAEY,QAAQ,IAAI,OAAO,CAAC;QAC/B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,GAAG,EAAE,WAAW,CAAC;QACjB,MAAM,EAAE,aAAa,CAAC;QACtB,MAAM,EAAE,aAAa,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC,CAsBD;IAED;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC;QACtC,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,QAAQ,EAAE,YAAY,CAAC;QACvB,IAAI,EAAE,SAAS,CAAC;QAChB,QAAQ,EAAE,wBAAwB,CAAC;QACnC,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC,CA2DD;YAEa,iBAAiB;YAejB,YAAY;YAWZ,0BAA0B;YA8C1B,gBAAgB;YAehB,UAAU;YAuDV,kBAAkB;YAalB,gBAAgB;YA+BhB,OAAO;YA4GP,wBAAwB;YA2BxB,UAAU;YAmDV,sBAAsB;YA2BtB,gBAAgB;YA+BhB,oBAAoB;CAenC"}
package/dest/factory.js CHANGED
@@ -1,6 +1,5 @@
1
- import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
2
1
  import { getInitialTestAccountsData } from '@aztec/accounts/testing';
3
- import { AztecAddress } from '@aztec/aztec.js/addresses';
2
+ import { NO_FROM } from '@aztec/aztec.js/account';
4
3
  import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
5
4
  import { L1FeeJuicePortalManager } from '@aztec/aztec.js/ethereum';
6
5
  import { FeeJuicePaymentMethodWithClaim } from '@aztec/aztec.js/fee';
@@ -8,16 +7,21 @@ import { deriveKeys } from '@aztec/aztec.js/keys';
8
7
  import { createLogger } from '@aztec/aztec.js/log';
9
8
  import { waitForL1ToL2MessageReady } from '@aztec/aztec.js/messaging';
10
9
  import { waitForTx } from '@aztec/aztec.js/node';
10
+ import { ContractInitializationStatus } from '@aztec/aztec.js/wallet';
11
11
  import { createEthereumChain } from '@aztec/ethereum/chain';
12
12
  import { createExtendedL1Client } from '@aztec/ethereum/client';
13
+ import { RollupContract } from '@aztec/ethereum/contracts';
13
14
  import { Fr } from '@aztec/foundation/curves/bn254';
15
+ import { EthAddress } from '@aztec/foundation/eth-address';
14
16
  import { Timer } from '@aztec/foundation/timer';
15
17
  import { AMMContract } from '@aztec/noir-contracts.js/AMM';
16
18
  import { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
17
19
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
18
- import { GasSettings } from '@aztec/stdlib/gas';
20
+ import { TestContract } from '@aztec/noir-test-contracts.js/Test';
21
+ import { GasFees, GasSettings } from '@aztec/stdlib/gas';
19
22
  import { deriveSigningKey } from '@aztec/stdlib/keys';
20
23
  import { SupportedTokenContracts } from './config.js';
24
+ import { seedL1ToL2Message } from './l1_to_l2_seeding.js';
21
25
  import { getBalances, getPrivateBalance, isStandardTokenContract } from './utils.js';
22
26
  const MINT_BALANCE = 1e12;
23
27
  const MIN_BALANCE = 1e3;
@@ -35,13 +39,16 @@ export class BotFactory {
35
39
  this.aztecNode = aztecNode;
36
40
  this.aztecNodeAdmin = aztecNodeAdmin;
37
41
  this.log = createLogger('bot');
42
+ // Set fee padding on the wallet so that all transactions during setup
43
+ // (token deploy, minting, etc.) use the configured padding, not the default.
44
+ this.wallet.setMinFeePadding(config.minFeePadding);
38
45
  }
39
46
  /**
40
47
  * Initializes a new bot by setting up the sender account, registering the recipient,
41
48
  * deploying the token contract, and minting tokens if necessary.
42
49
  */ async setup() {
43
50
  const defaultAccountAddress = await this.setupAccount();
44
- const recipient = (await this.wallet.createAccount()).address;
51
+ const recipient = (await this.wallet.createSchnorrAccount(Fr.random(), Fr.random())).address;
45
52
  const token = await this.setupToken(defaultAccountAddress);
46
53
  await this.mintTokens(token, defaultAccountAddress);
47
54
  return {
@@ -70,6 +77,65 @@ export class BotFactory {
70
77
  };
71
78
  }
72
79
  /**
80
+ * Initializes the cross-chain bot by deploying TestContract, creating an L1 client,
81
+ * seeding initial L1→L2 messages, and waiting for the first to be ready.
82
+ */ async setupCrossChain() {
83
+ const defaultAccountAddress = await this.setupAccount();
84
+ // Create L1 client (same pattern as bridgeL1FeeJuice)
85
+ const l1RpcUrls = this.config.l1RpcUrls;
86
+ if (!l1RpcUrls?.length) {
87
+ throw new Error('L1 RPC URLs required for cross-chain bot');
88
+ }
89
+ const mnemonicOrPrivateKey = this.config.l1PrivateKey?.getValue() ?? this.config.l1Mnemonic?.getValue();
90
+ if (!mnemonicOrPrivateKey) {
91
+ throw new Error('L1 mnemonic or private key required for cross-chain bot');
92
+ }
93
+ const { l1ChainId, l1ContractAddresses } = await this.aztecNode.getNodeInfo();
94
+ const chain = createEthereumChain(l1RpcUrls, l1ChainId);
95
+ const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
96
+ // Fetch Rollup version (needed for Inbox L2Actor struct)
97
+ const rollupContract = new RollupContract(l1Client, l1ContractAddresses.rollupAddress.toString());
98
+ const rollupVersion = await rollupContract.getVersion();
99
+ // Deploy TestContract
100
+ const contract = await this.setupTestContract(defaultAccountAddress);
101
+ // Recover any pending messages from store (clean up stale ones first)
102
+ await this.store.cleanupOldPendingMessages();
103
+ const pendingMessages = await this.store.getUnconsumedL1ToL2Messages();
104
+ // Seed initial L1→L2 messages if pipeline is empty
105
+ const seedCount = Math.max(0, this.config.l1ToL2SeedCount - pendingMessages.length);
106
+ for(let i = 0; i < seedCount; i++){
107
+ await seedL1ToL2Message(l1Client, EthAddress.fromString(l1ContractAddresses.inboxAddress.toString()), contract.address, rollupVersion, this.store, this.log);
108
+ }
109
+ // Block until at least one message is ready
110
+ const allMessages = await this.store.getUnconsumedL1ToL2Messages();
111
+ if (allMessages.length > 0) {
112
+ this.log.info(`Waiting for first L1→L2 message to be ready...`);
113
+ const firstMsg = allMessages[0];
114
+ await waitForL1ToL2MessageReady(this.aztecNode, Fr.fromHexString(firstMsg.msgHash), {
115
+ timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds
116
+ });
117
+ this.log.info(`First L1→L2 message is ready`);
118
+ }
119
+ return {
120
+ wallet: this.wallet,
121
+ defaultAccountAddress,
122
+ contract,
123
+ node: this.aztecNode,
124
+ l1Client,
125
+ rollupVersion
126
+ };
127
+ }
128
+ async setupTestContract(deployer) {
129
+ const deployOpts = {
130
+ from: deployer,
131
+ contractAddressSalt: this.config.tokenSalt,
132
+ universalDeploy: true
133
+ };
134
+ const deploy = TestContract.deploy(this.wallet);
135
+ const instance = await this.registerOrDeployContract('TestContract', deploy, deployOpts);
136
+ return TestContract.at(instance.address, this.wallet);
137
+ }
138
+ /**
73
139
  * Checks if the sender account contract is initialized, and initializes it if necessary.
74
140
  * @returns The sender wallet.
75
141
  */ async setupAccount() {
@@ -85,14 +151,9 @@ export class BotFactory {
85
151
  async setupAccountWithPrivateKey(secret) {
86
152
  const salt = this.config.senderSalt ?? Fr.ONE;
87
153
  const signingKey = deriveSigningKey(secret);
88
- const accountData = {
89
- secret,
90
- salt,
91
- contract: new SchnorrAccountContract(signingKey)
92
- };
93
- const accountManager = await this.wallet.createAccount(accountData);
154
+ const accountManager = await this.wallet.createSchnorrAccount(secret, salt, signingKey);
94
155
  const metadata = await this.wallet.getContractMetadata(accountManager.address);
95
- if (metadata.isContractInitialized) {
156
+ if (metadata.initializationStatus === ContractInitializationStatus.INITIALIZED) {
96
157
  this.log.info(`Account at ${accountManager.address.toString()} already initialized`);
97
158
  const timer = new Timer();
98
159
  const address = accountManager.address;
@@ -106,19 +167,30 @@ export class BotFactory {
106
167
  const paymentMethod = new FeeJuicePaymentMethodWithClaim(accountManager.address, claim);
107
168
  const deployMethod = await accountManager.getDeployMethod();
108
169
  const maxFeesPerGas = (await this.aztecNode.getCurrentMinFees()).mul(1 + this.config.minFeePadding);
109
- const gasSettings = GasSettings.default({
110
- maxFeesPerGas
170
+ const { estimatedGas } = await deployMethod.simulate({
171
+ from: NO_FROM,
172
+ fee: {
173
+ estimateGas: true,
174
+ paymentMethod
175
+ }
176
+ });
177
+ const gasSettings = GasSettings.from({
178
+ ...estimatedGas,
179
+ maxFeesPerGas,
180
+ maxPriorityFeesPerGas: GasFees.empty()
111
181
  });
112
182
  await this.withNoMinTxsPerBlock(async ()=>{
113
- const txHash = await deployMethod.send({
114
- from: AztecAddress.ZERO,
183
+ const { txHash } = await deployMethod.send({
184
+ from: NO_FROM,
115
185
  fee: {
116
186
  gasSettings,
117
187
  paymentMethod
118
188
  },
119
189
  wait: NO_WAIT
120
190
  });
121
- this.log.info(`Sent tx for account deployment with hash ${txHash.toString()}`);
191
+ this.log.info(`Sent tx for account deployment with hash ${txHash.toString()}`, {
192
+ gasSettings
193
+ });
122
194
  return waitForTx(this.aztecNode, txHash, {
123
195
  timeout: this.config.txMinedWaitSeconds
124
196
  });
@@ -131,12 +203,7 @@ export class BotFactory {
131
203
  }
132
204
  async setupTestAccount() {
133
205
  const [initialAccountData] = await getInitialTestAccountsData();
134
- const accountData = {
135
- secret: initialAccountData.secret,
136
- salt: initialAccountData.salt,
137
- contract: new SchnorrAccountContract(initialAccountData.signingKey)
138
- };
139
- const accountManager = await this.wallet.createAccount(accountData);
206
+ const accountManager = await this.wallet.createSchnorrAccount(initialAccountData.secret, initialAccountData.salt, initialAccountData.signingKey);
140
207
  return accountManager.address;
141
208
  }
142
209
  /**
@@ -168,6 +235,10 @@ export class BotFactory {
168
235
  tokenInstance = await deploy.getInstance(deployOpts);
169
236
  token = PrivateTokenContract.at(tokenInstance.address, this.wallet);
170
237
  await this.wallet.registerContract(tokenInstance, PrivateTokenContract.artifact, tokenSecretKey);
238
+ // The contract constructor initializes private storage vars that need the contract's own nullifier key.
239
+ deployOpts.additionalScopes = [
240
+ tokenInstance.address
241
+ ];
171
242
  } else {
172
243
  throw new Error(`Unsupported token contract type: ${this.config.contract}`);
173
244
  }
@@ -178,11 +249,22 @@ export class BotFactory {
178
249
  await deploy.register();
179
250
  } else {
180
251
  this.log.info(`Deploying token contract at ${address.toString()}`);
181
- const txHash = await deploy.send({
252
+ const { estimatedGas } = await deploy.simulate({
253
+ ...deployOpts,
254
+ fee: {
255
+ estimateGas: true
256
+ }
257
+ });
258
+ const { txHash } = await deploy.send({
182
259
  ...deployOpts,
260
+ fee: {
261
+ gasSettings: estimatedGas
262
+ },
183
263
  wait: NO_WAIT
184
264
  });
185
- this.log.info(`Sent tx for token setup with hash ${txHash.toString()}`);
265
+ this.log.info(`Sent tx for token setup with hash ${txHash.toString()}`, {
266
+ estimatedGas
267
+ });
186
268
  await this.withNoMinTxsPerBlock(async ()=>{
187
269
  await waitForTx(this.aztecNode, txHash, {
188
270
  timeout: this.config.txMinedWaitSeconds
@@ -216,13 +298,25 @@ export class BotFactory {
216
298
  const instance = await this.registerOrDeployContract('AMM', deploy, deployOpts);
217
299
  const amm = AMMContract.at(instance.address, this.wallet);
218
300
  this.log.info(`AMM deployed at ${amm.address}`);
219
- const minterReceipt = await lpToken.methods.set_minter(amm.address, true).send({
301
+ const setMinterInteraction = lpToken.methods.set_minter(amm.address, true);
302
+ const { estimatedGas: setMinterGas } = await setMinterInteraction.simulate({
220
303
  from: deployer,
304
+ fee: {
305
+ estimateGas: true
306
+ }
307
+ });
308
+ const { receipt: minterReceipt } = await setMinterInteraction.send({
309
+ from: deployer,
310
+ fee: {
311
+ gasSettings: setMinterGas
312
+ },
221
313
  wait: {
222
314
  timeout: this.config.txMinedWaitSeconds
223
315
  }
224
316
  });
225
- this.log.info(`Set LP token minter to AMM txHash=${minterReceipt.txHash.toString()}`);
317
+ this.log.info(`Set LP token minter to AMM txHash=${minterReceipt.txHash.toString()}`, {
318
+ estimatedGas: setMinterGas
319
+ });
226
320
  this.log.info(`Liquidity token initialized`);
227
321
  return amm;
228
322
  }
@@ -230,13 +324,13 @@ export class BotFactory {
230
324
  const getPrivateBalances = ()=>Promise.all([
231
325
  token0.methods.balance_of_private(liquidityProvider).simulate({
232
326
  from: liquidityProvider
233
- }),
327
+ }).then((r)=>r.result),
234
328
  token1.methods.balance_of_private(liquidityProvider).simulate({
235
329
  from: liquidityProvider
236
- }),
330
+ }).then((r)=>r.result),
237
331
  lpToken.methods.balance_of_private(liquidityProvider).simulate({
238
332
  from: liquidityProvider
239
- })
333
+ }).then((r)=>r.result)
240
334
  ]);
241
335
  const authwitNonce = Fr.random();
242
336
  // keep some tokens for swapping
@@ -255,18 +349,44 @@ export class BotFactory {
255
349
  caller: amm.address,
256
350
  call: await token1.methods.transfer_to_public_and_prepare_private_balance_increase(liquidityProvider, amm.address, amount1Max, authwitNonce).getFunctionCall()
257
351
  });
258
- const mintReceipt = await new BatchCall(this.wallet, [
352
+ const mintBatch = new BatchCall(this.wallet, [
259
353
  token0.methods.mint_to_private(liquidityProvider, MINT_BALANCE),
260
354
  token1.methods.mint_to_private(liquidityProvider, MINT_BALANCE)
261
- ]).send({
355
+ ]);
356
+ const { estimatedGas: mintGas } = await mintBatch.simulate({
357
+ from: liquidityProvider,
358
+ fee: {
359
+ estimateGas: true
360
+ }
361
+ });
362
+ const { receipt: mintReceipt } = await mintBatch.send({
262
363
  from: liquidityProvider,
364
+ fee: {
365
+ gasSettings: mintGas
366
+ },
263
367
  wait: {
264
368
  timeout: this.config.txMinedWaitSeconds
265
369
  }
266
370
  });
267
- this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`);
268
- const addLiquidityReceipt = await amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce).send({
371
+ this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`, {
372
+ estimatedGas: mintGas
373
+ });
374
+ const addLiquidityInteraction = amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce);
375
+ const { estimatedGas: addLiquidityGas } = await addLiquidityInteraction.simulate({
269
376
  from: liquidityProvider,
377
+ fee: {
378
+ estimateGas: true
379
+ },
380
+ authWitnesses: [
381
+ token0Authwit,
382
+ token1Authwit
383
+ ]
384
+ });
385
+ const { receipt: addLiquidityReceipt } = await addLiquidityInteraction.send({
386
+ from: liquidityProvider,
387
+ fee: {
388
+ gasSettings: addLiquidityGas
389
+ },
270
390
  authWitnesses: [
271
391
  token0Authwit,
272
392
  token1Authwit
@@ -275,7 +395,9 @@ export class BotFactory {
275
395
  timeout: this.config.txMinedWaitSeconds
276
396
  }
277
397
  });
278
- this.log.info(`Sent tx to add liquidity to the AMM: ${addLiquidityReceipt.txHash.toString()}`);
398
+ this.log.info(`Sent tx to add liquidity to the AMM: ${addLiquidityReceipt.txHash.toString()}`, {
399
+ estimatedGas: addLiquidityGas
400
+ });
279
401
  this.log.info(`Liquidity added`);
280
402
  const [newT0Bal, newT1Bal, newLPBal] = await getPrivateBalances();
281
403
  this.log.info(`Updated private balances of ${defaultAccountAddress} after minting and funding AMM: token0=${newT0Bal}, token1=${newT1Bal}, lp=${newLPBal}`);
@@ -288,10 +410,21 @@ export class BotFactory {
288
410
  this.log.info(`Contract ${name} at ${address.toString()} already deployed`);
289
411
  await deploy.register();
290
412
  } else {
291
- this.log.info(`Deploying contract ${name} at ${address.toString()}`);
413
+ const { estimatedGas } = await deploy.simulate({
414
+ ...deployOpts,
415
+ fee: {
416
+ estimateGas: true
417
+ }
418
+ });
419
+ this.log.info(`Deploying contract ${name} at ${address.toString()}`, {
420
+ estimatedGas
421
+ });
292
422
  await this.withNoMinTxsPerBlock(async ()=>{
293
- const txHash = await deploy.send({
423
+ const { txHash } = await deploy.send({
294
424
  ...deployOpts,
425
+ fee: {
426
+ gasSettings: estimatedGas
427
+ },
295
428
  wait: NO_WAIT
296
429
  });
297
430
  this.log.info(`Sent contract ${name} setup tx with hash ${txHash.toString()}`);
@@ -327,12 +460,30 @@ export class BotFactory {
327
460
  this.log.info(`Skipping minting as ${minter.toString()} has enough tokens`);
328
461
  return;
329
462
  }
463
+ // PrivateToken's mint accesses contract-level private storage vars (admin, total_supply).
464
+ const additionalScopes = isStandardToken ? undefined : [
465
+ token.address
466
+ ];
467
+ const mintBatch = new BatchCall(token.wallet, calls);
468
+ const { estimatedGas } = await mintBatch.simulate({
469
+ from: minter,
470
+ fee: {
471
+ estimateGas: true
472
+ },
473
+ additionalScopes
474
+ });
330
475
  await this.withNoMinTxsPerBlock(async ()=>{
331
- const txHash = await new BatchCall(token.wallet, calls).send({
476
+ const { txHash } = await mintBatch.send({
332
477
  from: minter,
478
+ additionalScopes,
479
+ fee: {
480
+ gasSettings: estimatedGas
481
+ },
333
482
  wait: NO_WAIT
334
483
  });
335
- this.log.info(`Sent token mint tx with hash ${txHash.toString()}`);
484
+ this.log.info(`Sent token mint tx with hash ${txHash.toString()}`, {
485
+ estimatedGas
486
+ });
336
487
  return waitForTx(this.aztecNode, txHash, {
337
488
  timeout: this.config.txMinedWaitSeconds
338
489
  });
@@ -351,8 +502,7 @@ export class BotFactory {
351
502
  try {
352
503
  const messageHash = Fr.fromHexString(existingClaim.claim.messageHash);
353
504
  await this.withNoMinTxsPerBlock(()=>waitForL1ToL2MessageReady(this.aztecNode, messageHash, {
354
- timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
355
- forPublicConsumption: false
505
+ timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds
356
506
  }));
357
507
  return existingClaim.claim;
358
508
  } catch (err) {
@@ -380,8 +530,7 @@ export class BotFactory {
380
530
  const mintAmount = await portal.getTokenManager().getMintAmount();
381
531
  const claim = await portal.bridgeTokensPublic(recipient, mintAmount, true);
382
532
  await this.withNoMinTxsPerBlock(()=>waitForL1ToL2MessageReady(this.aztecNode, Fr.fromHexString(claim.messageHash), {
383
- timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
384
- forPublicConsumption: false
533
+ timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds
385
534
  }));
386
535
  this.log.info(`Created a claim for ${mintAmount} L1 fee juice to ${recipient}.`, claim);
387
536
  return claim;
package/dest/index.d.ts CHANGED
@@ -1,8 +1,9 @@
1
1
  export { Bot } from './bot.js';
2
2
  export { AmmBot } from './amm_bot.js';
3
+ export { CrossChainBot } from './cross_chain_bot.js';
3
4
  export { BotRunner } from './runner.js';
4
5
  export { BotStore } from './store/bot_store.js';
5
6
  export { type BotConfig, getBotConfigFromEnv, getBotDefaultConfig, botConfigMappings, SupportedTokenContracts, } from './config.js';
6
7
  export { getBotRunnerApiHandler } from './rpc.js';
7
8
  export * from './interface.js';
8
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQy9CLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDdEMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN4QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDaEQsT0FBTyxFQUNMLEtBQUssU0FBUyxFQUNkLG1CQUFtQixFQUNuQixtQkFBbUIsRUFDbkIsaUJBQWlCLEVBQ2pCLHVCQUF1QixHQUN4QixNQUFNLGFBQWEsQ0FBQztBQUNyQixPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFDbEQsY0FBYyxnQkFBZ0IsQ0FBQyJ9
9
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQy9CLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDdEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDeEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2hELE9BQU8sRUFDTCxLQUFLLFNBQVMsRUFDZCxtQkFBbUIsRUFDbkIsbUJBQW1CLEVBQ25CLGlCQUFpQixFQUNqQix1QkFBdUIsR0FDeEIsTUFBTSxhQUFhLENBQUM7QUFDckIsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ2xELGNBQWMsZ0JBQWdCLENBQUMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EACL,KAAK,SAAS,EACd,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAClD,cAAc,gBAAgB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EACL,KAAK,SAAS,EACd,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAClD,cAAc,gBAAgB,CAAC"}
package/dest/index.js CHANGED
@@ -1,5 +1,6 @@
1
1
  export { Bot } from './bot.js';
2
2
  export { AmmBot } from './amm_bot.js';
3
+ export { CrossChainBot } from './cross_chain_bot.js';
3
4
  export { BotRunner } from './runner.js';
4
5
  export { BotStore } from './store/bot_store.js';
5
6
  export { getBotConfigFromEnv, getBotDefaultConfig, botConfigMappings, SupportedTokenContracts } from './config.js';
@@ -0,0 +1,8 @@
1
+ import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
2
+ import { EthAddress } from '@aztec/foundation/eth-address';
3
+ import type { Logger } from '@aztec/foundation/log';
4
+ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
5
+ import type { BotStore, PendingL1ToL2Message } from './store/index.js';
6
+ /** Sends an L1→L2 message via the Inbox contract and stores it. */
7
+ export declare function seedL1ToL2Message(l1Client: ExtendedViemWalletClient, inboxAddress: EthAddress, l2Recipient: AztecAddress, rollupVersion: bigint, store: BotStore, log: Logger): Promise<PendingL1ToL2Message>;
8
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfc2VlZGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2wxX3RvX2wyX3NlZWRpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUd0RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFJaEUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLG9CQUFvQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFdkUscUVBQW1FO0FBQ25FLHdCQUFzQixpQkFBaUIsQ0FDckMsUUFBUSxFQUFFLHdCQUF3QixFQUNsQyxZQUFZLEVBQUUsVUFBVSxFQUN4QixXQUFXLEVBQUUsWUFBWSxFQUN6QixhQUFhLEVBQUUsTUFBTSxFQUNyQixLQUFLLEVBQUUsUUFBUSxFQUNmLEdBQUcsRUFBRSxNQUFNLEdBQ1YsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBeUQvQiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"l1_to_l2_seeding.d.ts","sourceRoot":"","sources":["../src/l1_to_l2_seeding.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAGtE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAIhE,OAAO,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,qEAAmE;AACnE,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,wBAAwB,EAClC,YAAY,EAAE,UAAU,EACxB,WAAW,EAAE,YAAY,EACzB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,QAAQ,EACf,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,oBAAoB,CAAC,CAyD/B"}