@aztec/ethereum 0.0.1-commit.24de95ac → 0.0.1-commit.2e2504e2

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 (208) hide show
  1. package/dest/account.d.ts +1 -1
  2. package/dest/chain.d.ts +1 -1
  3. package/dest/client.d.ts +1 -1
  4. package/dest/client.js +6 -2
  5. package/dest/config.d.ts +22 -68
  6. package/dest/config.d.ts.map +1 -1
  7. package/dest/config.js +57 -378
  8. package/dest/constants.d.ts +1 -1
  9. package/dest/contracts/empire_base.d.ts +7 -5
  10. package/dest/contracts/empire_base.d.ts.map +1 -1
  11. package/dest/contracts/empire_base.js +1 -1
  12. package/dest/contracts/empire_slashing_proposer.d.ts +6 -4
  13. package/dest/contracts/empire_slashing_proposer.d.ts.map +1 -1
  14. package/dest/contracts/empire_slashing_proposer.js +30 -17
  15. package/dest/contracts/errors.d.ts +1 -1
  16. package/dest/contracts/errors.d.ts.map +1 -1
  17. package/dest/contracts/fee_asset_handler.d.ts +6 -5
  18. package/dest/contracts/fee_asset_handler.d.ts.map +1 -1
  19. package/dest/contracts/fee_asset_handler.js +11 -9
  20. package/dest/contracts/fee_juice.d.ts +1 -1
  21. package/dest/contracts/fee_juice.d.ts.map +1 -1
  22. package/dest/contracts/governance.d.ts +18 -16
  23. package/dest/contracts/governance.d.ts.map +1 -1
  24. package/dest/contracts/governance.js +11 -1
  25. package/dest/contracts/governance_proposer.d.ts +6 -4
  26. package/dest/contracts/governance_proposer.d.ts.map +1 -1
  27. package/dest/contracts/governance_proposer.js +403 -11
  28. package/dest/contracts/gse.d.ts +1 -1
  29. package/dest/contracts/gse.d.ts.map +1 -1
  30. package/dest/contracts/inbox.d.ts +24 -3
  31. package/dest/contracts/inbox.d.ts.map +1 -1
  32. package/dest/contracts/inbox.js +36 -1
  33. package/dest/contracts/index.d.ts +3 -1
  34. package/dest/contracts/index.d.ts.map +1 -1
  35. package/dest/contracts/index.js +2 -0
  36. package/dest/contracts/log.d.ts +13 -0
  37. package/dest/contracts/log.d.ts.map +1 -0
  38. package/dest/contracts/log.js +1 -0
  39. package/dest/contracts/multicall.d.ts +2 -2
  40. package/dest/contracts/multicall.d.ts.map +1 -1
  41. package/dest/contracts/multicall.js +2 -1
  42. package/dest/contracts/outbox.d.ts +41 -0
  43. package/dest/contracts/outbox.d.ts.map +1 -0
  44. package/dest/contracts/outbox.js +86 -0
  45. package/dest/contracts/registry.d.ts +1 -1
  46. package/dest/contracts/registry.d.ts.map +1 -1
  47. package/dest/contracts/rollup.d.ts +194 -123
  48. package/dest/contracts/rollup.d.ts.map +1 -1
  49. package/dest/contracts/rollup.js +750 -184
  50. package/dest/contracts/slasher_contract.d.ts +1 -1
  51. package/dest/contracts/slasher_contract.d.ts.map +1 -1
  52. package/dest/contracts/tally_slashing_proposer.d.ts +9 -7
  53. package/dest/contracts/tally_slashing_proposer.d.ts.map +1 -1
  54. package/dest/contracts/tally_slashing_proposer.js +11 -4
  55. package/dest/contracts/utils.d.ts +1 -1
  56. package/dest/deploy_aztec_l1_contracts.d.ts +260 -0
  57. package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -0
  58. package/dest/deploy_aztec_l1_contracts.js +399 -0
  59. package/dest/deploy_l1_contract.d.ts +68 -0
  60. package/dest/deploy_l1_contract.d.ts.map +1 -0
  61. package/dest/deploy_l1_contract.js +312 -0
  62. package/dest/eth-signer/eth-signer.d.ts +1 -1
  63. package/dest/eth-signer/index.d.ts +1 -1
  64. package/dest/forwarder_proxy.d.ts +32 -0
  65. package/dest/forwarder_proxy.d.ts.map +1 -0
  66. package/dest/forwarder_proxy.js +93 -0
  67. package/dest/generated/l1-contracts-defaults.d.ts +30 -0
  68. package/dest/generated/l1-contracts-defaults.d.ts.map +1 -0
  69. package/dest/generated/l1-contracts-defaults.js +30 -0
  70. package/dest/l1_artifacts.d.ts +6597 -2046
  71. package/dest/l1_artifacts.d.ts.map +1 -1
  72. package/dest/l1_contract_addresses.d.ts +3 -3
  73. package/dest/l1_contract_addresses.d.ts.map +1 -1
  74. package/dest/l1_contract_addresses.js +3 -3
  75. package/dest/l1_reader.d.ts +3 -1
  76. package/dest/l1_reader.d.ts.map +1 -1
  77. package/dest/l1_reader.js +6 -0
  78. package/dest/l1_tx_utils/config.d.ts +5 -5
  79. package/dest/l1_tx_utils/config.d.ts.map +1 -1
  80. package/dest/l1_tx_utils/config.js +30 -7
  81. package/dest/l1_tx_utils/constants.d.ts +8 -2
  82. package/dest/l1_tx_utils/constants.d.ts.map +1 -1
  83. package/dest/l1_tx_utils/constants.js +27 -2
  84. package/dest/l1_tx_utils/factory.d.ts +1 -1
  85. package/dest/l1_tx_utils/fee-strategies/index.d.ts +10 -0
  86. package/dest/l1_tx_utils/fee-strategies/index.d.ts.map +1 -0
  87. package/dest/l1_tx_utils/fee-strategies/index.js +12 -0
  88. package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts +8 -0
  89. package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts.map +1 -0
  90. package/dest/l1_tx_utils/fee-strategies/p75_competitive.js +129 -0
  91. package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts +23 -0
  92. package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts.map +1 -0
  93. package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.js +191 -0
  94. package/dest/l1_tx_utils/fee-strategies/types.d.ts +51 -0
  95. package/dest/l1_tx_utils/fee-strategies/types.d.ts.map +1 -0
  96. package/dest/l1_tx_utils/fee-strategies/types.js +3 -0
  97. package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts +41 -0
  98. package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts.map +1 -0
  99. package/dest/l1_tx_utils/forwarder_l1_tx_utils.js +48 -0
  100. package/dest/l1_tx_utils/index-blobs.d.ts +3 -0
  101. package/dest/l1_tx_utils/index-blobs.d.ts.map +1 -0
  102. package/dest/l1_tx_utils/index-blobs.js +2 -0
  103. package/dest/l1_tx_utils/index.d.ts +3 -1
  104. package/dest/l1_tx_utils/index.d.ts.map +1 -1
  105. package/dest/l1_tx_utils/index.js +2 -0
  106. package/dest/l1_tx_utils/interfaces.d.ts +2 -2
  107. package/dest/l1_tx_utils/interfaces.d.ts.map +1 -1
  108. package/dest/l1_tx_utils/l1_fee_analyzer.d.ts +233 -0
  109. package/dest/l1_tx_utils/l1_fee_analyzer.d.ts.map +1 -0
  110. package/dest/l1_tx_utils/l1_fee_analyzer.js +506 -0
  111. package/dest/l1_tx_utils/l1_tx_utils.d.ts +1 -2
  112. package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
  113. package/dest/l1_tx_utils/l1_tx_utils.js +23 -10
  114. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts +1 -1
  115. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts.map +1 -1
  116. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +19 -30
  117. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
  118. package/dest/l1_tx_utils/readonly_l1_tx_utils.js +55 -163
  119. package/dest/l1_tx_utils/signer.d.ts +1 -1
  120. package/dest/l1_tx_utils/types.d.ts +1 -1
  121. package/dest/l1_tx_utils/types.d.ts.map +1 -1
  122. package/dest/l1_tx_utils/utils.d.ts +1 -1
  123. package/dest/l1_types.d.ts +1 -1
  124. package/dest/publisher_manager.d.ts +3 -2
  125. package/dest/publisher_manager.d.ts.map +1 -1
  126. package/dest/publisher_manager.js +2 -2
  127. package/dest/queries.d.ts +2 -2
  128. package/dest/queries.d.ts.map +1 -1
  129. package/dest/queries.js +16 -6
  130. package/dest/test/chain_monitor.d.ts +27 -24
  131. package/dest/test/chain_monitor.d.ts.map +1 -1
  132. package/dest/test/chain_monitor.js +33 -36
  133. package/dest/test/delayed_tx_utils.d.ts +1 -1
  134. package/dest/test/delayed_tx_utils.d.ts.map +1 -1
  135. package/dest/test/eth_cheat_codes.d.ts +11 -3
  136. package/dest/test/eth_cheat_codes.d.ts.map +1 -1
  137. package/dest/test/eth_cheat_codes.js +11 -3
  138. package/dest/test/eth_cheat_codes_with_state.d.ts +1 -1
  139. package/dest/test/eth_cheat_codes_with_state.d.ts.map +1 -1
  140. package/dest/test/index.d.ts +1 -1
  141. package/dest/test/rollup_cheat_codes.d.ts +17 -13
  142. package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
  143. package/dest/test/rollup_cheat_codes.js +62 -38
  144. package/dest/test/start_anvil.d.ts +4 -1
  145. package/dest/test/start_anvil.d.ts.map +1 -1
  146. package/dest/test/start_anvil.js +3 -2
  147. package/dest/test/tx_delayer.d.ts +1 -1
  148. package/dest/test/tx_delayer.d.ts.map +1 -1
  149. package/dest/test/tx_delayer.js +4 -3
  150. package/dest/test/upgrade_utils.d.ts +1 -1
  151. package/dest/types.d.ts +57 -2
  152. package/dest/types.d.ts.map +1 -1
  153. package/dest/utils.d.ts +16 -3
  154. package/dest/utils.d.ts.map +1 -1
  155. package/dest/utils.js +64 -0
  156. package/dest/zkPassportVerifierAddress.d.ts +1 -1
  157. package/package.json +34 -14
  158. package/src/client.ts +2 -2
  159. package/src/config.ts +71 -458
  160. package/src/contracts/README.md +157 -0
  161. package/src/contracts/empire_base.ts +6 -5
  162. package/src/contracts/empire_slashing_proposer.ts +32 -32
  163. package/src/contracts/fee_asset_handler.ts +10 -7
  164. package/src/contracts/governance.ts +10 -1
  165. package/src/contracts/governance_proposer.ts +20 -6
  166. package/src/contracts/inbox.ts +55 -3
  167. package/src/contracts/index.ts +2 -0
  168. package/src/contracts/log.ts +13 -0
  169. package/src/contracts/multicall.ts +5 -2
  170. package/src/contracts/outbox.ts +98 -0
  171. package/src/contracts/rollup.ts +421 -160
  172. package/src/contracts/tally_slashing_proposer.ts +15 -8
  173. package/src/deploy_aztec_l1_contracts.ts +623 -0
  174. package/src/deploy_l1_contract.ts +362 -0
  175. package/src/forwarder_proxy.ts +108 -0
  176. package/src/generated/l1-contracts-defaults.ts +32 -0
  177. package/src/l1_contract_addresses.ts +22 -20
  178. package/src/l1_reader.ts +8 -0
  179. package/src/l1_tx_utils/config.ts +32 -11
  180. package/src/l1_tx_utils/constants.ts +13 -2
  181. package/src/l1_tx_utils/fee-strategies/index.ts +22 -0
  182. package/src/l1_tx_utils/fee-strategies/p75_competitive.ts +163 -0
  183. package/src/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.ts +245 -0
  184. package/src/l1_tx_utils/fee-strategies/types.ts +56 -0
  185. package/src/l1_tx_utils/forwarder_l1_tx_utils.ts +119 -0
  186. package/src/l1_tx_utils/index-blobs.ts +2 -0
  187. package/src/l1_tx_utils/index.ts +2 -0
  188. package/src/l1_tx_utils/interfaces.ts +1 -1
  189. package/src/l1_tx_utils/l1_fee_analyzer.ts +803 -0
  190. package/src/l1_tx_utils/l1_tx_utils.ts +30 -10
  191. package/src/l1_tx_utils/readonly_l1_tx_utils.ts +69 -209
  192. package/src/publisher_manager.ts +4 -2
  193. package/src/queries.ts +17 -6
  194. package/src/test/chain_monitor.ts +51 -49
  195. package/src/test/eth_cheat_codes.ts +9 -3
  196. package/src/test/rollup_cheat_codes.ts +63 -43
  197. package/src/test/start_anvil.ts +5 -1
  198. package/src/test/tx_delayer.ts +5 -3
  199. package/src/types.ts +62 -0
  200. package/src/utils.ts +83 -1
  201. package/dest/deploy_l1_contracts.d.ts +0 -226
  202. package/dest/deploy_l1_contracts.d.ts.map +0 -1
  203. package/dest/deploy_l1_contracts.js +0 -1473
  204. package/dest/index.d.ts +0 -18
  205. package/dest/index.d.ts.map +0 -1
  206. package/dest/index.js +0 -17
  207. package/src/deploy_l1_contracts.ts +0 -1849
  208. package/src/index.ts +0 -17
