@aztec/ethereum 0.65.2 → 0.67.0
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/constants.d.ts +1 -0
- package/dest/constants.d.ts.map +1 -1
- package/dest/constants.js +2 -1
- package/dest/contracts/rollup.d.ts +5 -0
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +16 -1
- package/dest/deploy_l1_contracts.d.ts +8 -4
- package/dest/deploy_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_l1_contracts.js +124 -55
- package/dest/eth_cheat_codes.d.ts +156 -0
- package/dest/eth_cheat_codes.d.ts.map +1 -0
- package/dest/eth_cheat_codes.js +294 -0
- package/dest/index.d.ts +4 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +5 -2
- package/dest/l1_contract_addresses.d.ts +4 -1
- package/dest/l1_contract_addresses.d.ts.map +1 -1
- package/dest/l1_contract_addresses.js +8 -1
- package/dest/l1_reader.d.ts +1 -0
- package/dest/l1_reader.d.ts.map +1 -1
- package/dest/l1_reader.js +5 -2
- package/dest/l1_tx_utils.d.ts +101 -0
- package/dest/l1_tx_utils.d.ts.map +1 -0
- package/dest/l1_tx_utils.js +261 -0
- package/dest/test/tx_delayer.d.ts +3 -3
- package/dest/test/tx_delayer.d.ts.map +1 -1
- package/dest/test/tx_delayer.js +3 -3
- package/dest/utils.d.ts +2 -2
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +2 -2
- package/package.json +9 -3
- package/src/constants.ts +1 -0
- package/src/contracts/rollup.ts +20 -0
- package/src/deploy_l1_contracts.ts +148 -63
- package/src/eth_cheat_codes.ts +320 -0
- package/src/index.ts +4 -1
- package/src/l1_contract_addresses.ts +7 -0
- package/src/l1_reader.ts +5 -1
- package/src/l1_tx_utils.ts +404 -0
- package/src/test/tx_delayer.ts +4 -4
- package/src/utils.ts +4 -4
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
2
|
+
import { type Logger } from '@aztec/foundation/log';
|
|
3
|
+
import { type Account, type Address, type Chain, type Hex, type HttpTransport, type PublicClient, type TransactionReceipt, type WalletClient } from 'viem';
|
|
4
|
+
export interface L1TxUtilsConfig {
|
|
5
|
+
/**
|
|
6
|
+
* How much to increase calculated gas limit.
|
|
7
|
+
*/
|
|
8
|
+
gasLimitBufferPercentage?: bigint;
|
|
9
|
+
/**
|
|
10
|
+
* Maximum gas price in gwei
|
|
11
|
+
*/
|
|
12
|
+
maxGwei?: bigint;
|
|
13
|
+
/**
|
|
14
|
+
* Minimum gas price in gwei
|
|
15
|
+
*/
|
|
16
|
+
minGwei?: bigint;
|
|
17
|
+
/**
|
|
18
|
+
* Priority fee bump percentage
|
|
19
|
+
*/
|
|
20
|
+
priorityFeeBumpPercentage?: bigint;
|
|
21
|
+
/**
|
|
22
|
+
* How much to increase priority fee by each attempt (percentage)
|
|
23
|
+
*/
|
|
24
|
+
priorityFeeRetryBumpPercentage?: bigint;
|
|
25
|
+
/**
|
|
26
|
+
* Maximum number of speed-up attempts
|
|
27
|
+
*/
|
|
28
|
+
maxAttempts?: number;
|
|
29
|
+
/**
|
|
30
|
+
* How often to check tx status
|
|
31
|
+
*/
|
|
32
|
+
checkIntervalMs?: number;
|
|
33
|
+
/**
|
|
34
|
+
* How long before considering tx stalled
|
|
35
|
+
*/
|
|
36
|
+
stallTimeMs?: number;
|
|
37
|
+
/**
|
|
38
|
+
* How long to wait for a tx to be mined before giving up
|
|
39
|
+
*/
|
|
40
|
+
txTimeoutMs?: number;
|
|
41
|
+
}
|
|
42
|
+
export declare const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig>;
|
|
43
|
+
export declare const defaultL1TxUtilsConfig: L1TxUtilsConfig;
|
|
44
|
+
export interface L1TxRequest {
|
|
45
|
+
to: Address | null;
|
|
46
|
+
data: Hex;
|
|
47
|
+
value?: bigint;
|
|
48
|
+
}
|
|
49
|
+
interface GasPrice {
|
|
50
|
+
maxFeePerGas: bigint;
|
|
51
|
+
maxPriorityFeePerGas: bigint;
|
|
52
|
+
}
|
|
53
|
+
export declare class L1TxUtils {
|
|
54
|
+
private readonly publicClient;
|
|
55
|
+
private readonly walletClient;
|
|
56
|
+
private readonly logger?;
|
|
57
|
+
private readonly config;
|
|
58
|
+
constructor(publicClient: PublicClient, walletClient: WalletClient<HttpTransport, Chain, Account>, logger?: Logger | undefined, config?: Partial<L1TxUtilsConfig>);
|
|
59
|
+
/**
|
|
60
|
+
* Sends a transaction with gas estimation and pricing
|
|
61
|
+
* @param request - The transaction request (to, data, value)
|
|
62
|
+
* @param gasConfig - Optional gas configuration
|
|
63
|
+
* @returns The transaction hash and parameters used
|
|
64
|
+
*/
|
|
65
|
+
sendTransaction(request: L1TxRequest, _gasConfig?: Partial<L1TxUtilsConfig> & {
|
|
66
|
+
fixedGas?: bigint;
|
|
67
|
+
}): Promise<{
|
|
68
|
+
txHash: Hex;
|
|
69
|
+
gasLimit: bigint;
|
|
70
|
+
gasPrice: GasPrice;
|
|
71
|
+
}>;
|
|
72
|
+
/**
|
|
73
|
+
* Monitors a transaction until completion, handling speed-ups if needed
|
|
74
|
+
* @param request - Original transaction request (needed for speed-ups)
|
|
75
|
+
* @param initialTxHash - Hash of the initial transaction
|
|
76
|
+
* @param params - Parameters used in the initial transaction
|
|
77
|
+
* @param gasConfig - Optional gas configuration
|
|
78
|
+
*/
|
|
79
|
+
monitorTransaction(request: L1TxRequest, initialTxHash: Hex, params: {
|
|
80
|
+
gasLimit: bigint;
|
|
81
|
+
}, _gasConfig?: Partial<L1TxUtilsConfig>): Promise<TransactionReceipt>;
|
|
82
|
+
/**
|
|
83
|
+
* Sends a transaction and monitors it until completion
|
|
84
|
+
* @param request - The transaction request (to, data, value)
|
|
85
|
+
* @param gasConfig - Optional gas configuration
|
|
86
|
+
* @returns The receipt of the successful transaction
|
|
87
|
+
*/
|
|
88
|
+
sendAndMonitorTransaction(request: L1TxRequest, gasConfig?: Partial<L1TxUtilsConfig> & {
|
|
89
|
+
fixedGas?: bigint;
|
|
90
|
+
}): Promise<TransactionReceipt>;
|
|
91
|
+
/**
|
|
92
|
+
* Gets the current gas price with bounds checking
|
|
93
|
+
*/
|
|
94
|
+
private getGasPrice;
|
|
95
|
+
/**
|
|
96
|
+
* Estimates gas and adds buffer
|
|
97
|
+
*/
|
|
98
|
+
estimateGas(account: Account, request: L1TxRequest, _gasConfig?: L1TxUtilsConfig): Promise<bigint>;
|
|
99
|
+
}
|
|
100
|
+
export {};
|
|
101
|
+
//# sourceMappingURL=l1_tx_utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../src/l1_tx_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,KAAK,EAEV,KAAK,GAAG,EACR,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAElB,MAAM,MAAM,CAAC;AAed,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC;;OAEG;IACH,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CA8CvE,CAAC;AAEF,eAAO,MAAM,sBAAsB,iBAA6D,CAAC;AAEjG,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,QAAQ;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,qBAAa,SAAS;IAIlB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAL1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;gBAGtB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,EACzD,MAAM,CAAC,oBAAQ,EAChC,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC;IAQnC;;;;;OAKG;IACU,eAAe,CAC1B,OAAO,EAAE,WAAW,EACpB,UAAU,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAC5D,OAAO,CAAC;QAAE,MAAM,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE,CAAC;IA6BjE;;;;;;OAMG;IACU,kBAAkB,CAC7B,OAAO,EAAE,WAAW,EACpB,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,EAC5B,UAAU,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,GACpC,OAAO,CAAC,kBAAkB,CAAC;IAkH9B;;;;;OAKG;IACU,yBAAyB,CACpC,OAAO,EAAE,WAAW,EACpB,SAAS,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3D,OAAO,CAAC,kBAAkB,CAAC;IAK9B;;OAEG;YACW,WAAW;IA2DzB;;OAEG;IACU,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;CAShH"}
|
|
@@ -0,0 +1,261 @@
|
|
|
1
|
+
import { bigintConfigHelper, getDefaultConfig, numberConfigHelper, } from '@aztec/foundation/config';
|
|
2
|
+
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
3
|
+
import { sleep } from '@aztec/foundation/sleep';
|
|
4
|
+
import { formatGwei, } from 'viem';
|
|
5
|
+
// 1_000_000_000 Gwei = 1 ETH
|
|
6
|
+
// 1_000_000_000 Wei = 1 Gwei
|
|
7
|
+
// 1_000_000_000_000_000_000 Wei = 1 ETH
|
|
8
|
+
const WEI_CONST = 1000000000n;
|
|
9
|
+
// setting a minimum bump percentage to 10% due to geth's implementation
|
|
10
|
+
// https://github.com/ethereum/go-ethereum/blob/e3d61e6db028c412f74bc4d4c7e117a9e29d0de0/core/txpool/legacypool/list.go#L298
|
|
11
|
+
const MIN_REPLACEMENT_BUMP_PERCENTAGE = 10n;
|
|
12
|
+
// Avg ethereum block time is ~12s
|
|
13
|
+
const BLOCK_TIME_MS = 12000;
|
|
14
|
+
export const l1TxUtilsConfigMappings = {
|
|
15
|
+
gasLimitBufferPercentage: {
|
|
16
|
+
description: 'How much to increase gas price by each attempt (percentage)',
|
|
17
|
+
env: 'L1_GAS_LIMIT_BUFFER_PERCENTAGE',
|
|
18
|
+
...bigintConfigHelper(20n),
|
|
19
|
+
},
|
|
20
|
+
minGwei: {
|
|
21
|
+
description: 'Minimum gas price in gwei',
|
|
22
|
+
env: 'L1_GAS_PRICE_MIN',
|
|
23
|
+
...bigintConfigHelper(1n),
|
|
24
|
+
},
|
|
25
|
+
maxGwei: {
|
|
26
|
+
description: 'Maximum gas price in gwei',
|
|
27
|
+
env: 'L1_GAS_PRICE_MAX',
|
|
28
|
+
...bigintConfigHelper(100n),
|
|
29
|
+
},
|
|
30
|
+
priorityFeeBumpPercentage: {
|
|
31
|
+
description: 'How much to increase priority fee by each attempt (percentage)',
|
|
32
|
+
env: 'L1_PRIORITY_FEE_BUMP_PERCENTAGE',
|
|
33
|
+
...bigintConfigHelper(20n),
|
|
34
|
+
},
|
|
35
|
+
priorityFeeRetryBumpPercentage: {
|
|
36
|
+
description: 'How much to increase priority fee by each retry attempt (percentage)',
|
|
37
|
+
env: 'L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE',
|
|
38
|
+
...bigintConfigHelper(50n),
|
|
39
|
+
},
|
|
40
|
+
maxAttempts: {
|
|
41
|
+
description: 'Maximum number of speed-up attempts',
|
|
42
|
+
env: 'L1_TX_MONITOR_MAX_ATTEMPTS',
|
|
43
|
+
...numberConfigHelper(3),
|
|
44
|
+
},
|
|
45
|
+
checkIntervalMs: {
|
|
46
|
+
description: 'How often to check tx status',
|
|
47
|
+
env: 'L1_TX_MONITOR_CHECK_INTERVAL_MS',
|
|
48
|
+
...numberConfigHelper(10000),
|
|
49
|
+
},
|
|
50
|
+
stallTimeMs: {
|
|
51
|
+
description: 'How long before considering tx stalled',
|
|
52
|
+
env: 'L1_TX_MONITOR_STALL_TIME_MS',
|
|
53
|
+
...numberConfigHelper(30000),
|
|
54
|
+
},
|
|
55
|
+
txTimeoutMs: {
|
|
56
|
+
description: 'How long to wait for a tx to be mined before giving up. Set to 0 to disable.',
|
|
57
|
+
env: 'L1_TX_MONITOR_TX_TIMEOUT_MS',
|
|
58
|
+
...numberConfigHelper(300000), // 5 mins
|
|
59
|
+
},
|
|
60
|
+
};
|
|
61
|
+
export const defaultL1TxUtilsConfig = getDefaultConfig(l1TxUtilsConfigMappings);
|
|
62
|
+
export class L1TxUtils {
|
|
63
|
+
constructor(publicClient, walletClient, logger, config) {
|
|
64
|
+
this.publicClient = publicClient;
|
|
65
|
+
this.walletClient = walletClient;
|
|
66
|
+
this.logger = logger;
|
|
67
|
+
this.config = {
|
|
68
|
+
...defaultL1TxUtilsConfig,
|
|
69
|
+
...(config || {}),
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* Sends a transaction with gas estimation and pricing
|
|
74
|
+
* @param request - The transaction request (to, data, value)
|
|
75
|
+
* @param gasConfig - Optional gas configuration
|
|
76
|
+
* @returns The transaction hash and parameters used
|
|
77
|
+
*/
|
|
78
|
+
async sendTransaction(request, _gasConfig) {
|
|
79
|
+
const gasConfig = { ...this.config, ..._gasConfig };
|
|
80
|
+
const account = this.walletClient.account;
|
|
81
|
+
let gasLimit;
|
|
82
|
+
if (gasConfig.fixedGas) {
|
|
83
|
+
gasLimit = gasConfig.fixedGas;
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
gasLimit = await this.estimateGas(account, request);
|
|
87
|
+
}
|
|
88
|
+
const gasPrice = await this.getGasPrice(gasConfig);
|
|
89
|
+
const txHash = await this.walletClient.sendTransaction({
|
|
90
|
+
...request,
|
|
91
|
+
gas: gasLimit,
|
|
92
|
+
maxFeePerGas: gasPrice.maxFeePerGas,
|
|
93
|
+
maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
|
|
94
|
+
});
|
|
95
|
+
this.logger?.verbose(`Sent L1 transaction ${txHash}`, {
|
|
96
|
+
gasLimit,
|
|
97
|
+
maxFeePerGas: formatGwei(gasPrice.maxFeePerGas),
|
|
98
|
+
maxPriorityFeePerGas: formatGwei(gasPrice.maxPriorityFeePerGas),
|
|
99
|
+
});
|
|
100
|
+
return { txHash, gasLimit, gasPrice };
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* Monitors a transaction until completion, handling speed-ups if needed
|
|
104
|
+
* @param request - Original transaction request (needed for speed-ups)
|
|
105
|
+
* @param initialTxHash - Hash of the initial transaction
|
|
106
|
+
* @param params - Parameters used in the initial transaction
|
|
107
|
+
* @param gasConfig - Optional gas configuration
|
|
108
|
+
*/
|
|
109
|
+
async monitorTransaction(request, initialTxHash, params, _gasConfig) {
|
|
110
|
+
const gasConfig = { ...this.config, ..._gasConfig };
|
|
111
|
+
const account = this.walletClient.account;
|
|
112
|
+
// Retry a few times, in case the tx is not yet propagated.
|
|
113
|
+
const tx = await retry(() => this.publicClient.getTransaction({ hash: initialTxHash }), `Getting L1 transaction ${initialTxHash}`, makeBackoff([1, 2, 3]), this.logger, true);
|
|
114
|
+
if (tx?.nonce === undefined || tx?.nonce === null) {
|
|
115
|
+
throw new Error(`Failed to get L1 transaction ${initialTxHash} nonce`);
|
|
116
|
+
}
|
|
117
|
+
const nonce = tx.nonce;
|
|
118
|
+
const txHashes = new Set([initialTxHash]);
|
|
119
|
+
let currentTxHash = initialTxHash;
|
|
120
|
+
let attempts = 0;
|
|
121
|
+
let lastAttemptSent = Date.now();
|
|
122
|
+
const initialTxTime = lastAttemptSent;
|
|
123
|
+
let txTimedOut = false;
|
|
124
|
+
while (!txTimedOut) {
|
|
125
|
+
try {
|
|
126
|
+
const currentNonce = await this.publicClient.getTransactionCount({ address: account.address });
|
|
127
|
+
if (currentNonce > nonce) {
|
|
128
|
+
for (const hash of txHashes) {
|
|
129
|
+
try {
|
|
130
|
+
const receipt = await this.publicClient.getTransactionReceipt({ hash });
|
|
131
|
+
if (receipt) {
|
|
132
|
+
this.logger?.debug(`L1 transaction ${hash} mined`);
|
|
133
|
+
if (receipt.status === 'reverted') {
|
|
134
|
+
this.logger?.error(`L1 transaction ${hash} reverted`);
|
|
135
|
+
}
|
|
136
|
+
return receipt;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
catch (err) {
|
|
140
|
+
if (err instanceof Error && err.message.includes('reverted')) {
|
|
141
|
+
throw err;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
// Retry a few times, in case the tx is not yet propagated.
|
|
147
|
+
const tx = await retry(() => this.publicClient.getTransaction({ hash: currentTxHash }), `Getting L1 transaction ${currentTxHash}`, makeBackoff([1, 2, 3]), this.logger, true);
|
|
148
|
+
const timePassed = Date.now() - lastAttemptSent;
|
|
149
|
+
if (tx && timePassed < gasConfig.stallTimeMs) {
|
|
150
|
+
this.logger?.debug(`L1 transaction ${currentTxHash} pending. Time passed: ${timePassed}ms.`);
|
|
151
|
+
// Check timeout before continuing
|
|
152
|
+
if (gasConfig.txTimeoutMs) {
|
|
153
|
+
txTimedOut = Date.now() - initialTxTime > gasConfig.txTimeoutMs;
|
|
154
|
+
if (txTimedOut) {
|
|
155
|
+
break;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
await sleep(gasConfig.checkIntervalMs);
|
|
159
|
+
continue;
|
|
160
|
+
}
|
|
161
|
+
if (timePassed > gasConfig.stallTimeMs && attempts < gasConfig.maxAttempts) {
|
|
162
|
+
attempts++;
|
|
163
|
+
const newGasPrice = await this.getGasPrice(gasConfig, attempts, tx.maxFeePerGas && tx.maxPriorityFeePerGas
|
|
164
|
+
? { maxFeePerGas: tx.maxFeePerGas, maxPriorityFeePerGas: tx.maxPriorityFeePerGas }
|
|
165
|
+
: undefined);
|
|
166
|
+
this.logger?.debug(`L1 transaction ${currentTxHash} appears stuck. Attempting speed-up ${attempts}/${gasConfig.maxAttempts} ` +
|
|
167
|
+
`with new priority fee ${formatGwei(newGasPrice.maxPriorityFeePerGas)} gwei`);
|
|
168
|
+
currentTxHash = await this.walletClient.sendTransaction({
|
|
169
|
+
...request,
|
|
170
|
+
nonce,
|
|
171
|
+
gas: params.gasLimit,
|
|
172
|
+
maxFeePerGas: newGasPrice.maxFeePerGas,
|
|
173
|
+
maxPriorityFeePerGas: newGasPrice.maxPriorityFeePerGas,
|
|
174
|
+
});
|
|
175
|
+
txHashes.add(currentTxHash);
|
|
176
|
+
lastAttemptSent = Date.now();
|
|
177
|
+
}
|
|
178
|
+
await sleep(gasConfig.checkIntervalMs);
|
|
179
|
+
}
|
|
180
|
+
catch (err) {
|
|
181
|
+
this.logger?.warn(`Error monitoring tx ${currentTxHash}:`, err);
|
|
182
|
+
if (err.message?.includes('reverted')) {
|
|
183
|
+
throw err;
|
|
184
|
+
}
|
|
185
|
+
await sleep(gasConfig.checkIntervalMs);
|
|
186
|
+
}
|
|
187
|
+
// Check if tx has timed out.
|
|
188
|
+
if (gasConfig.txTimeoutMs) {
|
|
189
|
+
txTimedOut = Date.now() - initialTxTime > gasConfig.txTimeoutMs;
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
throw new Error(`L1 transaction ${currentTxHash} timed out`);
|
|
193
|
+
}
|
|
194
|
+
/**
|
|
195
|
+
* Sends a transaction and monitors it until completion
|
|
196
|
+
* @param request - The transaction request (to, data, value)
|
|
197
|
+
* @param gasConfig - Optional gas configuration
|
|
198
|
+
* @returns The receipt of the successful transaction
|
|
199
|
+
*/
|
|
200
|
+
async sendAndMonitorTransaction(request, gasConfig) {
|
|
201
|
+
const { txHash, gasLimit } = await this.sendTransaction(request, gasConfig);
|
|
202
|
+
return this.monitorTransaction(request, txHash, { gasLimit }, gasConfig);
|
|
203
|
+
}
|
|
204
|
+
/**
|
|
205
|
+
* Gets the current gas price with bounds checking
|
|
206
|
+
*/
|
|
207
|
+
async getGasPrice(_gasConfig, attempt = 0, previousGasPrice) {
|
|
208
|
+
const gasConfig = { ...this.config, ..._gasConfig };
|
|
209
|
+
const block = await this.publicClient.getBlock({ blockTag: 'latest' });
|
|
210
|
+
const baseFee = block.baseFeePerGas ?? 0n;
|
|
211
|
+
// Get initial priority fee from the network
|
|
212
|
+
let priorityFee = await this.publicClient.estimateMaxPriorityFeePerGas();
|
|
213
|
+
let maxFeePerGas = baseFee;
|
|
214
|
+
// Bump base fee so it's valid for next blocks if it stalls
|
|
215
|
+
const numBlocks = Math.ceil(gasConfig.stallTimeMs / BLOCK_TIME_MS);
|
|
216
|
+
for (let i = 0; i < numBlocks; i++) {
|
|
217
|
+
// each block can go up 12.5% from previous baseFee
|
|
218
|
+
maxFeePerGas = (maxFeePerGas * (1000n + 125n)) / 1000n;
|
|
219
|
+
}
|
|
220
|
+
if (attempt > 0) {
|
|
221
|
+
const configBump = gasConfig.priorityFeeRetryBumpPercentage ?? defaultL1TxUtilsConfig.priorityFeeRetryBumpPercentage;
|
|
222
|
+
const bumpPercentage = configBump > MIN_REPLACEMENT_BUMP_PERCENTAGE ? configBump : MIN_REPLACEMENT_BUMP_PERCENTAGE;
|
|
223
|
+
// Calculate minimum required fees based on previous attempt
|
|
224
|
+
const minPriorityFee = (previousGasPrice.maxPriorityFeePerGas * (100n + bumpPercentage)) / 100n;
|
|
225
|
+
const minMaxFee = (previousGasPrice.maxFeePerGas * (100n + bumpPercentage)) / 100n;
|
|
226
|
+
// Add priority fee to maxFeePerGas
|
|
227
|
+
maxFeePerGas += priorityFee;
|
|
228
|
+
// Use maximum between current network values and minimum required values
|
|
229
|
+
priorityFee = priorityFee > minPriorityFee ? priorityFee : minPriorityFee;
|
|
230
|
+
maxFeePerGas = maxFeePerGas > minMaxFee ? maxFeePerGas : minMaxFee;
|
|
231
|
+
}
|
|
232
|
+
else {
|
|
233
|
+
// first attempt, just bump priority fee
|
|
234
|
+
priorityFee = (priorityFee * (100n + (gasConfig.priorityFeeBumpPercentage || 0n))) / 100n;
|
|
235
|
+
maxFeePerGas += priorityFee;
|
|
236
|
+
}
|
|
237
|
+
// Ensure we don't exceed maxGwei
|
|
238
|
+
const maxGweiInWei = gasConfig.maxGwei * WEI_CONST;
|
|
239
|
+
maxFeePerGas = maxFeePerGas > maxGweiInWei ? maxGweiInWei : maxFeePerGas;
|
|
240
|
+
// Ensure priority fee doesn't exceed max fee
|
|
241
|
+
const maxPriorityFeePerGas = priorityFee > maxFeePerGas ? maxFeePerGas : priorityFee;
|
|
242
|
+
this.logger?.debug(`Computed gas price`, {
|
|
243
|
+
attempt,
|
|
244
|
+
baseFee: formatGwei(baseFee),
|
|
245
|
+
maxFeePerGas: formatGwei(maxFeePerGas),
|
|
246
|
+
maxPriorityFeePerGas: formatGwei(maxPriorityFeePerGas),
|
|
247
|
+
});
|
|
248
|
+
return { maxFeePerGas, maxPriorityFeePerGas };
|
|
249
|
+
}
|
|
250
|
+
/**
|
|
251
|
+
* Estimates gas and adds buffer
|
|
252
|
+
*/
|
|
253
|
+
async estimateGas(account, request, _gasConfig) {
|
|
254
|
+
const gasConfig = { ...this.config, ..._gasConfig };
|
|
255
|
+
const initialEstimate = await this.publicClient.estimateGas({ account, ...request });
|
|
256
|
+
// Add buffer based on either fixed amount or percentage
|
|
257
|
+
const withBuffer = initialEstimate + (initialEstimate * (gasConfig.gasLimitBufferPercentage ?? 0n)) / 100n;
|
|
258
|
+
return withBuffer;
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l1_tx_utils.js","sourceRoot":"","sources":["../src/l1_tx_utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type Logger } from '@aztec/foundation/log';
|
|
2
2
|
import { type Client, type Hex, type WalletClient } from 'viem';
|
|
3
|
-
export declare function waitUntilBlock<T extends Client>(client: T, blockNumber: number | bigint, logger?:
|
|
4
|
-
export declare function waitUntilL1Timestamp<T extends Client>(client: T, timestamp: number | bigint, logger?:
|
|
3
|
+
export declare function waitUntilBlock<T extends Client>(client: T, blockNumber: number | bigint, logger?: Logger): Promise<boolean>;
|
|
4
|
+
export declare function waitUntilL1Timestamp<T extends Client>(client: T, timestamp: number | bigint, logger?: Logger): Promise<boolean>;
|
|
5
5
|
export interface Delayer {
|
|
6
6
|
/** Returns the list of all txs (not just the delayed ones) sent through the attached client. */
|
|
7
7
|
getTxs(): Hex[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx_delayer.d.ts","sourceRoot":"","sources":["../../src/test/tx_delayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"tx_delayer.d.ts","sourceRoot":"","sources":["../../src/test/tx_delayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,OAAO,EACL,KAAK,MAAM,EACX,KAAK,GAAG,EAER,KAAK,YAAY,EAIlB,MAAM,MAAM,CAAC;AAEd,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,oBAgBxG;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,oBAuB5G;AAED,MAAM,WAAW,OAAO;IACtB,gGAAgG;IAChG,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,8EAA8E;IAC9E,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACxE,wEAAwE;IACxE,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CAC3E;AAwBD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAChD,MAAM,EAAE,CAAC,EACT,IAAI,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC9C;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAsDjC"}
|
package/dest/test/tx_delayer.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
2
2
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
3
3
|
import { inspect } from 'util';
|
|
4
4
|
import { keccak256, publicActions, walletActions, } from 'viem';
|
|
@@ -50,7 +50,7 @@ class DelayerImpl {
|
|
|
50
50
|
* The delayer can be used to hold off the next tx to be sent until a given block number.
|
|
51
51
|
*/
|
|
52
52
|
export function withDelayer(client, opts) {
|
|
53
|
-
const logger =
|
|
53
|
+
const logger = createLogger('ethereum:tx_delayer');
|
|
54
54
|
const delayer = new DelayerImpl(opts);
|
|
55
55
|
const extended = client
|
|
56
56
|
// Tweak sendRawTransaction so it uses the delay defined in the delayer.
|
|
@@ -99,4 +99,4 @@ export function withDelayer(client, opts) {
|
|
|
99
99
|
}));
|
|
100
100
|
return { client: extended, delayer };
|
|
101
101
|
}
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZGVsYXllci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L3R4X2RlbGF5ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFlLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVyRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQy9CLE9BQU8sRUFLTCxTQUFTLEVBQ1QsYUFBYSxFQUNiLGFBQWEsR0FDZCxNQUFNLE1BQU0sQ0FBQztBQUVkLE1BQU0sVUFBVSxjQUFjLENBQW1CLE1BQVMsRUFBRSxXQUE0QixFQUFFLE1BQWU7SUFDdkcsTUFBTSxZQUFZLEdBQ2hCLGdCQUFnQixJQUFJLE1BQU0sSUFBSSxPQUFPLE1BQU0sQ0FBQyxjQUFjLEtBQUssVUFBVTtRQUN2RSxDQUFDLENBQUUsTUFBa0M7UUFDckMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7SUFFbkMsT0FBTyxVQUFVLENBQ2YsS0FBSyxJQUFJLEVBQUU7UUFDVCxNQUFNLGtCQUFrQixHQUFHLE1BQU0sWUFBWSxDQUFDLGNBQWMsQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQy9FLE1BQU0sRUFBRSxLQUFLLENBQUMsbUJBQW1CLGtCQUFrQixtQkFBbUIsV0FBVyxHQUFHLENBQUMsQ0FBQztRQUN0RixPQUFPLGtCQUFrQixJQUFJLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNuRCxDQUFDLEVBQ0QsdUJBQXVCLFdBQVcsRUFBRSxFQUNwQyxFQUFFLEVBQ0YsR0FBRyxDQUNKLENBQUM7QUFDSixDQUFDO0FBRUQsTUFBTSxVQUFVLG9CQUFvQixDQUFtQixNQUFTLEVBQUUsU0FBMEIsRUFBRSxNQUFlO0lBQzNHLE1BQU0sWUFBWSxHQUNoQixnQkFBZ0IsSUFBSSxN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
|
package/dest/utils.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Fr } from '@aztec/foundation/fields';
|
|
2
|
-
import { type
|
|
2
|
+
import { type Logger } from '@aztec/foundation/log';
|
|
3
3
|
import { type Abi, type ContractEventName, type DecodeEventLogReturnType, type Hex, type Log } from 'viem';
|
|
4
4
|
export interface L2Claim {
|
|
5
5
|
claimSecret: Fr;
|
|
@@ -7,5 +7,5 @@ export interface L2Claim {
|
|
|
7
7
|
messageHash: Hex;
|
|
8
8
|
messageLeafIndex: bigint;
|
|
9
9
|
}
|
|
10
|
-
export declare function extractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?:
|
|
10
|
+
export declare function extractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?: Logger): TEventType;
|
|
11
11
|
//# sourceMappingURL=utils.d.ts.map
|
package/dest/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EACL,KAAK,GAAG,EACR,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,GAAG,EACR,KAAK,GAAG,EAET,MAAM,MAAM,CAAC;AAEd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ"}
|
package/dest/utils.js
CHANGED
|
@@ -8,7 +8,7 @@ export function extractEvent(logs, address, abi, eventName, filter, logger) {
|
|
|
8
8
|
}
|
|
9
9
|
function tryExtractEvent(logs, address, abi, eventName, filter, logger) {
|
|
10
10
|
for (const log of logs) {
|
|
11
|
-
if (log.address === address) {
|
|
11
|
+
if (log.address.toLowerCase() === address.toLowerCase()) {
|
|
12
12
|
try {
|
|
13
13
|
const decodedEvent = decodeEventLog({ abi, ...log });
|
|
14
14
|
if (decodedEvent.eventName === eventName) {
|
|
@@ -24,4 +24,4 @@ function tryExtractEvent(logs, address, abi, eventName, filter, logger) {
|
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQU1MLGNBQWMsR0FDZixNQUFNLE1BQU0sQ0FBQztBQVNkLE1BQU0sVUFBVSxZQUFZLENBSzFCLElBQVcsRUFDWCxPQUFZLEVBQ1osR0FBUyxFQUNULFNBQXFCLEVBQ3JCLE1BQXFDLEVBQ3JDLE1BQWU7SUFFZixNQUFNLEtBQUssR0FBRyxlQUFlLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUM3RSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDWCxNQUFNLElBQUksS0FBSyxDQUFDLGlDQUFpQyxTQUFTLGlCQUFpQixPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBQ3hGLENBQUM7SUFDRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUM7QUFFRCxTQUFTLGVBQWUsQ0FLdEIsSUFBVyxFQUNYLE9BQVksRUFDWixHQUFTLEVBQ1QsU0FBcUIsRUFDckIsTUFBcUMsRUFDckMsTUFBZTtJQUVmLEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7UUFDdkIsSUFBSSxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRSxLQUFLLE9BQU8sQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDO1lBQ3hELElBQUksQ0FBQztnQkFDSCxNQUFNLFlBQVksR0FBRyxjQUFjLENBQUMsRUFBRSxHQUFHLEVBQUUsR0FBRyxHQUFHLEVBQUUsQ0FBQyxDQUFDO2dCQUNyRCxJQUFJLFlBQVksQ0FBQyxTQUFTLEtBQUssU0FBUyxFQUFFLENBQUM7b0JBQ3pDLE1BQU0sYUFBYSxHQUFHLFlBQTBCLENBQUM7b0JBQ2pELElBQUksQ0FBQyxNQUFNLElBQUksTUFBTSxDQUFDLGFBQWEsQ0FBQyxFQUFFLENBQUM7d0JBQ3JDLE9BQU8sYUFBYSxDQUFDO29CQUN2QixDQUFDO2dCQUNILENBQUM7WUFDSCxDQUFDO1lBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztnQkFDYixNQUFNLEVBQUUsSUFBSSxDQUFDLDJDQUEyQyxPQUFPLEtBQUssR0FBRyxFQUFFLENBQUMsQ0FBQztZQUM3RSxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7QUFDSCxDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/ethereum",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.67.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
"../package.common.json"
|
|
29
29
|
],
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@aztec/foundation": "0.
|
|
32
|
-
"@aztec/l1-artifacts": "0.
|
|
31
|
+
"@aztec/foundation": "0.67.0",
|
|
32
|
+
"@aztec/l1-artifacts": "0.67.0",
|
|
33
33
|
"@viem/anvil": "^0.0.10",
|
|
34
34
|
"dotenv": "^16.0.3",
|
|
35
35
|
"get-port": "^7.1.0",
|
|
@@ -41,6 +41,8 @@
|
|
|
41
41
|
"@jest/globals": "^29.5.0",
|
|
42
42
|
"@types/jest": "^29.5.0",
|
|
43
43
|
"@types/node": "^18.14.6",
|
|
44
|
+
"@viem/anvil": "^0.0.10",
|
|
45
|
+
"get-port": "^7.1.0",
|
|
44
46
|
"jest": "^29.5.0",
|
|
45
47
|
"ts-node": "^10.9.1",
|
|
46
48
|
"typescript": "^5.0.4"
|
|
@@ -83,6 +85,10 @@
|
|
|
83
85
|
"summaryThreshold": 9999
|
|
84
86
|
}
|
|
85
87
|
]
|
|
88
|
+
],
|
|
89
|
+
"testTimeout": 30000,
|
|
90
|
+
"setupFiles": [
|
|
91
|
+
"../../foundation/src/jest/setup.mjs"
|
|
86
92
|
]
|
|
87
93
|
},
|
|
88
94
|
"engines": {
|
package/src/constants.ts
CHANGED
package/src/contracts/rollup.ts
CHANGED
|
@@ -44,6 +44,26 @@ export class RollupContract {
|
|
|
44
44
|
return this.rollup.read.getCurrentSlot();
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
+
getCommitteeAt(timestamp: bigint) {
|
|
48
|
+
return this.rollup.read.getCommitteeAt([timestamp]);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
getSampleSeedAt(timestamp: bigint) {
|
|
52
|
+
return this.rollup.read.getSampleSeedAt([timestamp]);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
getCurrentSampleSeed() {
|
|
56
|
+
return this.rollup.read.getCurrentSampleSeed();
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
getCurrentEpochCommittee() {
|
|
60
|
+
return this.rollup.read.getCurrentEpochCommittee();
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
getCurrentProposer() {
|
|
64
|
+
return this.rollup.read.getCurrentProposer();
|
|
65
|
+
}
|
|
66
|
+
|
|
47
67
|
async getEpochNumber(blockNumber?: bigint) {
|
|
48
68
|
blockNumber ??= await this.getBlockNumber();
|
|
49
69
|
return this.rollup.read.getEpochForBlock([BigInt(blockNumber)]);
|