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