@aztec/bot 0.0.1-commit.fce3e4f → 0.0.1-commit.ff7989d6c

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 (44) hide show
  1. package/dest/amm_bot.d.ts +6 -7
  2. package/dest/amm_bot.d.ts.map +1 -1
  3. package/dest/amm_bot.js +5 -1
  4. package/dest/base_bot.d.ts +6 -6
  5. package/dest/base_bot.d.ts.map +1 -1
  6. package/dest/base_bot.js +14 -15
  7. package/dest/bot.d.ts +6 -6
  8. package/dest/bot.d.ts.map +1 -1
  9. package/dest/bot.js +7 -4
  10. package/dest/config.d.ts +40 -25
  11. package/dest/config.d.ts.map +1 -1
  12. package/dest/config.js +43 -15
  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 +140 -0
  16. package/dest/factory.d.ts +20 -10
  17. package/dest/factory.d.ts.map +1 -1
  18. package/dest/factory.js +175 -75
  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 +429 -31
  28. package/dest/store/bot_store.d.ts +31 -6
  29. package/dest/store/bot_store.d.ts.map +1 -1
  30. package/dest/store/bot_store.js +38 -7
  31. package/dest/store/index.d.ts +2 -2
  32. package/dest/store/index.d.ts.map +1 -1
  33. package/package.json +19 -16
  34. package/src/amm_bot.ts +7 -7
  35. package/src/base_bot.ts +13 -27
  36. package/src/bot.ts +9 -8
  37. package/src/config.ts +90 -59
  38. package/src/cross_chain_bot.ts +209 -0
  39. package/src/factory.ts +185 -60
  40. package/src/index.ts +1 -0
  41. package/src/l1_to_l2_seeding.ts +79 -0
  42. package/src/runner.ts +18 -5
  43. package/src/store/bot_store.ts +61 -6
  44. package/src/store/index.ts +1 -1
@@ -0,0 +1,140 @@
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
+ return batch.send({
88
+ ...opts,
89
+ wait: NO_WAIT
90
+ });
91
+ }
92
+ async onTxMined(receipt, logCtx) {
93
+ // Verify L2→L1 messages appeared in this tx's effects
94
+ const indexed = await this.node.getTxEffect(receipt.txHash);
95
+ if (indexed) {
96
+ const l2ToL1Msgs = indexed.data.l2ToL1Msgs.filter((m)=>!m.isZero());
97
+ if (l2ToL1Msgs.length >= this.config.l2ToL1MessagesPerTx) {
98
+ this.l2ToL1Sent += l2ToL1Msgs.length;
99
+ } else {
100
+ this.log.error(`Expected ${this.config.l2ToL1MessagesPerTx} L2→L1 messages but found ${l2ToL1Msgs.length}`, {
101
+ ...logCtx,
102
+ blockNumber: receipt.blockNumber,
103
+ txHash: receipt.txHash.toString()
104
+ });
105
+ }
106
+ }
107
+ const pendingCount = (await this.store.getUnconsumedL1ToL2Messages()).length;
108
+ this.log.info(`CrossChainBot txs mined`, {
109
+ ...logCtx,
110
+ l2ToL1Sent: this.l2ToL1Sent,
111
+ l1ToL2Consumed: this.l1ToL2Consumed,
112
+ l1ToL2Pending: pendingCount
113
+ });
114
+ }
115
+ /** Finds the oldest pending message that is ready for consumption. */ async getReadyL1ToL2Message(pendingMessages) {
116
+ const now = Date.now();
117
+ for (const msg of pendingMessages){
118
+ const ready = await isL1ToL2MessageReady(this.node, Fr.fromHexString(msg.msgHash), {
119
+ // Use forPublicConsumption: false so we wait until blockNumber >= messageBlockNumber.
120
+ // With forPublicConsumption: true, the check returns true one block early (the sequencer
121
+ // includes L1→L2 messages before executing the block's txs), but gas estimation simulates
122
+ // against the current world state which doesn't yet have the message.
123
+ // See https://linear.app/aztec-labs/issue/A-548 for details.
124
+ forPublicConsumption: false
125
+ });
126
+ if (ready) {
127
+ return msg;
128
+ }
129
+ // Time-based stale detection: if the message is old and still not ready, remove it
130
+ if (now - msg.timestamp > STALE_MESSAGE_THRESHOLD_MS) {
131
+ await this.store.deleteL1ToL2Message(msg.msgHash);
132
+ this.log.warn(`Removed stale L1→L2 message ${msg.msgHash}`);
133
+ }
134
+ }
135
+ return undefined;
136
+ }
137
+ /** Seeds a new L1→L2 message on L1 and stores it. */ async seedNewL1ToL2Message() {
138
+ await seedL1ToL2Message(this.l1Client, this.inboxAddress, this.contract.address, this.rollupVersion, this.store, this.log);
139
+ }
140
+ }
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,35 +15,43 @@ 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;
39
54
  private setupToken;