@@ -1,9 +1,9 @@
1
- import { RollupContract } from '@aztec/ethereum';
1
+ import { OutboxContract, RollupContract } from '@aztec/ethereum/contracts';
2
+ import { CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
2
3
  import { EthAddress } from '@aztec/foundation/eth-address';
3
4
  import { createLogger } from '@aztec/foundation/log';
4
5
  import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
5
6
  import { createPublicClient, fallback, getContract, hexToBigInt, http } from 'viem';
6
- import { foundry } from 'viem/chains';
7
7
  import { EthCheatCodes } from './eth_cheat_codes.js';
8
8
  /** Cheat codes for the L1 rollup contract. */ export class RollupCheatCodes {
9
9
  ethCheatCodes;
@@ -14,8 +14,10 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
14
14
  this.ethCheatCodes = ethCheatCodes;
15
15
  this.logger = createLogger('aztecjs:cheat_codes');
16
16
  this.client = createPublicClient({
17
- chain: foundry,
18
- transport: fallback(ethCheatCodes.rpcUrls.map((url)=>http(url)))
17
+ chain: ethCheatCodes.chain,
18
+ transport: fallback(ethCheatCodes.rpcUrls.map((url)=>http(url, {
19
+ batch: false
20
+ })))
19
21
  });
20
22
  this.rollup = getContract({
21
23
  abi: RollupAbi,
@@ -29,39 +31,48 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
29
31
  }
30
32
  /** Returns the current slot */ async getSlot() {
31
33
  const ts = BigInt((await this.client.getBlock()).timestamp);
32
- return await this.rollup.read.getSlotAt([
34
+ return SlotNumber.fromBigInt(await this.rollup.read.getSlotAt([
33
35
  ts
36
+ ]));
37
+ }
38
+ /** Returns the number of seconds until the start of the given slot based on L1 block timestamp. */ async getSecondsUntilSlot(slot) {
39
+ const [currentTimestamp, targetTimestamp] = await Promise.all([
40
+ this.client.getBlock().then((b)=>BigInt(b.timestamp)),
41
+ this.rollup.read.getTimestampForSlot([
42
+ BigInt(slot)
43
+ ])
34
44
  ]);
45
+ return Math.max(0, Number(targetTimestamp - currentTimestamp));
35
46
  }
36
47
  /** Returns the current epoch */ async getEpoch() {
37
48
  const slotNumber = await this.getSlot();
38
- return await this.rollup.read.getEpochAtSlot([
39
- slotNumber
40
- ]);
49
+ return EpochNumber.fromBigInt(await this.rollup.read.getEpochAtSlot([
50
+ BigInt(slotNumber)
51
+ ]));
41
52
  }
42
53
  /**
43
54
  * Returns the pending and proven chain tips
44
55
  * @returns The pending and proven chain tips
45
56
  */ async getTips() {
46
- const res = await this.rollup.read.getTips();
57
+ const { pending, proven } = await this.rollup.read.getTips();
47
58
  return {
48
- pending: res.pendingBlockNumber,
49
- proven: res.provenBlockNumber
59
+ pending: CheckpointNumber.fromBigInt(pending),
60
+ proven: CheckpointNumber.fromBigInt(proven)
50
61
  };
51
62
  }
52
63
  /**
53
64
  * Logs the current state of the rollup contract.
54
65
  */ async debugRollup() {
55
66
  const rollup = new RollupContract(this.client, this.rollup.address);
56
- const pendingNum = await rollup.getBlockNumber();
57
- const provenNum = await rollup.getProvenBlockNumber();
67
+ const pendingNum = await rollup.getCheckpointNumber();
68
+ const provenNum = await rollup.getProvenCheckpointNumber();
58
69
  const validators = await rollup.getAttesters();
59
70
  const committee = await rollup.getCurrentEpochCommittee();
60
71
  const archive = await rollup.archive();
61
72
  const slot = await this.getSlot();
62
73
  const epochNum = await rollup.getEpochNumberForSlotNumber(slot);
63
- this.logger.info(`Pending block num: ${pendingNum}`);
64
- this.logger.info(`Proven block num: ${provenNum}`);
74
+ this.logger.info(`Pending checkpoint num: ${pendingNum}`);
75
+ this.logger.info(`Proven checkpoint num: ${provenNum}`);
65
76
  this.logger.info(`Validators: ${validators.map((v)=>v.toString()).join(', ')}`);
66
77
  this.logger.info(`Committee: ${committee?.map((v)=>v.toString()).join(', ')}`);
67
78
  this.logger.info(`Archive: ${archive}`);
@@ -75,7 +86,7 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
75
86
  ]);
76
87
  return {
77
88
  epochDuration,
78
- slotDuration
89
+ slotDuration: Number(slotDuration)
79
90
  };
80
91
  }
81
92
  /**
@@ -84,8 +95,9 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
84
95
  * @param opts - Options
85
96
  */ async advanceToEpoch(epoch, opts = {}) {
86
97
  const { epochDuration: slotsInEpoch } = await this.getConfig();
98
+ const slotNumber = SlotNumber(Number(epoch) * Number(slotsInEpoch));
87
99
  const timestamp = await this.rollup.read.getTimestampForSlot([
88
- BigInt(epoch) * slotsInEpoch
100
+ BigInt(slotNumber)
89
101
  ]) + BigInt(opts.offset ?? 0);
90
102
  try {
91
103
  await this.ethCheatCodes.warp(Number(timestamp), {
@@ -93,7 +105,10 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
93
105
  silent: true,
94
106
  resetBlockInterval: true
95
107
  });
96
- this.logger.warn(`Warped to epoch ${epoch}`);
108
+ this.logger.warn(`Warped to epoch ${epoch}`, {
109
+ offset: opts.offset,
110
+ timestamp
111
+ });
97
112
  } catch (err) {
98
113
  this.logger.warn(`Warp to epoch ${epoch} failed: ${err}`);
99
114
  }
@@ -102,8 +117,8 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
102
117
  /** Warps time in L1 until the next epoch */ async advanceToNextEpoch() {
103
118
  const slot = await this.getSlot();
104
119
  const { epochDuration, slotDuration } = await this.getConfig();
105
- const slotsUntilNextEpoch = epochDuration - slot % epochDuration + 1n;
106
- const timeToNextEpoch = slotsUntilNextEpoch * slotDuration;
120
+ const slotsUntilNextEpoch = epochDuration - BigInt(slot) % epochDuration + 1n;
121
+ const timeToNextEpoch = slotsUntilNextEpoch * BigInt(slotDuration);
107
122
  const l1Timestamp = BigInt((await this.client.getBlock()).timestamp);
108
123
  await this.ethCheatCodes.warp(Number(l1Timestamp + timeToNextEpoch), {
109
124
  silent: true,
@@ -113,17 +128,18 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
113
128
  }
114
129
  /** Warps time in L1 until the beginning of the next slot. */ async advanceToNextSlot() {
115
130
  const currentSlot = await this.getSlot();
131
+ const nextSlot = SlotNumber(currentSlot + 1);
116
132
  const timestamp = await this.rollup.read.getTimestampForSlot([
117
- currentSlot + 1n
133
+ BigInt(nextSlot)
118
134
  ]);
119
135
  await this.ethCheatCodes.warp(Number(timestamp), {
120
136
  silent: true,
121
137
  resetBlockInterval: true
122
138
  });
123
- this.logger.warn(`Advanced to slot ${currentSlot + 1n}`);
139
+ this.logger.warn(`Advanced to slot ${nextSlot}`);
124
140
  return [
125
141
  timestamp,
126
- currentSlot + 1n
142
+ nextSlot
127
143
  ];
128
144
  }
129
145
  /**
@@ -131,8 +147,8 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
131
147
  * @param howMany - The number of slots to advance.
132
148
  */ async advanceSlots(howMany) {
133
149
  const l1Timestamp = (await this.client.getBlock()).timestamp;
134
- const slotDuration = await this.rollup.read.getSlotDuration();
135
- const timeToWarp = BigInt(howMany) * slotDuration;
150
+ const slotDuration = Number(await this.rollup.read.getSlotDuration());
151
+ const timeToWarp = BigInt(howMany) * BigInt(slotDuration);
136
152
  await this.ethCheatCodes.warp(l1Timestamp + timeToWarp, {
137
153
  silent: true,
138
154
  resetBlockInterval: true
@@ -144,36 +160,36 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
144
160
  this.logger.warn(`Advanced ${howMany} slots up to slot ${slot} in epoch ${epoch}`);
145
161
  }
146
162
  /**
147
- * Marks the specified block (or latest if none) as proven
148
- * @param maybeBlockNumber - The block number to mark as proven (defaults to latest pending)
149
- */ markAsProven(maybeBlockNumber) {
163
+ * Marks the specified checkpoint (or latest if none) as proven
164
+ * @param maybeCheckpointNumber - The checkpoint number to mark as proven (defaults to latest pending)
165
+ */ markAsProven(maybeCheckpointNumber) {
150
166
  return this.ethCheatCodes.execWithPausedAnvil(async ()=>{
151
167
  const tipsBefore = await this.getTips();
152
168
  const { pending, proven } = tipsBefore;
153
- let blockNumber = maybeBlockNumber;
154
- if (blockNumber === undefined || blockNumber > pending) {
155
- blockNumber = pending;
169
+ let checkpointNumber = maybeCheckpointNumber;
170
+ if (checkpointNumber === undefined || checkpointNumber > pending) {
171
+ checkpointNumber = pending;
156
172
  }
157
- if (blockNumber <= proven) {
158
- this.logger.debug(`Block ${blockNumber} is already proven`);
173
+ if (checkpointNumber <= proven) {
174
+ this.logger.debug(`Checkpoint ${checkpointNumber} is already proven`);
159
175
  return;
160
176
  }
161
177
  // @note @LHerskind this is heavily dependent on the storage layout and size of values
162
178
  // The rollupStore is a struct and if the size of elements or the struct changes, this can break
163
- const provenBlockNumberSlot = hexToBigInt(RollupContract.stfStorageSlot);
179
+ const provenCheckpointNumberSlot = hexToBigInt(RollupContract.stfStorageSlot);
164
180
  // Need to pack it as a single 32 byte word
165
- const newValue = BigInt(tipsBefore.pending) << 128n | BigInt(blockNumber);
166
- await this.ethCheatCodes.store(EthAddress.fromString(this.rollup.address), provenBlockNumberSlot, newValue);
181
+ const newValue = BigInt(tipsBefore.pending) << 128n | BigInt(checkpointNumber);
182
+ await this.ethCheatCodes.store(EthAddress.fromString(this.rollup.address), provenCheckpointNumberSlot, newValue);
167
183
  const tipsAfter = await this.getTips();
168
184
  if (tipsAfter.pending < tipsAfter.proven) {
169
- throw new Error('Overwrote pending tip to a block in the past');
185
+ throw new Error('Overwrote pending tip to a checkpoint in the past');
170
186
  }
171
187
  this.logger.info(`Proven tip moved: ${tipsBefore.proven} -> ${tipsAfter.proven}. Pending tip: ${tipsAfter.pending}.`);
172
188
  });
173
189
  }
174
190
  /**
175
191
  * Overrides the inProgress field of the Inbox contract state
176
- * @param howMuch - How many blocks to move it forward
192
+ * @param howMuch - How many checkpoints to move it forward
177
193
  */ advanceInboxInProgress(howMuch) {
178
194
  return this.ethCheatCodes.execWithPausedAnvil(async ()=>{
179
195
  // Storage slot 2 contains the InboxState struct
@@ -204,6 +220,14 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
204
220
  return newInProgress;
205
221
  });
206
222
  }
223
+ insertOutbox(epoch, outHash) {
224
+ return this.ethCheatCodes.execWithPausedAnvil(async ()=>{
225
+ const outboxAddress = await this.rollup.read.getOutbox();
226
+ const epochRootSlot = OutboxContract.getEpochRootStorageSlot(epoch);
227
+ await this.ethCheatCodes.store(EthAddress.fromString(outboxAddress), epochRootSlot, outHash);
228
+ this.logger.warn(`Advanced outbox to epoch ${epoch} with out hash ${outHash}`);
229
+ });
230
+ }
207
231
  /**
208
232
  * Executes an action impersonated as the owner of the Rollup contract.
209
233
  * @param action - The action to execute
@@ -8,10 +8,13 @@ export declare function startAnvil(opts?: {
8
8
  log?: boolean;
9
9
  captureMethodCalls?: boolean;
10
10
  accounts?: number;
11
+ chainId?: number;
12
+ /** The hardfork to use - note: @viem/anvil types are out of date but 'cancun' and 'latest' work */
13
+ hardfork?: string;
11
14
  }): Promise<{
12
15
  anvil: Anvil;
13
16
  methodCalls?: string[];
14
17
  rpcUrl: string;
15
18
  stop: () => Promise<void>;
16
19
  }>;
17
- //# sourceMappingURL=start_anvil.d.ts.map
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYW52aWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L3N0YXJ0X2FudmlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFBRSxLQUFLLEtBQUssRUFBZSxNQUFNLGFBQWEsQ0FBQztBQUd0RDs7R0FFRztBQUNILHdCQUFzQixVQUFVLENBQzlCLElBQUksR0FBRTtJQUNKLElBQUksQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNkLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQixHQUFHLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDZCxrQkFBa0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUM3QixRQUFRLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEIsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLG1HQUFtRztJQUNuRyxRQUFRLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDZCxHQUNMLE9BQU8sQ0FBQztJQUFFLEtBQUssRUFBRSxLQUFLLENBQUM7SUFBQyxXQUFXLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFBQyxJQUFJLEVBQUUsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7Q0FBRSxDQUFDLENBaUQ5RiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;AAGtD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,GAAE;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACd,GACL,OAAO,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAgD9F"}
1
+ {"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;AAGtD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,GAAE;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mGAAmG;IACnG,QAAQ,CAAC,EAAE,MAAM,CAAC;CACd,GACL,OAAO,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAiD9F"}
@@ -16,11 +16,12 @@ import { dirname, resolve } from 'path';
16
16
  const anvil = createAnvil({
17
17
  anvilBinary,
18
18
  host: '127.0.0.1',
19
- port: opts.port ?? 8545,
19
+ port: opts.port ?? (process.env.ANVIL_PORT ? parseInt(process.env.ANVIL_PORT) : 8545),
20
20
  blockTime: opts.l1BlockTime,
21
21
  stopTimeout: 1000,
22
22
  accounts: opts.accounts ?? 20,
23
- gasLimit: 45_000_000n
23
+ gasLimit: 45_000_000n,
24
+ chainId: opts.chainId ?? 31337
24
25
  });
25
26
  // Listen to the anvil output to get the port.
26
27
  const removeHandler = anvil.on('message', (message)=>{
@@ -33,4 +33,4 @@ export declare function withDelayer<T extends ViemClient>(client: T, dateProvide
33
33
  client: T;
34
34
  delayer: Delayer;
35
35
  };
36
- //# sourceMappingURL=tx_delayer.d.ts.map
36
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZGVsYXllci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvdHhfZGVsYXllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFbEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHNUQsT0FBTyxFQUNMLEtBQUssTUFBTSxFQUNYLEtBQUssR0FBRyxFQVFULE1BQU0sTUFBTSxDQUFDO0FBRWQsT0FBTyxFQUFFLEtBQUssVUFBVSxFQUFvQixNQUFNLGFBQWEsQ0FBQztBQUloRSx3QkFBZ0IsY0FBYyxDQUFDLENBQUMsU0FBUyxNQUFNLEVBQzdDLE1BQU0sRUFBRSxDQUFDLEVBQ1QsV0FBVyxFQUFFLE1BQU0sR0FBRyxNQUFNLEVBQzVCLE1BQU0sQ0FBQyxFQUFFLE1BQU0sRUFDZixPQUFPLENBQUMsRUFBRSxNQUFNLG9CQWlCakI7QUFFRCx3QkFBZ0Isb0JBQW9CLENBQUMsQ0FBQyxTQUFTLE1BQU0sRUFDbkQsTUFBTSxFQUFFLENBQUMsRUFDVCxTQUFTLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFDMUIsTUFBTSxDQUFDLEVBQUUsTUFBTSxFQUNmLE9BQU8sQ0FBQyxFQUFFLE1BQU0sb0JBd0JqQjtBQUVELE1BQU0sV0FBVyxPQUFPO0lBQ3RCLHNEQUFzRDtJQUN0RCxlQUFlLElBQUksR0FBRyxFQUFFLENBQUM7SUFDekIsaURBQWlEO0lBQ2pELGVBQWUsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUN6Qiw4RUFBOEU7SUFDOUUscUJBQXFCLENBQUMsYUFBYSxFQUFFLE1BQU0sR0FBRyxNQUFNLEdBQUcsU0FBUyxHQUFHLElBQUksQ0FBQztJQUN4RSx3RUFBd0U7SUFDeEUseUJBQXlCLENBQUMsV0FBVyxFQUFFLE1BQU0sR0FBRyxNQUFNLEdBQUcsU0FBUyxHQUFHLElBQUksQ0FBQztJQUMxRSxrREFBa0Q7SUFDbEQsWUFBWSxJQUFJLElBQUksQ0FBQztJQUNyQjs7OztPQUlHO0lBQ0gsMkJBQTJCLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRyxNQUFNLEdBQUcsU0FBUyxHQUFHLElBQUksQ0FBQztDQUN6RTtBQTBDRDs7OztHQUlHO0FBQ0gsd0JBQWdCLFdBQVcsQ0FBQyxDQUFDLFNBQVMsVUFBVSxFQUM5QyxNQUFNLEVBQUUsQ0FBQyxFQUNULFlBQVksRUFBRSxZQUFZLEVBQzFCLElBQUksRUFBRTtJQUFFLG9CQUFvQixFQUFFLE1BQU0sR0FBRyxNQUFNLENBQUE7Q0FBRSxHQUM5QztJQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7SUFBQyxPQUFPLEVBQUUsT0FBTyxDQUFBO0NBQUUsQ0EwR2pDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"tx_delayer.d.ts","sourceRoot":"","sources":["../../src/test/tx_delayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACL,KAAK,MAAM,EACX,KAAK,GAAG,EAQT,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,KAAK,UAAU,EAAoB,MAAM,aAAa,CAAC;AAEhE,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAC7C,MAAM,EAAE,CAAC,EACT,WAAW,EAAE,MAAM,GAAG,MAAM,EAC5B,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,oBAiBjB;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,EACnD,MAAM,EAAE,CAAC,EACT,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,oBAwBjB;AAED,MAAM,WAAW,OAAO;IACtB,sDAAsD;IACtD,eAAe,IAAI,GAAG,EAAE,CAAC;IACzB,iDAAiD;IACjD,eAAe,IAAI,GAAG,EAAE,CAAC;IACzB,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;IAC1E,kDAAkD;IAClD,YAAY,IAAI,IAAI,CAAC;IACrB;;;;OAIG;IACH,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CACzE;AA0CD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAC9C,MAAM,EAAE,CAAC,EACT,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC9C;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA0GjC"}
1
+ {"version":3,"file":"tx_delayer.d.ts","sourceRoot":"","sources":["../../src/test/tx_delayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACL,KAAK,MAAM,EACX,KAAK,GAAG,EAQT,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,KAAK,UAAU,EAAoB,MAAM,aAAa,CAAC;AAIhE,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAC7C,MAAM,EAAE,CAAC,EACT,WAAW,EAAE,MAAM,GAAG,MAAM,EAC5B,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,oBAiBjB;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,EACnD,MAAM,EAAE,CAAC,EACT,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,oBAwBjB;AAED,MAAM,WAAW,OAAO;IACtB,sDAAsD;IACtD,eAAe,IAAI,GAAG,EAAE,CAAC;IACzB,iDAAiD;IACjD,eAAe,IAAI,GAAG,EAAE,CAAC;IACzB,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;IAC1E,kDAAkD;IAClD,YAAY,IAAI,IAAI,CAAC;IACrB;;;;OAIG;IACH,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CACzE;AA0CD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAC9C,MAAM,EAAE,CAAC,EACT,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC9C;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA0GjC"}
@@ -4,6 +4,7 @@ import { retryUntil } from '@aztec/foundation/retry';
4
4
  import { inspect } from 'util';
5
5
  import { keccak256, parseTransaction, publicActions, serializeTransaction, walletActions } from 'viem';
6
6
  import { isExtendedClient } from '../types.js';
7
+ const MAX_WAIT_TIME_SECONDS = 180;
7
8
  export function waitUntilBlock(client, blockNumber, logger, timeout) {
8
9
  const publicClient = 'getBlockNumber' in client && typeof client.getBlockNumber === 'function' ? client : client.extend(publicActions);
9
10
  return retryUntil(async ()=>{
@@ -12,7 +13,7 @@ export function waitUntilBlock(client, blockNumber, logger, timeout) {
12
13
  });
13
14
  logger?.debug(`Block number is ${currentBlockNumber} (waiting until ${blockNumber})`);
14
15
  return currentBlockNumber >= BigInt(blockNumber);
15
- }, `Wait until L1 block ${blockNumber}`, timeout ?? 120, 0.1);
16
+ }, `Wait until L1 block ${blockNumber}`, timeout ?? MAX_WAIT_TIME_SECONDS, 0.1);
16
17
  }
17
18
  export function waitUntilL1Timestamp(client, timestamp, logger, timeout) {
18
19
  const publicClient = 'getBlockNumber' in client && typeof client.getBlockNumber === 'function' ? client : client.extend(publicActions);
@@ -32,7 +33,7 @@ export function waitUntilL1Timestamp(client, timestamp, logger, timeout) {
32
33
  const currentTs = currentBlock.timestamp;
33
34
  logger?.debug(`Block timstamp is ${currentTs} (waiting until ${timestamp})`);
34
35
  return currentTs >= BigInt(timestamp);
35
- }, `Wait until L1 timestamp ${timestamp}`, timeout ?? 120, 0.1);
36
+ }, `Wait until L1 timestamp ${timestamp}`, timeout ?? MAX_WAIT_TIME_SECONDS, 0.1);
36
37
  }
37
38
  class DelayerImpl {
38
39
  dateProvider;
@@ -155,7 +156,7 @@ class DelayerImpl {
155
156
  return Promise.resolve(txHash);
156
157
  } else {
157
158
  const txHash = await client.sendRawTransaction(...args);
158
- logger.verbose(`Sent tx immediately ${txHash}`);
159
+ logger.debug(`Sent tx immediately ${txHash}`);
159
160
  delayer.sentTxHashes.push(txHash);
160
161
  return txHash;
161
162
  }
@@ -9,4 +9,4 @@ export declare function createGovernanceProposal(payloadAddress: `0x${string}`,
9
9
  voteAmount: bigint;
10
10
  proposalId: bigint;
11
11
  }>;
12
- //# sourceMappingURL=upgrade_utils.d.ts.map
12
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBncmFkZV91dGlscy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvdXBncmFkZV91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFHbEUsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQUUsS0FBSyxpQkFBaUIsRUFBZSxNQUFNLE1BQU0sQ0FBQztBQUd2RixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRXZFLE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRzlFLHdCQUFzQix5QkFBeUIsQ0FDN0MsVUFBVSxFQUFFLE1BQU0sRUFDbEIsVUFBVSxFQUFFLHFCQUFxQixDQUFDLE9BQU8sYUFBYSxFQUFFLGdCQUFnQixDQUFDLEVBQ3pFLFVBQVUsRUFBRSxNQUFNLEVBQ2xCLFVBQVUsRUFBRSxpQkFBaUIsRUFDN0IsUUFBUSxFQUFFLHdCQUF3QixFQUNsQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQ2pCLE1BQU0sRUFBRSxNQUFNLGlCQW1DZjtBQUVELHdCQUFzQix3QkFBd0IsQ0FDNUMsY0FBYyxFQUFFLEtBQUssTUFBTSxFQUFFLEVBQzdCLFNBQVMsRUFBRSxtQkFBbUIsRUFDOUIsVUFBVSxFQUFFLGlCQUFpQixFQUM3QixZQUFZLEVBQUUsZ0JBQWdCLEVBQzlCLE1BQU0sRUFBRSxNQUFNLEdBQ2IsT0FBTyxDQUFDO0lBQ1QsVUFBVSxFQUFFLHFCQUFxQixDQUFDLE9BQU8sYUFBYSxFQUFFLGdCQUFnQixDQUFDLENBQUM7SUFDMUUsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQixVQUFVLEVBQUUsTUFBTSxDQUFDO0NBQ3BCLENBQUMsQ0F5Q0QifQ==
package/dest/types.d.ts CHANGED
@@ -1,6 +1,61 @@
1
- import type { Abi, Account, Chain, Client, FallbackTransport, GetContractReturnType, HttpTransport, PublicActions, PublicClient, PublicRpcSchema, WalletActions, WalletRpcSchema } from 'viem';
1
+ import type { Abi, Account, Chain, Client, FallbackTransport, GetContractReturnType, Hex, HttpTransport, PublicActions, PublicClient, PublicRpcSchema, WalletActions, WalletRpcSchema } from 'viem';
2
2
  /** Type for a viem public client */
3
3
  export type ViemPublicClient = PublicClient<FallbackTransport<HttpTransport[]>, Chain>;
4
+ export type PublicRpcDebugSchema = [
5
+ {
6
+ Method: 'debug_traceTransaction';
7
+ Parameters: [txHash: `0x${string}`, options: {
8
+ tracer: 'callTracer';
9
+ }];
10
+ ReturnType: DebugCallTrace;
11
+ },
12
+ {
13
+ Method: 'trace_transaction';
14
+ Parameters: [txHash: `0x${string}`];
15
+ ReturnType: TraceTransactionResponse[];
16
+ }
17
+ ];
18
+ /** Return type for a debug_traceTransaction call */
19
+ export type DebugCallTrace = {
20
+ from: Hex;
21
+ to?: Hex;
22
+ type: string;
23
+ input?: Hex;
24
+ output?: Hex;
25
+ gas?: Hex;
26
+ gasUsed?: Hex;
27
+ value?: Hex;
28
+ error?: string;
29
+ calls?: DebugCallTrace[];
30
+ };
31
+ /** Action object for a trace_transaction call */
32
+ export type TraceAction = {
33
+ from: Hex;
34
+ to?: Hex;
35
+ callType: string;
36
+ gas?: Hex;
37
+ input?: Hex;
38
+ value?: Hex;
39
+ };
40
+ /** Result object for a trace_transaction call */
41
+ export type TraceResult = {
42
+ gasUsed?: Hex;
43
+ output?: Hex;
44
+ };
45
+ /** Return type for a single trace in trace_transaction response */
46
+ export type TraceTransactionResponse = {
47
+ action: TraceAction;
48
+ result?: TraceResult;
49
+ error?: string;
50
+ subtraces: number;
51
+ traceAddress: number[];
52
+ type: string;
53
+ };
54
+ /** Type for a viem public client with support for debug methods */
55
+ export type ViemPublicDebugClient = PublicClient<FallbackTransport<HttpTransport[]>, Chain, undefined, [
56
+ ...PublicRpcSchema,
57
+ ...PublicRpcDebugSchema
58
+ ]>;
4
59
  export type ExtendedViemWalletClient = Client<FallbackTransport<readonly HttpTransport[]>, Chain, Account, [
5
60
  ...PublicRpcSchema,
6
61
  ...WalletRpcSchema
@@ -10,4 +65,4 @@ export type ViemClient = ViemPublicClient | ExtendedViemWalletClient;
10
65
  /** Type for a viem contract that can be used with an extended viem client */
11
66
  export type ViemContract<TAbi extends Abi> = GetContractReturnType<TAbi, ExtendedViemWalletClient>;
12
67
  export declare function isExtendedClient(client: ViemClient): client is ExtendedViemWalletClient;
13
- //# sourceMappingURL=types.d.ts.map
68
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFDVixHQUFHLEVBQ0gsT0FBTyxFQUNQLEtBQUssRUFDTCxNQUFNLEVBQ04saUJBQWlCLEVBQ2pCLHFCQUFxQixFQUNyQixHQUFHLEVBQ0gsYUFBYSxFQUNiLGFBQWEsRUFDYixZQUFZLEVBQ1osZUFBZSxFQUNmLGFBQWEsRUFDYixlQUFlLEVBQ2hCLE1BQU0sTUFBTSxDQUFDO0FBRWQsb0NBQW9DO0FBQ3BDLE1BQU0sTUFBTSxnQkFBZ0IsR0FBRyxZQUFZLENBQUMsaUJBQWlCLENBQUMsYUFBYSxFQUFFLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQztBQUV2RixNQUFNLE1BQU0sb0JBQW9CLEdBQUc7SUFDakM7UUFDRSxNQUFNLEVBQUUsd0JBQXdCLENBQUM7UUFDakMsVUFBVSxFQUFFLENBQUMsTUFBTSxFQUFFLEtBQUssTUFBTSxFQUFFLEVBQUUsT0FBTyxFQUFFO1lBQUUsTUFBTSxFQUFFLFlBQVksQ0FBQTtTQUFFLENBQUMsQ0FBQztRQUN2RSxVQUFVLEVBQUUsY0FBYyxDQUFDO0tBQzVCO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsbUJBQW1CLENBQUM7UUFDNUIsVUFBVSxFQUFFLENBQUMsTUFBTSxFQUFFLEtBQUssTUFBTSxFQUFFLENBQUMsQ0FBQztRQUNwQyxVQUFVLEVBQUUsd0JBQXdCLEVBQUUsQ0FBQztLQUN4QztDQUNGLENBQUM7QUFFRixvREFBb0Q7QUFDcEQsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQixJQUFJLEVBQUUsR0FBRyxDQUFDO0lBQ1YsRUFBRSxDQUFDLEVBQUUsR0FBRyxDQUFDO0lBQ1QsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLEtBQUssQ0FBQyxFQUFFLEdBQUcsQ0FBQztJQUNaLE1BQU0sQ0FBQyxFQUFFLEdBQUcsQ0FBQztJQUNiLEdBQUcsQ0FBQyxFQUFFLEdBQUcsQ0FBQztJQUNWLE9BQU8sQ0FBQyxFQUFFLEdBQUcsQ0FBQztJQUNkLEtBQUssQ0FBQyxFQUFFLEdBQUcsQ0FBQztJQUNaLEtBQUssQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNmLEtBQUssQ0FBQyxFQUFFLGNBQWMsRUFBRSxDQUFDO0NBQzFCLENBQUM7QUFFRixpREFBaUQ7QUFDakQsTUFBTSxNQUFNLFdBQVcsR0FBRztJQUN4QixJQUFJLEVBQUUsR0FBRyxDQUFDO0lBQ1YsRUFBRSxDQUFDLEVBQUUsR0FBRyxDQUFDO0lBQ1QsUUFBUSxFQUFFLE1BQU0sQ0FBQztJQUNqQixHQUFHLENBQUMsRUFBRSxHQUFHLENBQUM7SUFDVixLQUFLLENBQUMsRUFBRSxHQUFHLENBQUM7SUFDWixLQUFLLENBQUMsRUFBRSxHQUFHLENBQUM7Q0FDYixDQUFDO0FBRUYsaURBQWlEO0FBQ2pELE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEIsT0FBTyxDQUFDLEVBQUUsR0FBRyxDQUFDO0lBQ2QsTUFBTSxDQUFDLEVBQUUsR0FBRyxDQUFDO0NBQ2QsQ0FBQztBQUVGLG1FQUFtRTtBQUNuRSxNQUFNLE1BQU0sd0JBQXdCLEdBQUc7SUFDckMsTUFBTSxFQUFFLFdBQVcsQ0FBQztJQUNwQixNQUFNLENBQUMsRUFBRSxXQUFXLENBQUM7SUFDckIsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixZQUFZLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDdkIsSUFBSSxFQUFFLE1BQU0sQ0FBQztDQUNkLENBQUM7QUFFRixtRUFBbUU7QUFDbkUsTUFBTSxNQUFNLHFCQUFxQixHQUFHLFlBQVksQ0FDOUMsaUJBQWlCLENBQUMsYUFBYSxFQUFFLENBQUMsRUFDbEMsS0FBSyxFQUNMLFNBQVMsRUFDVDtJQUFDLEdBQUcsZUFBZTtJQUFFLEdBQUcsb0JBQW9CO0NBQUMsQ0FDOUMsQ0FBQztBQUVGLE1BQU0sTUFBTSx3QkFBd0IsR0FBRyxNQUFNLENBQzNDLGlCQUFpQixDQUFDLFNBQVMsYUFBYSxFQUFFLENBQUMsRUFDM0MsS0FBSyxFQUNMLE9BQU8sRUFDUDtJQUFDLEdBQUcsZUFBZTtJQUFFLEdBQUcsZUFBZTtDQUFDLEVBQ3hDLGFBQWEsQ0FBQyxpQkFBaUIsQ0FBQyxTQUFTLGFBQWEsRUFBRSxDQUFDLEVBQUUsS0FBSyxDQUFDLEdBQUcsYUFBYSxDQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsQ0FDbEcsQ0FBQztBQUVGLDRGQUE0RjtBQUM1RixNQUFNLE1BQU0sVUFBVSxHQUFHLGdCQUFnQixHQUFHLHdCQUF3QixDQUFDO0FBRXJFLDZFQUE2RTtBQUM3RSxNQUFNLE1BQU0sWUFBWSxDQUFDLElBQUksU0FBUyxHQUFHLElBQUkscUJBQXFCLENBQUMsSUFBSSxFQUFFLHdCQUF3QixDQUFDLENBQUM7QUFFbkcsd0JBQWdCLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxVQUFVLEdBQUcsTUFBTSxJQUFJLHdCQUF3QixDQUV2RiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,OAAO,EACP,KAAK,EACL,MAAM,EACN,iBAAiB,EACjB,qBAAqB,EACrB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,eAAe,EACf,aAAa,EACb,eAAe,EAChB,MAAM,MAAM,CAAC;AAEd,oCAAoC;AACpC,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AAEvF,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAC3C,iBAAiB,CAAC,SAAS,aAAa,EAAE,CAAC,EAC3C,KAAK,EACL,OAAO,EACP;IAAC,GAAG,eAAe;IAAE,GAAG,eAAe;CAAC,EACxC,aAAa,CAAC,iBAAiB,CAAC,SAAS,aAAa,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAClG,CAAC;AAEF,4FAA4F;AAC5F,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,wBAAwB,CAAC;AAErE,6EAA6E;AAC7E,MAAM,MAAM,YAAY,CAAC,IAAI,SAAS,GAAG,IAAI,qBAAqB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;AAEnG,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,IAAI,wBAAwB,CAEvF"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,OAAO,EACP,KAAK,EACL,MAAM,EACN,iBAAiB,EACjB,qBAAqB,EACrB,GAAG,EACH,aAAa,EACb,aAAa,EACb,YAAY,EACZ,eAAe,EACf,aAAa,EACb,eAAe,EAChB,MAAM,MAAM,CAAC;AAEd,oCAAoC;AACpC,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AAEvF,MAAM,MAAM,oBAAoB,GAAG;IACjC;QACE,MAAM,EAAE,wBAAwB,CAAC;QACjC,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,MAAM,EAAE,EAAE,OAAO,EAAE;YAAE,MAAM,EAAE,YAAY,CAAA;SAAE,CAAC,CAAC;QACvE,UAAU,EAAE,cAAc,CAAC;KAC5B;IACD;QACE,MAAM,EAAE,mBAAmB,CAAC;QAC5B,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,MAAM,EAAE,CAAC,CAAC;QACpC,UAAU,EAAE,wBAAwB,EAAE,CAAC;KACxC;CACF,CAAC;AAEF,oDAAoD;AACpD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,GAAG,CAAC;IACV,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;CAC1B,CAAC;AAEF,iDAAiD;AACjD,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,GAAG,CAAC;IACV,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,GAAG,CAAC;CACb,CAAC;AAEF,iDAAiD;AACjD,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,GAAG,CAAC;CACd,CAAC;AAEF,mEAAmE;AACnE,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,mEAAmE;AACnE,MAAM,MAAM,qBAAqB,GAAG,YAAY,CAC9C,iBAAiB,CAAC,aAAa,EAAE,CAAC,EAClC,KAAK,EACL,SAAS,EACT;IAAC,GAAG,eAAe;IAAE,GAAG,oBAAoB;CAAC,CAC9C,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAC3C,iBAAiB,CAAC,SAAS,aAAa,EAAE,CAAC,EAC3C,KAAK,EACL,OAAO,EACP;IAAC,GAAG,eAAe;IAAE,GAAG,eAAe;CAAC,EACxC,aAAa,CAAC,iBAAiB,CAAC,SAAS,aAAa,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAClG,CAAC;AAEF,4FAA4F;AAC5F,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,wBAAwB,CAAC;AAErE,6EAA6E;AAC7E,MAAM,MAAM,YAAY,CAAC,IAAI,SAAS,GAAG,IAAI,qBAAqB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;AAEnG,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,IAAI,wBAAwB,CAEvF"}
package/dest/utils.d.ts CHANGED
@@ -1,6 +1,6 @@
1
- import type { Fr } from '@aztec/foundation/fields';
1
+ import type { Fr } from '@aztec/foundation/curves/bn254';
2
2
  import type { Logger } from '@aztec/foundation/log';
3
- import { type Abi, type ContractEventName, type DecodeEventLogReturnType, type Hex, type Log } from 'viem';
3
+ import { type Abi, type ContractEventName, type DecodeEventLogReturnType, type FormattedTransaction, type Hex, type Log } from 'viem';
4
4
  export interface L2Claim {
5
5
  claimSecret: Fr;
6
6
  claimAmount: Fr;
@@ -14,6 +14,7 @@ export declare class FormattedViemError extends Error {
14
14
  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;
15
15
  export declare function tryExtractEvent<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 | undefined;
16
16
  export declare function prettyLogViemErrorMsg(err: any): any;
17
+ export declare function mergeAbis(abis: Abi[]): Abi;
17
18
  /**
18
19
  * Formats a Viem error into a FormattedViemError instance.
19
20
  * @param error - The error to format.
@@ -22,4 +23,16 @@ export declare function prettyLogViemErrorMsg(err: any): any;
22
23
  */
23
24
  export declare function formatViemError(error: any, abi?: Abi): FormattedViemError;
24
25
  export declare function tryGetCustomErrorName(err: any): string | undefined;
25
- //# sourceMappingURL=utils.d.ts.map
26
+ /**
27
+ * Type guard to check if a transaction is a blob transaction (EIP-4844).
28
+ * Blob transactions have maxFeePerBlobGas and blobVersionedHashes fields.
29
+ */
30
+ export declare function isBlobTransaction(tx: FormattedTransaction): tx is FormattedTransaction & {
31
+ maxFeePerBlobGas: bigint;
32
+ blobVersionedHashes: readonly Hex[];
33
+ };
34
+ /**
35
+ * Calculates a percentile from an array of bigints
36
+ */
37
+ export declare function calculatePercentile(values: bigint[], percentile: number): bigint;
38
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEVBQ0wsS0FBSyxHQUFHLEVBR1IsS0FBSyxpQkFBaUIsRUFFdEIsS0FBSyx3QkFBd0IsRUFDN0IsS0FBSyxvQkFBb0IsRUFDekIsS0FBSyxHQUFHLEVBQ1IsS0FBSyxHQUFHLEVBR1QsTUFBTSxNQUFNLENBQUM7QUFHZCxNQUFNLFdBQVcsT0FBTztJQUN0QixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxFQUFFLENBQUM7SUFDaEIsV0FBVyxFQUFFLEdBQUcsQ0FBQztJQUNqQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUI7QUFFRCxxQkFBYSxrQkFBbUIsU0FBUSxLQUFLO0lBQzNDLFlBQVksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO0lBRXJCLFlBQVksT0FBTyxFQUFFLE1BQU0sRUFBRSxZQUFZLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFJaEQ7Q0FDRjtBQUVELHdCQUFnQixZQUFZLENBQzFCLEtBQUssQ0FBQyxJQUFJLFNBQVMsR0FBRyxHQUFHLFNBQVMsT0FBTyxFQUFFLEVBQzNDLFVBQVUsU0FBUyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFDMUMsVUFBVSxHQUFHLHdCQUF3QixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxFQUUvRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsT0FBTyxFQUFFLEdBQUcsRUFDWixHQUFHLEVBQUUsSUFBSSxFQUNULFNBQVMsRUFBRSxVQUFVLEVBQ3JCLE1BQU0sQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLFVBQVUsS0FBSyxPQUFPLEVBQ3JDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FDZCxVQUFVLENBTVo7QUFFRCx3QkFBZ0IsZUFBZSxDQUM3QixLQUFLLENBQUMsSUFBSSxTQUFTLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxFQUMzQyxVQUFVLFNBQVMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQzFDLFVBQVUsR0FBRyx3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsRUFFL0UsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLE9BQU8sRUFBRSxHQUFHLEVBQ1osR0FBRyxFQUFFLElBQUksRUFDVCxTQUFTLEVBQUUsVUFBVSxFQUNyQixNQUFNLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxVQUFVLEtBQUssT0FBTyxFQUNyQyxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsVUFBVSxHQUFHLFNBQVMsQ0FnQnhCO0FBRUQsd0JBQWdCLHFCQUFxQixDQUFDLEdBQUcsRUFBRSxHQUFHLE9BVzdDO0FBRUQsd0JBQWdCLFNBQVMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsR0FBRyxDQWUxQztBQTRERDs7Ozs7R0FLRztBQUNILHdCQUFnQixlQUFlLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxHQUFHLEdBQUUsR0FBZSxHQUFHLGtCQUFrQixDQXdFcEY7QUF5QkQsd0JBQWdCLHFCQUFxQixDQUFDLEdBQUcsRUFBRSxHQUFHLHNCQWE3QztBQUVEOzs7R0FHRztBQUNILHdCQUFnQixpQkFBaUIsQ0FBQyxFQUFFLEVBQUUsb0JBQW9CLEdBQUcsRUFBRSxJQUFJLG9CQUFvQixHQUFHO0lBQ3hGLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6QixtQkFBbUIsRUFBRSxTQUFTLEdBQUcsRUFBRSxDQUFDO0NBQ3JDLENBT0E7QUFFRDs7R0FFRztBQUNILHdCQUFnQixtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsVUFBVSxFQUFFLE1BQU0sR0FBRyxNQUFNLENBT2hGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAER,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,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,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;gBAET,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE;CAKlD;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;AAED,wBAAgB,eAAe,CAC7B,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,GAAG,SAAS,CAgBxB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AA0BD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CAwEpF;AAyBD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAGR,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAGd,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,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IAErB,YAAY,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,EAIhD;CACF;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;AAED,wBAAgB,eAAe,CAC7B,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,GAAG,SAAS,CAgBxB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAe1C;AA4DD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CAwEpF;AAyBD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,oBAAoB,GAAG,EAAE,IAAI,oBAAoB,GAAG;IACxF,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,SAAS,GAAG,EAAE,CAAC;CACrC,CAOA;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAOhF"}
package/dest/utils.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { ErrorsAbi } from '@aztec/l1-artifacts/ErrorsAbi';
2
2
  import { BaseError, ContractFunctionRevertedError, decodeErrorResult, decodeEventLog } from 'viem';
3
+ import { formatAbiItem, formatAbiParams } from 'viem/utils';
3
4
  export class FormattedViemError extends Error {
4
5
  metaMessages;
5
6
  constructor(message, metaMessages){
@@ -46,6 +47,51 @@ export function prettyLogViemErrorMsg(err) {
46
47
  }
47
48
  return err?.message ?? err;
48
49
  }
50
+ export function mergeAbis(abis) {
51
+ let merged = [];
52
+ const seen = new Set();
53
+ for (const abi of abis){
54
+ for (const item of abi){
55
+ const key = getAbiItemKey(item);
56
+ if (!seen.has(key)) {
57
+ seen.add(key);
58
+ merged = [
59
+ ...merged,
60
+ item
61
+ ];
62
+ }
63
+ }
64
+ }
65
+ return merged;
66
+ }
67
+ function getAbiItemKey(item) {
68
+ if (item.type === 'function') {
69
+ const signature = formatAbiItem(item);
70
+ const outputs = formatAbiParams(item.outputs);
71
+ const stateMutability = typeof item.stateMutability === 'string' ? item.stateMutability : '';
72
+ return `function:${signature}:${outputs}:${stateMutability}`;
73
+ }
74
+ if (item.type === 'event') {
75
+ const signature = formatAbiItem(item);
76
+ const indexed = (item.inputs ?? []).map((input)=>input.indexed ? '1' : '0').join('');
77
+ const anonymous = item.anonymous ? 'anonymous' : 'not-anonymous';
78
+ return `event:${signature}:${indexed}:${anonymous}`;
79
+ }
80
+ if (item.type === 'error') {
81
+ const signature = formatAbiItem(item);
82
+ return `error:${signature}`;
83
+ }
84
+ if (item.type === 'constructor') {
85
+ const inputs = formatAbiParams(item.inputs);
86
+ const stateMutability = typeof item.stateMutability === 'string' ? item.stateMutability : '';
87
+ return `constructor::${inputs}:${stateMutability}`;
88
+ }
89
+ if (item.type === 'fallback' || item.type === 'receive') {
90
+ const stateMutability = typeof item.stateMutability === 'string' ? item.stateMutability : '';
91
+ return `${item.type}:::${stateMutability}`;
92
+ }
93
+ return 'unknown';
94
+ }
49
95
  function getNestedErrorData(error) {
50
96
  // If nothing, bail
51
97
  if (!error) {
@@ -162,3 +208,21 @@ export function tryGetCustomErrorName(err) {
162
208
  return undefined;
163
209
  }
164
210
  }
211
+ /**
212
+ * Type guard to check if a transaction is a blob transaction (EIP-4844).
213
+ * Blob transactions have maxFeePerBlobGas and blobVersionedHashes fields.
214
+ */ export function isBlobTransaction(tx) {
215
+ return 'maxFeePerBlobGas' in tx && tx.maxFeePerBlobGas !== undefined && 'blobVersionedHashes' in tx && tx.blobVersionedHashes !== undefined;
216
+ }
217
+ /**
218
+ * Calculates a percentile from an array of bigints
219
+ */ export function calculatePercentile(values, percentile) {
220
+ if (values.length === 0) {
221
+ return 0n;
222
+ }
223
+ const sorted = [
224
+ ...values
225
+ ].sort((a, b)=>a < b ? -1 : a > b ? 1 : 0);
226
+ const index = Math.ceil((sorted.length - 1) * (percentile / 100));
227
+ return sorted[index];
228
+ }
@@ -12,4 +12,4 @@ export declare const ZK_PASSPORT_DOMAIN = "testnet.aztec.network";
12
12
  * The default scope of the zk passport proofs
13
13
  */
14
14
  export declare const ZK_PASSPORT_SCOPE = "personhood";
15
- //# sourceMappingURL=zkPassportVerifierAddress.d.ts.map
15
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiemtQYXNzcG9ydFZlcmlmaWVyQWRkcmVzcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3prUGFzc3BvcnRWZXJpZmllckFkZHJlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNEOzs7R0FHRztBQUNILGVBQU8sTUFBTSw0QkFBNEIsWUFBc0UsQ0FBQztBQUNoSDs7R0FFRztBQUNILGVBQU8sTUFBTSxrQkFBa0IsMEJBQTBCLENBQUM7QUFDMUQ7O0dBRUc7QUFDSCxlQUFPLE1BQU0saUJBQWlCLGVBQWUsQ0FBQyJ9
package/package.json CHANGED
@@ -1,14 +1,32 @@
1
1
  {
2
2
  "name": "@aztec/ethereum",
3
- "version": "0.0.1-commit.24de95ac",
3
+ "version": "0.0.1-commit.2e2504e2",
4
4
  "type": "module",
5
5
  "exports": {
6
- ".": "./dest/index.js",
7
- "./test": "./dest/test/index.js",
6
+ "./account": "./dest/account.js",
7
+ "./chain": "./dest/chain.js",
8
+ "./client": "./dest/client.js",
9
+ "./config": "./dest/config.js",
10
+ "./constants": "./dest/constants.js",
8
11
  "./contracts": "./dest/contracts/index.js",
9
- "./deploy-l1-contracts": "./dest/deploy_l1_contracts.js",
12
+ "./deploy-aztec-l1-contracts": "./dest/deploy_aztec_l1_contracts.js",
13
+ "./deploy-l1-contract": "./dest/deploy_l1_contract.js",
14
+ "./contracts/registry": "./dest/contracts/registry.js",
15
+ "./contracts/rollup": "./dest/contracts/rollup.js",
16
+ "./eth-signer": "./dest/eth-signer/index.js",
17
+ "./forwarder-proxy": "./dest/forwarder_proxy.js",
18
+ "./l1-artifacts": "./dest/l1_artifacts.js",
10
19
  "./l1-contract-addresses": "./dest/l1_contract_addresses.js",
11
- "./l1-tx-utils-with-blobs": "./dest/l1_tx_utils/l1_tx_utils_with_blobs.js",
20
+ "./l1-fee-analysis": "./dest/l1_tx_utils/l1_fee_analyzer.js",
21
+ "./l1-reader": "./dest/l1_reader.js",
22
+ "./l1-tx-utils": "./dest/l1_tx_utils/index.js",
23
+ "./l1-tx-utils-with-blobs": "./dest/l1_tx_utils/index-blobs.js",
24
+ "./l1-tx-utils/config": "./dest/l1_tx_utils/config.js",
25
+ "./l1-types": "./dest/l1_types.js",
26
+ "./publisher-manager": "./dest/publisher_manager.js",
27
+ "./queries": "./dest/queries.js",
28
+ "./test": "./dest/test/index.js",
29
+ "./types": "./dest/types.js",
12
30
  "./utils": "./dest/utils.js"
13
31
  },
14
32
  "typedocOptions": {
@@ -19,10 +37,11 @@
19
37
  "tsconfig": "./tsconfig.json"
20
38
  },
21
39
  "scripts": {
22
- "build": "yarn clean && tsc -b",
23
- "build:dev": "tsc -b --watch",
40
+ "build": "yarn clean && ../scripts/tsc.sh",
41
+ "build:dev": "../scripts/tsc.sh --watch",
24
42
  "clean": "rm -rf ./dest .tsbuildinfo",
25
- "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'",
43
+ "generate": "./scripts/generate.sh",
44
+ "start:dev": "concurrently -k \"../scripts/tsc.sh --watch\" \"nodemon --watch dest --exec yarn start\"",
26
45
  "start": "node ./dest/index.js",
27
46
  "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
28
47
  "proposer-address": "node ./dest/cli/forwarder_address.js"
@@ -31,16 +50,16 @@
31
50
  "../package.common.json"
32
51
  ],
33
52
  "dependencies": {
34
- "@aztec/blob-lib": "0.0.1-commit.24de95ac",
35
- "@aztec/constants": "0.0.1-commit.24de95ac",
36
- "@aztec/foundation": "0.0.1-commit.24de95ac",
37
- "@aztec/l1-artifacts": "0.0.1-commit.24de95ac",
53
+ "@aztec/blob-lib": "0.0.1-commit.2e2504e2",
54
+ "@aztec/constants": "0.0.1-commit.2e2504e2",
55
+ "@aztec/foundation": "0.0.1-commit.2e2504e2",
56
+ "@aztec/l1-artifacts": "0.0.1-commit.2e2504e2",
38
57
  "@viem/anvil": "^0.0.10",
39
58
  "dotenv": "^16.0.3",
40
59
  "lodash.chunk": "^4.2.0",
41
60
  "lodash.pickby": "^4.5.0",
42
61
  "tslib": "^2.4.0",
43
- "viem": "npm:@spalladino/viem@2.38.2-eip7594.0",
62
+ "viem": "npm:@aztec/viem@2.38.2",
44
63
  "zod": "^3.23.8"
45
64
  },
46
65
  "devDependencies": {
@@ -49,6 +68,7 @@
49
68
  "@types/jest": "^30.0.0",
50
69
  "@types/lodash.pickby": "^4",
51
70
  "@types/node": "^22.15.17",
71
+ "@typescript/native-preview": "7.0.0-dev.20260113.1",
52
72
  "@viem/anvil": "^0.0.10",
53
73
  "get-port": "^7.1.0",
54
74
  "jest": "^30.0.0",
@@ -62,7 +82,7 @@
62
82
  "src",
63
83
  "!*.test.*"
64
84
  ],
65
- "types": "./dest/index.d.ts",
85
+ "types": "./dest/types.d.ts",
66
86
  "jest": {
67
87
  "moduleNameMapper": {
68
88
  "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"