40
- /**
41
- * Checks if the token contract is deployed and deploys it if necessary.
42
- * @param wallet - Wallet to deploy the token contract from.
43
- * @returns The TokenContract instance.
44
- */
45
55
  private setupTokenContract;
46
56
  private setupAmmContract;
47
57
  private fundAmm;
@@ -51,4 +61,4 @@ export declare class BotFactory {
51
61
  private bridgeL1FeeJuice;
52
62
  private withNoMinTxsPerBlock;
53
63
  }
54
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBZ0J6RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDM0QsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDN0UsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFdkQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUEyQixNQUFNLGFBQWEsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU1qRCxxQkFBYSxVQUFVO0lBSW5CLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQztJQVBsQyxPQUFPLENBQUMsR0FBRyxDQUF1QjtJQUVsQyxZQUNtQixNQUFNLEVBQUUsU0FBUyxFQUNqQixNQUFNLEVBQUUsVUFBVSxFQUNsQixLQUFLLEVBQUUsUUFBUSxFQUNmLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGNBQWMsQ0FBQyw0QkFBZ0IsRUFDOUM7SUFFSjs7O09BR0c7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDO1FBQzVCLE1BQU0sRUFBRSxVQUFVLENBQUM7UUFDbkIscUJBQXFCLEVBQUUsWUFBWSxDQUFDO1FBQ3BDLEtBQUssRUFBRSxhQUFhLEdBQUcsb0JBQW9CLENBQUM7UUFDNUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUNoQixTQUFTLEVBQUUsWUFBWSxDQUFDO0tBQ3pCLENBQUMsQ0FNRDtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUM7UUFDL0IsTUFBTSxFQUFFLFVBQVUsQ0FBQztRQUNuQixxQkFBcUIsRUFBRSxZQUFZLENBQUM7UUFDcEMsR0FBRyxFQUFFLFdBQVcsQ0FBQztRQUNqQixNQUFNLEVBQUUsYUFBYSxDQUFDO1FBQ3RCLE1BQU0sRUFBRSxhQUFhLENBQUM7UUFDdEIsSUFBSSxFQUFFLFNBQVMsQ0FBQztLQUNqQixDQUFDLENBc0JEO1lBTWEsWUFBWTtZQVdaLDBCQUEwQjtZQXdDMUIsZ0JBQWdCO1lBZ0JoQixVQUFVO0lBK0J4Qjs7OztPQUlHO0lBQ0gsT0FBTyxDQUFDLGtCQUFrQjtZQVlaLGdCQUFnQjtZQW9CaEIsT0FBTztZQThFUCx3QkFBd0I7WUFzQnhCLFVBQVU7WUF3Q1Ysc0JBQXNCO1lBNEJ0QixnQkFBZ0I7WUFnQ2hCLG9CQUFvQjtDQWVuQyJ9
64
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBbUJ6RCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSXRFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBR2xFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUEyQixNQUFNLGFBQWEsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU1qRCxxQkFBYSxVQUFVO0lBSW5CLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQztJQVBsQyxPQUFPLENBQUMsR0FBRyxDQUF1QjtJQUVsQyxZQUNtQixNQUFNLEVBQUUsU0FBUyxFQUNqQixNQUFNLEVBQUUsY0FBYyxFQUN0QixLQUFLLEVBQUUsUUFBUSxFQUNmLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGNBQWMsQ0FBQyw0QkFBZ0IsRUFDOUM7SUFFSjs7O09BR0c7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDO1FBQzVCLE1BQU0sRUFBRSxjQUFjLENBQUM7UUFDdkIscUJBQXFCLEVBQUUsWUFBWSxDQUFDO1FBQ3BDLEtBQUssRUFBRSxhQUFhLEdBQUcsb0JBQW9CLENBQUM7UUFDNUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUNoQixTQUFTLEVBQUUsWUFBWSxDQUFDO0tBQ3pCLENBQUMsQ0FNRDtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUM7UUFDL0IsTUFBTSxFQUFFLGNBQWMsQ0FBQztRQUN2QixxQkFBcUIsRUFBRSxZQUFZLENBQUM7UUFDcEMsR0FBRyxFQUFFLFdBQVcsQ0FBQztRQUNqQixNQUFNLEVBQUUsYUFBYSxDQUFDO1FBQ3RCLE1BQU0sRUFBRSxhQUFhLENBQUM7UUFDdEIsSUFBSSxFQUFFLFNBQVMsQ0FBQztLQUNqQixDQUFDLENBc0JEO0lBRUQ7OztPQUdHO0lBQ1UsZUFBZSxJQUFJLE9BQU8sQ0FBQztRQUN0QyxNQUFNLEVBQUUsY0FBYyxDQUFDO1FBQ3ZCLHFCQUFxQixFQUFFLFlBQVksQ0FBQztRQUNwQyxRQUFRLEVBQUUsWUFBWSxDQUFDO1FBQ3ZCLElBQUksRUFBRSxTQUFTLENBQUM7UUFDaEIsUUFBUSxFQUFFLHdCQUF3QixDQUFDO1FBQ25DLGFBQWEsRUFBRSxNQUFNLENBQUM7S0FDdkIsQ0FBQyxDQWdFRDtZQUVhLGlCQUFpQjtZQWVqQixZQUFZO1lBV1osMEJBQTBCO1lBeUMxQixnQkFBZ0I7WUFlaEIsVUFBVTtZQXNEVixrQkFBa0I7WUFhbEIsZ0JBQWdCO1lBc0JoQixPQUFPO1lBNkVQLHdCQUF3QjtZQTBCeEIsVUFBVTtZQTRDVixzQkFBc0I7WUE0QnRCLGdCQUFnQjtZQWdDaEIsb0JBQW9CO0NBZW5DIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAgBzD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/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;YAwC1B,gBAAgB;YAgBhB,UAAU;IA+BxB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;YAYZ,gBAAgB;YAoBhB,OAAO;YA8EP,wBAAwB;YAsBxB,UAAU;YAwCV,sBAAsB;YA4BtB,gBAAgB;YAgChB,oBAAoB;CAenC"}
1
+ {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAmBzD,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,EAC9C;IAEJ;;;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,CAgED;YAEa,iBAAiB;YAejB,YAAY;YAWZ,0BAA0B;YAyC1B,gBAAgB;YAehB,UAAU;YAsDV,kBAAkB;YAalB,gBAAgB;YAsBhB,OAAO;YA6EP,wBAAwB;YA0BxB,UAAU;YA4CV,sBAAsB;YA4BtB,gBAAgB;YAgChB,oBAAoB;CAenC"}
package/dest/factory.js CHANGED
@@ -1,20 +1,26 @@
1
- import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
2
1
  import { getInitialTestAccountsData } from '@aztec/accounts/testing';
3
2
  import { AztecAddress } from '@aztec/aztec.js/addresses';
4
- import { BatchCall } from '@aztec/aztec.js/contracts';
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';
6
+ import { deriveKeys } from '@aztec/aztec.js/keys';
7
7
  import { createLogger } from '@aztec/aztec.js/log';
8
8
  import { waitForL1ToL2MessageReady } from '@aztec/aztec.js/messaging';
9
- import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
10
- import { Fr } from '@aztec/foundation/fields';
9
+ import { waitForTx } from '@aztec/aztec.js/node';
10
+ import { createEthereumChain } from '@aztec/ethereum/chain';
11
+ import { createExtendedL1Client } from '@aztec/ethereum/client';
12
+ import { RollupContract } from '@aztec/ethereum/contracts';
13
+ import { Fr } from '@aztec/foundation/curves/bn254';
14
+ import { EthAddress } from '@aztec/foundation/eth-address';
11
15
  import { Timer } from '@aztec/foundation/timer';
12
16
  import { AMMContract } from '@aztec/noir-contracts.js/AMM';
13
17
  import { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
14
18
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
19
+ import { TestContract } from '@aztec/noir-test-contracts.js/Test';
15
20
  import { GasSettings } from '@aztec/stdlib/gas';
16
21
  import { deriveSigningKey } from '@aztec/stdlib/keys';
17
22
  import { SupportedTokenContracts } from './config.js';
23
+ import { seedL1ToL2Message } from './l1_to_l2_seeding.js';
18
24
  import { getBalances, getPrivateBalance, isStandardTokenContract } from './utils.js';
19
25
  const MINT_BALANCE = 1e12;
20
26
  const MIN_BALANCE = 1e3;
@@ -37,8 +43,8 @@ export class BotFactory {
37
43
  * Initializes a new bot by setting up the sender account, registering the recipient,
38
44
  * deploying the token contract, and minting tokens if necessary.
39
45
  */ async setup() {
40
- const recipient = (await this.wallet.createAccount()).address;
41
46
  const defaultAccountAddress = await this.setupAccount();
47
+ const recipient = (await this.wallet.createSchnorrAccount(Fr.random(), Fr.random())).address;
42
48
  const token = await this.setupToken(defaultAccountAddress);
43
49
  await this.mintTokens(token, defaultAccountAddress);
44
50
  return {
@@ -67,6 +73,70 @@ export class BotFactory {
67
73
  };
68
74
  }
69
75
  /**
76
+ * Initializes the cross-chain bot by deploying TestContract, creating an L1 client,
77
+ * seeding initial L1→L2 messages, and waiting for the first to be ready.
78
+ */ async setupCrossChain() {
79
+ const defaultAccountAddress = await this.setupAccount();
80
+ // Create L1 client (same pattern as bridgeL1FeeJuice)
81
+ const l1RpcUrls = this.config.l1RpcUrls;
82
+ if (!l1RpcUrls?.length) {
83
+ throw new Error('L1 RPC URLs required for cross-chain bot');
84
+ }
85
+ const mnemonicOrPrivateKey = this.config.l1PrivateKey?.getValue() ?? this.config.l1Mnemonic?.getValue();
86
+ if (!mnemonicOrPrivateKey) {
87
+ throw new Error('L1 mnemonic or private key required for cross-chain bot');
88
+ }
89
+ const { l1ChainId, l1ContractAddresses } = await this.aztecNode.getNodeInfo();
90
+ const chain = createEthereumChain(l1RpcUrls, l1ChainId);
91
+ const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
92
+ // Fetch Rollup version (needed for Inbox L2Actor struct)
93
+ const rollupContract = new RollupContract(l1Client, l1ContractAddresses.rollupAddress.toString());
94
+ const rollupVersion = await rollupContract.getVersion();
95
+ // Deploy TestContract
96
+ const contract = await this.setupTestContract(defaultAccountAddress);
97
+ // Recover any pending messages from store (clean up stale ones first)
98
+ await this.store.cleanupOldPendingMessages();
99
+ const pendingMessages = await this.store.getUnconsumedL1ToL2Messages();
100
+ // Seed initial L1→L2 messages if pipeline is empty
101
+ const seedCount = Math.max(0, this.config.l1ToL2SeedCount - pendingMessages.length);
102
+ for(let i = 0; i < seedCount; i++){
103
+ await seedL1ToL2Message(l1Client, EthAddress.fromString(l1ContractAddresses.inboxAddress.toString()), contract.address, rollupVersion, this.store, this.log);
104
+ }
105
+ // Block until at least one message is ready
106
+ const allMessages = await this.store.getUnconsumedL1ToL2Messages();
107
+ if (allMessages.length > 0) {
108
+ this.log.info(`Waiting for first L1→L2 message to be ready...`);
109
+ const firstMsg = allMessages[0];
110
+ await waitForL1ToL2MessageReady(this.aztecNode, Fr.fromHexString(firstMsg.msgHash), {
111
+ timeoutSeconds: this.config.l1ToL2MessageTimeoutSeconds,
112
+ // Use forPublicConsumption: false so we wait until the message is in the current world
113
+ // state. With true, it returns one block early which causes gas estimation simulation to
114
+ // fail since it runs against the current state.
115
+ // See https://linear.app/aztec-labs/issue/A-548 for details.
116
+ forPublicConsumption: false
117
+ });
118
+ this.log.info(`First L1→L2 message is ready`);
119
+ }
120
+ return {
121
+ wallet: this.wallet,
122
+ defaultAccountAddress,
123
+ contract,
124
+ node: this.aztecNode,
125
+ l1Client,
126
+ rollupVersion
127
+ };
128
+ }
129
+ async setupTestContract(deployer) {
130
+ const deployOpts = {
131
+ from: deployer,
132
+ contractAddressSalt: this.config.tokenSalt,
133
+ universalDeploy: true
134
+ };
135
+ const deploy = TestContract.deploy(this.wallet);
136
+ const instance = await this.registerOrDeployContract('TestContract', deploy, deployOpts);
137
+ return TestContract.at(instance.address, this.wallet);
138
+ }
139
+ /**
70
140
  * Checks if the sender account contract is initialized, and initializes it if necessary.
71
141
  * @returns The sender wallet.
72
142
  */ async setupAccount() {
@@ -82,14 +152,9 @@ export class BotFactory {
82
152
  async setupAccountWithPrivateKey(secret) {
83
153
  const salt = this.config.senderSalt ?? Fr.ONE;
84
154
  const signingKey = deriveSigningKey(secret);
85
- const accountData = {
86
- secret,
87
- salt,
88
- contract: new SchnorrAccountContract(signingKey)
89
- };
90
- const accountManager = await this.wallet.createAccount(accountData);
91
- const isInit = (await this.wallet.getContractMetadata(accountManager.address)).isContractInitialized;
92
- if (isInit) {
155
+ const accountManager = await this.wallet.createSchnorrAccount(secret, salt, signingKey);
156
+ const metadata = await this.wallet.getContractMetadata(accountManager.address);
157
+ if (metadata.isContractInitialized) {
93
158
  this.log.info(`Account at ${accountManager.address.toString()} already initialized`);
94
159
  const timer = new Timer();
95
160
  const address = accountManager.address;
@@ -102,22 +167,24 @@ export class BotFactory {
102
167
  const claim = await this.getOrCreateBridgeClaim(address);
103
168
  const paymentMethod = new FeeJuicePaymentMethodWithClaim(accountManager.address, claim);
104
169
  const deployMethod = await accountManager.getDeployMethod();
105
- const maxFeesPerGas = (await this.aztecNode.getCurrentBaseFees()).mul(1 + this.config.baseFeePadding);
170
+ const maxFeesPerGas = (await this.aztecNode.getCurrentMinFees()).mul(1 + this.config.minFeePadding);
106
171
  const gasSettings = GasSettings.default({
107
172
  maxFeesPerGas
108
173
  });
109
- const sentTx = deployMethod.send({
110
- from: AztecAddress.ZERO,
111
- fee: {
112
- gasSettings,
113
- paymentMethod
114
- }
115
- });
116
- const txHash = await sentTx.getTxHash();
117
- this.log.info(`Sent tx for account deployment with hash ${txHash.toString()}`);
118
- await this.withNoMinTxsPerBlock(()=>sentTx.wait({
174
+ await this.withNoMinTxsPerBlock(async ()=>{
175
+ const txHash = await deployMethod.send({
176
+ from: AztecAddress.ZERO,
177
+ fee: {
178
+ gasSettings,
179
+ paymentMethod
180
+ },
181
+ wait: NO_WAIT
182
+ });
183
+ this.log.info(`Sent tx for account deployment with hash ${txHash.toString()}`);
184
+ return waitForTx(this.aztecNode, txHash, {
119
185
  timeout: this.config.txMinedWaitSeconds
120
- }));
186
+ });
187
+ });
121
188
  this.log.info(`Account deployed at ${address}`);
122
189
  // Clean up the consumed bridge claim
123
190
  await this.store.deleteBridgeClaim(address);
@@ -126,12 +193,7 @@ export class BotFactory {
126
193
  }
127
194
  async setupTestAccount() {
128
195
  const [initialAccountData] = await getInitialTestAccountsData();
129
- const accountData = {
130
- secret: initialAccountData.secret,
131
- salt: initialAccountData.salt,
132
- contract: new SchnorrAccountContract(initialAccountData.signingKey)
133
- };
134
- const accountManager = await this.wallet.createAccount(accountData);
196
+ const accountManager = await this.wallet.createSchnorrAccount(initialAccountData.secret, initialAccountData.salt, initialAccountData.signingKey);
135
197
  return accountManager.address;
136
198
  }
137
199
  /**
@@ -140,47 +202,70 @@ export class BotFactory {
140
202
  * @returns The TokenContract instance.
141
203
  */ async setupToken(sender) {
142
204
  let deploy;
205
+ let tokenInstance;
143
206
  const deployOpts = {
144
207
  from: sender,
145
208
  contractAddressSalt: this.config.tokenSalt,
146
209
  universalDeploy: true
147
210
  };
211
+ let token;
148
212
  if (this.config.contract === SupportedTokenContracts.TokenContract) {
149
213
  deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18);
214
+ tokenInstance = await deploy.getInstance(deployOpts);
215
+ token = TokenContract.at(tokenInstance.address, this.wallet);
150
216
  } else if (this.config.contract === SupportedTokenContracts.PrivateTokenContract) {
151
- deploy = PrivateTokenContract.deploy(this.wallet, MINT_BALANCE, sender);
217
+ // Generate keys for the contract since PrivateToken uses SinglePrivateMutable which requires keys
218
+ const tokenSecretKey = Fr.random();
219
+ const tokenPublicKeys = (await deriveKeys(tokenSecretKey)).publicKeys;
220
+ deploy = PrivateTokenContract.deployWithPublicKeys(tokenPublicKeys, this.wallet, MINT_BALANCE, sender);
152
221
  deployOpts.skipInstancePublication = true;
153
222
  deployOpts.skipClassPublication = true;
154
223
  deployOpts.skipInitialization = false;
224
+ // Register the contract with the secret key before deployment
225
+ tokenInstance = await deploy.getInstance(deployOpts);
226
+ token = PrivateTokenContract.at(tokenInstance.address, this.wallet);
227
+ await this.wallet.registerContract(tokenInstance, PrivateTokenContract.artifact, tokenSecretKey);
228
+ // The contract constructor initializes private storage vars that need the contract's own nullifier key.
229
+ deployOpts.additionalScopes = [
230
+ tokenInstance.address
231
+ ];
155
232
  } else {
156
233
  throw new Error(`Unsupported token contract type: ${this.config.contract}`);
157
234
  }
158
- const address = (await deploy.getInstance(deployOpts)).address;
159
- if ((await this.wallet.getContractMetadata(address)).isContractPublished) {
235
+ const address = tokenInstance?.address ?? (await deploy.getInstance(deployOpts)).address;
236
+ const metadata = await this.wallet.getContractMetadata(address);
237
+ if (metadata.isContractPublished) {
160
238
  this.log.info(`Token at ${address.toString()} already deployed`);
161
- return deploy.register();
239
+ await deploy.register();
162
240
  } else {
163
241
  this.log.info(`Deploying token contract at ${address.toString()}`);
164
- const sentTx = deploy.send(deployOpts);
165
- const txHash = await sentTx.getTxHash();
242
+ const txHash = await deploy.send({
243
+ ...deployOpts,
244
+ wait: NO_WAIT
245
+ });
166
246
  this.log.info(`Sent tx for token setup with hash ${txHash.toString()}`);
167
- return this.withNoMinTxsPerBlock(()=>sentTx.deployed({
247
+ await this.withNoMinTxsPerBlock(async ()=>{
248
+ await waitForTx(this.aztecNode, txHash, {
168
249
  timeout: this.config.txMinedWaitSeconds
169
- }));
250
+ });
251
+ return token;
252
+ });
170
253
  }
254
+ return token;
171
255
  }
172
256
  /**
173
257
  * Checks if the token contract is deployed and deploys it if necessary.
174
258
  * @param wallet - Wallet to deploy the token contract from.
175
259
  * @returns The TokenContract instance.
176
- */ setupTokenContract(deployer, contractAddressSalt, name, ticker, decimals = 18) {
260
+ */ async setupTokenContract(deployer, contractAddressSalt, name, ticker, decimals = 18) {
177
261
  const deployOpts = {
178
262
  from: deployer,
179
263
  contractAddressSalt,
180
264
  universalDeploy: true
181
265
  };
182
266
  const deploy = TokenContract.deploy(this.wallet, deployer, name, ticker, decimals);
183
- return this.registerOrDeployContract('Token - ' + name, deploy, deployOpts);
267
+ const instance = await this.registerOrDeployContract('Token - ' + name, deploy, deployOpts);
268
+ return TokenContract.at(instance.address, this.wallet);
184
269
  }
185
270
  async setupAmmContract(deployer, contractAddressSalt, token0, token1, lpToken) {
186
271
  const deployOpts = {
@@ -189,15 +274,16 @@ export class BotFactory {
189
274
  universalDeploy: true
190
275
  };
191
276
  const deploy = AMMContract.deploy(this.wallet, token0.address, token1.address, lpToken.address);
192
- const amm = await this.registerOrDeployContract('AMM', deploy, deployOpts);
277
+ const instance = await this.registerOrDeployContract('AMM', deploy, deployOpts);
278
+ const amm = AMMContract.at(instance.address, this.wallet);
193
279
  this.log.info(`AMM deployed at ${amm.address}`);
194
- const minterTx = lpToken.methods.set_minter(amm.address, true).send({
195
- from: deployer
196
- });
197
- this.log.info(`Set LP token minter to AMM txHash=${(await minterTx.getTxHash()).toString()}`);
198
- await minterTx.wait({
199
- timeout: this.config.txMinedWaitSeconds
280
+ const minterReceipt = await lpToken.methods.set_minter(amm.address, true).send({
281
+ from: deployer,
282
+ wait: {
283
+ timeout: this.config.txMinedWaitSeconds
284
+ }
200
285
  });
286
+ this.log.info(`Set LP token minter to AMM txHash=${minterReceipt.txHash.toString()}`);
201
287
  this.log.info(`Liquidity token initialized`);
202
288
  return amm;
203
289
  }
@@ -230,45 +316,52 @@ export class BotFactory {
230
316
  caller: amm.address,
231
317
  call: await token1.methods.transfer_to_public_and_prepare_private_balance_increase(liquidityProvider, amm.address, amount1Max, authwitNonce).getFunctionCall()
232
318
  });
233
- const mintTx = new BatchCall(this.wallet, [
319
+ const mintReceipt = await new BatchCall(this.wallet, [
234
320
  token0.methods.mint_to_private(liquidityProvider, MINT_BALANCE),
235
321
  token1.methods.mint_to_private(liquidityProvider, MINT_BALANCE)
236
322
  ]).send({
237
- from: liquidityProvider
238
- });
239
- this.log.info(`Sent mint tx: ${(await mintTx.getTxHash()).toString()}`);
240
- await mintTx.wait({
241
- timeout: this.config.txMinedWaitSeconds
323
+ from: liquidityProvider,
324
+ wait: {
325
+ timeout: this.config.txMinedWaitSeconds
326
+ }
242
327
  });
243
- const addLiquidityTx = amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce).send({
328
+ this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`);
329
+ const addLiquidityReceipt = await amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce).send({
244
330
  from: liquidityProvider,
245
331
  authWitnesses: [
246
332
  token0Authwit,
247
333
  token1Authwit
248
- ]
249
- });
250
- this.log.info(`Sent tx to add liquidity to the AMM: ${(await addLiquidityTx.getTxHash()).toString()}`);
251
- await addLiquidityTx.wait({
252
- timeout: this.config.txMinedWaitSeconds
334
+ ],
335
+ wait: {
336
+ timeout: this.config.txMinedWaitSeconds
337
+ }
253
338
  });
339
+ this.log.info(`Sent tx to add liquidity to the AMM: ${addLiquidityReceipt.txHash.toString()}`);
254
340
  this.log.info(`Liquidity added`);
255
341
  const [newT0Bal, newT1Bal, newLPBal] = await getPrivateBalances();
256
342
  this.log.info(`Updated private balances of ${defaultAccountAddress} after minting and funding AMM: token0=${newT0Bal}, token1=${newT1Bal}, lp=${newLPBal}`);
257
343
  }
258
344
  async registerOrDeployContract(name, deploy, deployOpts) {
259
- const address = (await deploy.getInstance(deployOpts)).address;
260
- if ((await this.wallet.getContractMetadata(address)).isContractPublished) {
345
+ const instance = await deploy.getInstance(deployOpts);
346
+ const address = instance.address;
347
+ const metadata = await this.wallet.getContractMetadata(address);
348
+ if (metadata.isContractPublished) {
261
349
  this.log.info(`Contract ${name} at ${address.toString()} already deployed`);
262
- return deploy.register();
350
+ await deploy.register();
263
351
  } else {
264
352
  this.log.info(`Deploying contract ${name} at ${address.toString()}`);
265
- const sentTx = deploy.send(deployOpts);
266
- const txHash = await sentTx.getTxHash();
267
- this.log.info(`Sent contract ${name} setup tx with hash ${txHash.toString()}`);
268
- return this.withNoMinTxsPerBlock(()=>sentTx.deployed({
353
+ await this.withNoMinTxsPerBlock(async ()=>{
354
+ const txHash = await deploy.send({
355
+ ...deployOpts,
356
+ wait: NO_WAIT
357
+ });
358
+ this.log.info(`Sent contract ${name} setup tx with hash ${txHash.toString()}`);
359
+ return waitForTx(this.aztecNode, txHash, {
269
360
  timeout: this.config.txMinedWaitSeconds
270
- }));
361
+ });
362
+ });
271
363
  }
364
+ return instance;
272
365
  }
273
366
  /**
274
367
  * Mints private and public tokens for the sender if their balance is below the minimum.
@@ -295,14 +388,21 @@ export class BotFactory {
295
388
  this.log.info(`Skipping minting as ${minter.toString()} has enough tokens`);
296
389
  return;
297
390
  }
298
- const sentTx = new BatchCall(token.wallet, calls).send({
299
- from: minter
300
- });
301
- const txHash = await sentTx.getTxHash();
302
- this.log.info(`Sent token mint tx with hash ${txHash.toString()}`);
303
- await this.withNoMinTxsPerBlock(()=>sentTx.wait({
391
+ // PrivateToken's mint accesses contract-level private storage vars (admin, total_supply).
392
+ const additionalScopes = isStandardToken ? undefined : [
393
+ token.address
394
+ ];
395
+ await this.withNoMinTxsPerBlock(async ()=>{
396
+ const txHash = await new BatchCall(token.wallet, calls).send({
397
+ from: minter,
398
+ additionalScopes,
399
+ wait: NO_WAIT
400
+ });
401
+ this.log.info(`Sent token mint tx with hash ${txHash.toString()}`);
402
+ return waitForTx(this.aztecNode, txHash, {
304
403
  timeout: this.config.txMinedWaitSeconds
305
- }));
404
+ });
405
+ });
306
406
  }
307
407
  /**
308
408
  * Gets or creates a bridge claim for the recipient.
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';