@aztec/world-state 0.65.0 → 0.65.1

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.
@@ -3,7 +3,7 @@
3
3
  import { type IndexedTreeId, type L2Block, type MerkleTreeReadOperations, type MerkleTreeWriteOperations } from '@aztec/circuit-types';
4
4
  import { EthAddress, Fr, Header, type NullifierLeafPreimage } from '@aztec/circuits.js';
5
5
  import { type MerkleTreeAdminDatabase as MerkleTreeDatabase } from '../world-state-db/merkle_tree_db.js';
6
- import { type WorldStateStatusFull } from './message.js';
6
+ import { type WorldStateStatusFull, type WorldStateStatusSummary } from './message.js';
7
7
  import { NativeWorldState } from './native_world_state_instance.js';
8
8
  export declare const WORLD_STATE_VERSION_FILE = "version";
9
9
  export declare const WORLD_STATE_DB_VERSION = 1;
@@ -12,6 +12,7 @@ export declare class NativeWorldStateService implements MerkleTreeDatabase {
12
12
  protected readonly log: import("@aztec/foundation/log").Logger;
13
13
  private readonly cleanup;
14
14
  protected initialHeader: Header | undefined;
15
+ private cachedStatusSummary;
15
16
  protected constructor(instance: NativeWorldState, log?: import("@aztec/foundation/log").Logger, cleanup?: () => Promise<void>);
16
17
  static new(rollupAddress: EthAddress, dataDir: string, dbMapSizeKb: number, log?: import("@aztec/foundation/log").Logger, cleanup?: () => Promise<void>): Promise<NativeWorldStateService>;
17
18
  static tmp(rollupAddress?: EthAddress, cleanupTmpDir?: boolean): Promise<NativeWorldStateService>;
@@ -23,12 +24,15 @@ export declare class NativeWorldStateService implements MerkleTreeDatabase {
23
24
  handleL2BlockAndMessages(l2Block: L2Block, l1ToL2Messages: Fr[]): Promise<WorldStateStatusFull>;
24
25
  close(): Promise<void>;
25
26
  private buildInitialHeader;
27
+ private sanitiseAndCacheSummaryFromFull;
28
+ private sanitiseAndCacheSummary;
29
+ private deleteCachedSummary;
26
30
  /**
27
31
  * Advances the finalised block number to be the number provided
28
32
  * @param toBlockNumber The block number that is now the tip of the finalised chain
29
33
  * @returns The new WorldStateStatus
30
34
  */
31
- setFinalised(toBlockNumber: bigint): Promise<import("./message.js").WorldStateStatusSummary>;
35
+ setFinalised(toBlockNumber: bigint): Promise<WorldStateStatusSummary>;
32
36
  /**
33
37
  * Removes all historical snapshots up to but not including the given block number
34
38
  * @param toBlockNumber The block number of the new oldest historical block
@@ -41,7 +45,7 @@ export declare class NativeWorldStateService implements MerkleTreeDatabase {
41
45
  * @returns The new WorldStateStatus
42
46
  */
43
47
  unwindBlocks(toBlockNumber: bigint): Promise<WorldStateStatusFull>;
44
- getStatusSummary(): Promise<import("./message.js").WorldStateStatusSummary>;
48
+ getStatusSummary(): Promise<WorldStateStatusSummary>;
45
49
  updateLeaf<ID extends IndexedTreeId>(_treeId: ID, _leaf: NullifierLeafPreimage | Buffer, _index: bigint): Promise<void>;
46
50
  private getInitialStateReference;
47
51
  }
@@ -1 +1 @@
1
- {"version":3,"file":"native_world_state.d.ts","sourceRoot":"","sources":["../../src/native/native_world_state.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,OAAO,EAEZ,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAE/B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,UAAU,EACV,EAAE,EACF,MAAM,EAKN,KAAK,qBAAqB,EAI3B,MAAM,oBAAoB,CAAC;AAS5B,OAAO,EAAE,KAAK,uBAAuB,IAAI,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAEzG,OAAO,EAEL,KAAK,oBAAoB,EAM1B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,eAAO,MAAM,wBAAwB,YAAY,CAAC;AAOlD,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,qBAAa,uBAAwB,YAAW,kBAAkB;IAI9D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB;IAC7C,SAAS,CAAC,QAAQ,CAAC,GAAG;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAL1B,SAAS,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5C,SAAS,aACY,QAAQ,EAAE,gBAAgB,EAC1B,GAAG,yCAAkD,EACvD,OAAO,sBAA0B;WAGvC,GAAG,CACd,aAAa,EAAE,UAAU,EACzB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,GAAG,yCAAkD,EACrD,OAAO,sBAA0B,GAChC,OAAO,CAAC,uBAAuB,CAAC;WAiCtB,GAAG,CAAC,aAAa,aAAkB,EAAE,aAAa,UAAO,GAAG,OAAO,CAAC,uBAAuB,CAAC;cAmBzF,IAAI;IAoBb,YAAY,IAAI,wBAAwB;IAIxC,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,wBAAwB;IAIpD,IAAI,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAQpE,gBAAgB,IAAI,MAAM;IAIpB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC;IA2C/F,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAKrB,kBAAkB;IAKhC;;;;OAIG;IACU,YAAY,CAAC,aAAa,EAAE,MAAM;IAO/C;;;;OAIG;IACU,sBAAsB,CAAC,aAAa,EAAE,MAAM;IAOzD;;;;OAIG;IACU,YAAY,CAAC,aAAa,EAAE,MAAM;IAOlC,gBAAgB;IAK7B,UAAU,CAAC,EAAE,SAAS,aAAa,EACjC,OAAO,EAAE,EAAE,EACX,KAAK,EAAE,qBAAqB,GAAG,MAAM,EACrC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;YAIF,wBAAwB;CAYvC"}
1
+ {"version":3,"file":"native_world_state.d.ts","sourceRoot":"","sources":["../../src/native/native_world_state.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,OAAO,EAEZ,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAE/B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,UAAU,EACV,EAAE,EACF,MAAM,EAKN,KAAK,qBAAqB,EAI3B,MAAM,oBAAoB,CAAC;AAS5B,OAAO,EAAE,KAAK,uBAAuB,IAAI,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAEzG,OAAO,EAEL,KAAK,oBAAoB,EACzB,KAAK,uBAAuB,EAM7B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,eAAO,MAAM,wBAAwB,YAAY,CAAC;AAOlD,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,qBAAa,uBAAwB,YAAW,kBAAkB;IAM9D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB;IAC7C,SAAS,CAAC,QAAQ,CAAC,GAAG;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAP1B,SAAS,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5C,OAAO,CAAC,mBAAmB,CAAsC;IAEjE,SAAS,aACY,QAAQ,EAAE,gBAAgB,EAC1B,GAAG,yCAAkD,EACvD,OAAO,sBAA0B;WAGvC,GAAG,CACd,aAAa,EAAE,UAAU,EACzB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,GAAG,yCAAkD,EACrD,OAAO,sBAA0B,GAChC,OAAO,CAAC,uBAAuB,CAAC;WAiCtB,GAAG,CAAC,aAAa,aAAkB,EAAE,aAAa,UAAO,GAAG,OAAO,CAAC,uBAAuB,CAAC;cAmBzF,IAAI;IAoBb,YAAY,IAAI,wBAAwB;IAIxC,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,wBAAwB;IAIpD,IAAI,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAQpE,gBAAgB,IAAI,MAAM;IAIpB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC;IA+C/F,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAKrB,kBAAkB;IAKhC,OAAO,CAAC,+BAA+B;IAMvC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,mBAAmB;IAI3B;;;;OAIG;IACU,YAAY,CAAC,aAAa,EAAE,MAAM;IAY/C;;;;OAIG;IACU,sBAAsB,CAAC,aAAa,EAAE,MAAM;IAWzD;;;;OAIG;IACU,YAAY,CAAC,aAAa,EAAE,MAAM;IAWlC,gBAAgB;IAO7B,UAAU,CAAC,EAAE,SAAS,aAAa,EACjC,OAAO,EAAE,EAAE,EACX,KAAK,EAAE,qBAAqB,GAAG,MAAM,EACrC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;YAIF,wBAAwB;CAYvC"}
@@ -122,7 +122,7 @@ export class NativeWorldStateService {
122
122
  return new PublicDataTreeLeaf(write.leafSlot, write.value);
123
123
  }));
124
124
  }
125
- const response = await this.instance.call(WorldStateMessageType.SYNC_BLOCK, {
125
+ return await this.instance.call(WorldStateMessageType.SYNC_BLOCK, {
126
126
  blockNumber: l2Block.number,
127
127
  blockHeaderHash: l2Block.header.hash(),
128
128
  paddedL1ToL2Messages: paddedL1ToL2Messages.map(serializeLeaf),
@@ -130,8 +130,7 @@ export class NativeWorldStateService {
130
130
  paddedNullifiers: paddedNullifiers.map(serializeLeaf),
131
131
  batchesOfPublicDataWrites: batchesOfPublicDataWrites.map(batch => batch.map(serializeLeaf)),
132
132
  blockStateRef: blockStateReference(l2Block.header.state),
133
- });
134
- return sanitiseFullStatus(response);
133
+ }, this.sanitiseAndCacheSummaryFromFull.bind(this), this.deleteCachedSummary.bind(this));
135
134
  }
136
135
  async close() {
137
136
  await this.instance.close();
@@ -141,16 +140,29 @@ export class NativeWorldStateService {
141
140
  const state = await this.getInitialStateReference();
142
141
  return Header.empty({ state });
143
142
  }
143
+ sanitiseAndCacheSummaryFromFull(response) {
144
+ const sanitised = sanitiseFullStatus(response);
145
+ this.cachedStatusSummary = { ...sanitised.summary };
146
+ return sanitised;
147
+ }
148
+ sanitiseAndCacheSummary(response) {
149
+ const sanitised = sanitiseSummary(response);
150
+ this.cachedStatusSummary = { ...sanitised };
151
+ return sanitised;
152
+ }
153
+ deleteCachedSummary(_) {
154
+ this.cachedStatusSummary = undefined;
155
+ }
144
156
  /**
145
157
  * Advances the finalised block number to be the number provided
146
158
  * @param toBlockNumber The block number that is now the tip of the finalised chain
147
159
  * @returns The new WorldStateStatus
148
160
  */
149
161
  async setFinalised(toBlockNumber) {
150
- const response = await this.instance.call(WorldStateMessageType.FINALISE_BLOCKS, {
162
+ await this.instance.call(WorldStateMessageType.FINALISE_BLOCKS, {
151
163
  toBlockNumber,
152
- });
153
- return sanitiseSummary(response);
164
+ }, this.sanitiseAndCacheSummary.bind(this), this.deleteCachedSummary.bind(this));
165
+ return this.getStatusSummary();
154
166
  }
155
167
  /**
156
168
  * Removes all historical snapshots up to but not including the given block number
@@ -158,10 +170,9 @@ export class NativeWorldStateService {
158
170
  * @returns The new WorldStateStatus
159
171
  */
160
172
  async removeHistoricalBlocks(toBlockNumber) {
161
- const response = await this.instance.call(WorldStateMessageType.REMOVE_HISTORICAL_BLOCKS, {
173
+ return await this.instance.call(WorldStateMessageType.REMOVE_HISTORICAL_BLOCKS, {
162
174
  toBlockNumber,
163
- });
164
- return sanitiseFullStatus(response);
175
+ }, this.sanitiseAndCacheSummaryFromFull.bind(this), this.deleteCachedSummary.bind(this));
165
176
  }
166
177
  /**
167
178
  * Removes all pending blocks down to but not including the given block number
@@ -169,14 +180,15 @@ export class NativeWorldStateService {
169
180
  * @returns The new WorldStateStatus
170
181
  */
171
182
  async unwindBlocks(toBlockNumber) {
172
- const response = await this.instance.call(WorldStateMessageType.UNWIND_BLOCKS, {
183
+ return await this.instance.call(WorldStateMessageType.UNWIND_BLOCKS, {
173
184
  toBlockNumber,
174
- });
175
- return sanitiseFullStatus(response);
185
+ }, this.sanitiseAndCacheSummaryFromFull.bind(this), this.deleteCachedSummary.bind(this));
176
186
  }
177
187
  async getStatusSummary() {
178
- const response = await this.instance.call(WorldStateMessageType.GET_STATUS, void 0);
179
- return sanitiseSummary(response);
188
+ if (this.cachedStatusSummary !== undefined) {
189
+ return { ...this.cachedStatusSummary };
190
+ }
191
+ return await this.instance.call(WorldStateMessageType.GET_STATUS, void 0, this.sanitiseAndCacheSummary.bind(this));
180
192
  }
181
193
  updateLeaf(_treeId, _leaf, _index) {
182
194
  return Promise.reject(new Error('Method not implemented'));
@@ -186,4 +198,4 @@ export class NativeWorldStateService {
186
198
  return new StateReference(treeStateReferenceToSnapshot(resp.state[MerkleTreeId.L1_TO_L2_MESSAGE_TREE]), new PartialStateReference(treeStateReferenceToSnapshot(resp.state[MerkleTreeId.NOTE_HASH_TREE]), treeStateReferenceToSnapshot(resp.state[MerkleTreeId.NULLIFIER_TREE]), treeStateReferenceToSnapshot(resp.state[MerkleTreeId.PUBLIC_DATA_TREE])));
187
199
  }
188
200
  }
189
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"native_world_state.js","sourceRoot":"","sources":["../../src/native/native_world_state.ts"],"names":[],"mappings":"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"}
201
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"native_world_state.js","sourceRoot":"","sources":["../../src/native/native_world_state.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAGZ,QAAQ,GACT,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,UAAU,EACV,EAAE,EACF,MAAM,EACN,sBAAsB,EACtB,qBAAqB,EACrB,mCAAmC,EACnC,aAAa,EAEb,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,MAAM,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACnG,OAAO,EACL,qBAAqB,EAGrB,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,EACf,4BAA4B,EAC5B,kBAAkB,GACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,CAAC,MAAM,wBAAwB,GAAG,SAAS,CAAC;AAElD,2CAA2C;AAC3C,mEAAmE;AACnE,6CAA6C;AAC7C,uEAAuE;AACvE,oCAAoC;AACpC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,CAAC,sBAAsB;AAE/D,MAAM,OAAO,uBAAuB;IAKlC,YACqB,QAA0B,EAC1B,MAAM,iBAAiB,CAAC,4BAA4B,CAAC,EACvD,UAAU,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QAF/B,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,QAAG,GAAH,GAAG,CAAkD;QACvD,YAAO,GAAP,OAAO,CAA0B;IACjD,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,GAAG,CACd,aAAyB,EACzB,OAAe,EACf,WAAmB,EACnB,GAAG,GAAG,iBAAiB,CAAC,4BAA4B,CAAC,EACrD,OAAO,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QAEjC,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACzD,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,EAAE,wBAAwB,CAAC,CAAC;QACxE,MAAM,uBAAuB,GAAG,MAAM,iBAAiB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAEjF,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC7B,GAAG,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;YACzE,MAAM,EAAE,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAClE,CAAC;aAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,uBAAuB,CAAC,aAAa,CAAC,EAAE,CAAC;YACxE,GAAG,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;YACnE,MAAM,EAAE,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAClE,CAAC;aAAM,IAAI,uBAAuB,CAAC,OAAO,IAAI,sBAAsB,EAAE,CAAC;YACrE,GAAG,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;YAChF,MAAM,EAAE,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,oBAAoB,GAAG,IAAI,iBAAiB,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;QAE1F,MAAM,KAAK,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,MAAM,oBAAoB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAEzD,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;QACxE,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC;YACH,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,GAAG,CAAC,KAAK,CAAC,mCAAmC,CAAC,EAAE,CAAC,CAAC;YAClD,MAAM,CAAC,CAAC;QACV,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,GAAG,UAAU,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI;QACpE,MAAM,GAAG,GAAG,iBAAiB,CAAC,4BAA4B,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC,CAAC,CAAC;QACpE,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;QACrC,GAAG,CAAC,KAAK,CAAC,8CAA8C,OAAO,eAAe,WAAW,EAAE,CAAC,CAAC;QAE7F,6FAA6F;QAC7F,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;YACzB,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACpD,GAAG,CAAC,KAAK,CAAC,2CAA2C,OAAO,EAAE,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,KAAK,CAAC,2CAA2C,OAAO,EAAE,CAAC,CAAC;YAClE,CAAC;QACH,CAAC,CAAC;QAEF,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC;IAES,KAAK,CAAC,IAAI;QAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,kFAAkF,CAAC,CAAC;QACtG,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACrD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAEtC,6BAA6B;QAC7B,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QAED,qEAAqE;QACrE,yIAAyI;QACzI,MAAM,kBAAkB,GAAG,MAAM,SAAS,CAAC,aAAa,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1G,MAAM,CAAC,WAAW,CAAC,kBAAkB,EAAE,EAAE,EAAE,+BAA+B,CAAC,CAAC;IAC9E,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAc,EAAE,kBAAkB,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACpG,CAAC;IAEM,WAAW,CAAC,WAAmB;QACpC,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAc,EAAE,kBAAkB,CAAC,KAAK,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;IAC9G,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAoB;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE;YACvE,MAAM,EAAE,WAAW,KAAK,SAAS;YACjC,WAAW,EAAE,WAAW,IAAI,CAAC;SAC9B,CAAC,CAAC;QACH,OAAO,IAAI,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAc,EAAE,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACjH,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,aAAc,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,wBAAwB,CAAC,OAAgB,EAAE,cAAoB;QAC1E,6GAA6G;QAC7G,eAAe;QACf,MAAM,eAAe,GAAG,WAAW,CACjC,OAAO,CAAC,IAAI,CAAC,SAAS,EACtB,QAAQ,CAAC,KAAK,EAAE,EAChB,OAAO,CAAC,IAAI,CAAC,0BAA0B,CACxC,CAAC;QAEF,MAAM,gBAAgB,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAC1D,WAAW,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAClE,CAAC;QACF,MAAM,oBAAoB,GAAG,WAAW,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,EAAE,mCAAmC,CAAC,CAAC;QAEvG,MAAM,gBAAgB,GAAG,eAAe;aACrC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;aACrF,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QAElD,mGAAmG;QACnG,MAAM,yBAAyB,GAA2B,EAAE,CAAC;QAC7D,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE,CAAC;YACvC,yBAAyB,CAAC,IAAI,CAC5B,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBACpC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;gBACtE,CAAC;gBACD,OAAO,IAAI,kBAAkB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7D,CAAC,CAAC,CACH,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAC7B,qBAAqB,CAAC,UAAU,EAChC;YACE,WAAW,EAAE,OAAO,CAAC,MAAM;YAC3B,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE;YACtC,oBAAoB,EAAE,oBAAoB,CAAC,GAAG,CAAC,aAAa,CAAC;YAC7D,gBAAgB,EAAE,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC;YACrD,gBAAgB,EAAE,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC;YACrD,yBAAyB,EAAE,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC3F,aAAa,EAAE,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;SACzD,EACD,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,EAC/C,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CACpC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC9B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACpD,OAAO,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACjC,CAAC;IAEO,+BAA+B,CAAC,QAA8B;QACpE,MAAM,SAAS,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC/C,IAAI,CAAC,mBAAmB,GAAG,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;QACpD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,uBAAuB,CAAC,QAAiC;QAC/D,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,mBAAmB,GAAG,EAAE,GAAG,SAAS,EAAE,CAAC;QAC5C,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,mBAAmB,CAAC,CAAS;QACnC,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;IACvC,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,YAAY,CAAC,aAAqB;QAC7C,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACtB,qBAAqB,CAAC,eAAe,EACrC;YACE,aAAa;SACd,EACD,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,EACvC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CACpC,CAAC;QACF,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,sBAAsB,CAAC,aAAqB;QACvD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAC7B,qBAAqB,CAAC,wBAAwB,EAC9C;YACE,aAAa;SACd,EACD,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,EAC/C,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CACpC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,YAAY,CAAC,aAAqB;QAC7C,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAC7B,qBAAqB,CAAC,aAAa,EACnC;YACE,aAAa;SACd,EACD,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,EAC/C,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CACpC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,gBAAgB;QAC3B,IAAI,IAAI,CAAC,mBAAmB,KAAK,SAAS,EAAE,CAAC;YAC3C,OAAO,EAAE,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzC,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACrH,CAAC;IAED,UAAU,CACR,OAAW,EACX,KAAqC,EACrC,MAAc;QAEd,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC7D,CAAC;IAEO,KAAK,CAAC,wBAAwB;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC,CAAC;QAEjG,OAAO,IAAI,cAAc,CACvB,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,qBAAqB,CAAC,CAAC,EAC5E,IAAI,qBAAqB,CACvB,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,EACrE,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,EACrE,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CACxE,CACF,CAAC;IACJ,CAAC;CACF"}
@@ -29,9 +29,11 @@ export declare class NativeWorldState implements NativeWorldStateInstance {
29
29
  * Sends a message to the native instance and returns the response.
30
30
  * @param messageType - The type of message to send
31
31
  * @param body - The message body
32
+ * @param responseHandler - A callback accepting the response, executed on the job queue
33
+ * @param errorHandler - A callback called on request error, executed on the job queue
32
34
  * @returns The response to the message
33
35
  */
34
- call<T extends WorldStateMessageType>(messageType: T, body: WorldStateRequest[T]): Promise<WorldStateResponse[T]>;
36
+ call<T extends WorldStateMessageType>(messageType: T, body: WorldStateRequest[T], responseHandler?: (response: WorldStateResponse[T]) => WorldStateResponse[T], errorHandler?: (_: string) => void): Promise<WorldStateResponse[T]>;
35
37
  /**
36
38
  * Stops the native instance.
37
39
  */
@@ -1 +1 @@
1
- {"version":3,"file":"native_world_state_instance.d.ts","sourceRoot":"","sources":["../../src/native/native_world_state_instance.ts"],"names":[],"mappings":";;AAsBA,OAAO,EAGL,qBAAqB,EACrB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACxB,MAAM,cAAc,CAAC;AAYtB,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC9C;AAQD,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,CAAC,SAAS,qBAAqB,EAAE,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;CACnH;AAED;;GAEG;AACH,qBAAa,gBAAiB,YAAW,wBAAwB;IA2Bb,OAAO,CAAC,GAAG;IA1B7D,OAAO,CAAC,IAAI,CAAQ;IAEpB,qCAAqC;IACrC,OAAO,CAAC,aAAa,CAAK;IAE1B,mCAAmC;IACnC,OAAO,CAAC,OAAO,CAKZ;IAEH,mCAAmC;IACnC,OAAO,CAAC,OAAO,CAGZ;IAEH,iCAAiC;IACjC,OAAO,CAAC,QAAQ,CAAM;IAEtB,gDAAgD;IAChD,OAAO,CAAC,KAAK,CAAqB;IAElC,+CAA+C;gBACnC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAU,GAAG,yCAAkD;IAsB/G;;;;;OAKG;IACI,IAAI,CAAC,CAAC,SAAS,qBAAqB,EACzC,WAAW,EAAE,CAAC,EACd,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GACzB,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAQjC;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YASrB,YAAY;CA4H3B"}
1
+ {"version":3,"file":"native_world_state_instance.d.ts","sourceRoot":"","sources":["../../src/native/native_world_state_instance.ts"],"names":[],"mappings":";;AAsBA,OAAO,EAGL,qBAAqB,EACrB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACxB,MAAM,cAAc,CAAC;AAYtB,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC9C;AAQD,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,CAAC,SAAS,qBAAqB,EAAE,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;CACnH;AAED;;GAEG;AACH,qBAAa,gBAAiB,YAAW,wBAAwB;IA2Bb,OAAO,CAAC,GAAG;IA1B7D,OAAO,CAAC,IAAI,CAAQ;IAEpB,qCAAqC;IACrC,OAAO,CAAC,aAAa,CAAK;IAE1B,mCAAmC;IACnC,OAAO,CAAC,OAAO,CAKZ;IAEH,mCAAmC;IACnC,OAAO,CAAC,OAAO,CAGZ;IAEH,iCAAiC;IACjC,OAAO,CAAC,QAAQ,CAAM;IAEtB,gDAAgD;IAChD,OAAO,CAAC,KAAK,CAAqB;IAElC,+CAA+C;gBACnC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAU,GAAG,yCAAkD;IAsB/G;;;;;;;OAOG;IACI,IAAI,CAAC,CAAC,SAAS,qBAAqB,EACzC,WAAW,EAAE,CAAC,EACd,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAE1B,eAAe,cAAc,kBAAkB,CAAC,CAAC,CAAC,KAAG,kBAAkB,CAAC,CAAC,CAAa,EACtF,YAAY,OAAO,MAAM,SAAO,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAejC;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YASrB,YAAY;CA4H3B"}
@@ -63,13 +63,25 @@ export class NativeWorldState {
63
63
  * Sends a message to the native instance and returns the response.
64
64
  * @param messageType - The type of message to send
65
65
  * @param body - The message body
66
+ * @param responseHandler - A callback accepting the response, executed on the job queue
67
+ * @param errorHandler - A callback called on request error, executed on the job queue
66
68
  * @returns The response to the message
67
69
  */
68
- call(messageType, body) {
69
- return this.queue.put(() => {
70
+ call(messageType, body,
71
+ // allows for the pre-processing of responses on the job queue before being passed back
72
+ responseHandler = (response) => response, errorHandler = (_) => { }) {
73
+ return this.queue.put(async () => {
70
74
  assert.notEqual(messageType, WorldStateMessageType.CLOSE, 'Use close() to close the native instance');
71
75
  assert.equal(this.open, true, 'Native instance is closed');
72
- return this._sendMessage(messageType, body);
76
+ let response;
77
+ try {
78
+ response = await this._sendMessage(messageType, body);
79
+ }
80
+ catch (error) {
81
+ errorHandler(error.message);
82
+ throw error;
83
+ }
84
+ return responseHandler(response);
73
85
  });
74
86
  }
75
87
  /**
@@ -180,4 +192,4 @@ export class NativeWorldState {
180
192
  return response.value;
181
193
  }
182
194
  }
183
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"native_world_state_instance.js","sourceRoot":"","sources":["../../src/native/native_world_state_instance.ts"],"names":[],"mappings":"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"}
195
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"native_world_state_instance.js","sourceRoot":"","sources":["../../src/native/native_world_state_instance.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,24 @@
1
1
  import { EthAddress } from '@aztec/circuits.js';
2
+ import { z } from 'zod';
2
3
  export declare class WorldStateVersion {
3
4
  readonly version: number;
4
5
  readonly rollupAddress: EthAddress;
5
6
  constructor(version: number, rollupAddress: EthAddress);
6
7
  static readVersion(filename: string): Promise<WorldStateVersion | undefined>;
7
8
  writeVersionFile(filename: string): Promise<void>;
8
- toJSON(): {
9
+ static get schema(): z.ZodEffects<z.ZodObject<{
10
+ version: z.ZodNumber;
11
+ rollupAddress: z.ZodType<EthAddress, any, string>;
12
+ }, "strip", z.ZodTypeAny, {
13
+ version: number;
14
+ rollupAddress: EthAddress;
15
+ }, {
16
+ version: number;
17
+ rollupAddress: string;
18
+ }>, WorldStateVersion, {
9
19
  version: number;
10
20
  rollupAddress: string;
11
- };
12
- static fromJSON(obj: any): WorldStateVersion;
21
+ }>;
13
22
  static empty(): WorldStateVersion;
14
23
  }
15
24
  //# sourceMappingURL=world_state_version.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"world_state_version.d.ts","sourceRoot":"","sources":["../../src/native/world_state_version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,qBAAa,iBAAiB;IAChB,QAAQ,CAAC,OAAO,EAAE,MAAM;IAAE,QAAQ,CAAC,aAAa,EAAE,UAAU;gBAAnD,OAAO,EAAE,MAAM,EAAW,aAAa,EAAE,UAAU;WAE3D,WAAW,CAAC,QAAQ,EAAE,MAAM;IAY5B,gBAAgB,CAAC,QAAQ,EAAE,MAAM;IAK9C,MAAM;;;;IAON,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,iBAAiB;IAM5C,MAAM,CAAC,KAAK;CAGb"}
1
+ {"version":3,"file":"world_state_version.d.ts","sourceRoot":"","sources":["../../src/native/world_state_version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,qBAAa,iBAAiB;aACA,OAAO,EAAE,MAAM;aAAkB,aAAa,EAAE,UAAU;gBAA1D,OAAO,EAAE,MAAM,EAAkB,aAAa,EAAE,UAAU;WAEzE,WAAW,CAAC,QAAQ,EAAE,MAAM;IAK5B,gBAAgB,CAAC,QAAQ,EAAE,MAAM;IAK9C,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,MAAM,CAAC,KAAK;CAGb"}
@@ -1,5 +1,7 @@
1
1
  import { EthAddress } from '@aztec/circuits.js';
2
+ import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
2
3
  import { readFile, writeFile } from 'fs/promises';
4
+ import { z } from 'zod';
3
5
  export class WorldStateVersion {
4
6
  constructor(version, rollupAddress) {
5
7
  this.version = version;
@@ -7,32 +9,22 @@ export class WorldStateVersion {
7
9
  }
8
10
  static async readVersion(filename) {
9
11
  const versionData = await readFile(filename, 'utf-8').catch(() => undefined);
10
- if (versionData === undefined) {
11
- return undefined;
12
- }
13
- const versionJSON = JSON.parse(versionData);
14
- if (versionJSON.version === undefined || versionJSON.rollupAddress === undefined) {
15
- return undefined;
16
- }
17
- return WorldStateVersion.fromJSON(versionJSON);
12
+ return versionData === undefined ? undefined : jsonParseWithSchema(versionData, WorldStateVersion.schema);
18
13
  }
19
14
  async writeVersionFile(filename) {
20
- const data = JSON.stringify(this.toJSON());
15
+ const data = jsonStringify(this);
21
16
  await writeFile(filename, data, 'utf-8');
22
17
  }
23
- toJSON() {
24
- return {
25
- version: this.version,
26
- rollupAddress: this.rollupAddress.toChecksumString(),
27
- };
28
- }
29
- static fromJSON(obj) {
30
- const version = obj.version;
31
- const rollupAddress = EthAddress.fromString(obj.rollupAddress);
32
- return new WorldStateVersion(version, rollupAddress);
18
+ static get schema() {
19
+ return z
20
+ .object({
21
+ version: z.number(),
22
+ rollupAddress: EthAddress.schema,
23
+ })
24
+ .transform(({ version, rollupAddress }) => new WorldStateVersion(version, rollupAddress));
33
25
  }
34
26
  static empty() {
35
27
  return new WorldStateVersion(0, EthAddress.ZERO);
36
28
  }
37
29
  }
38
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ybGRfc3RhdGVfdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9uYXRpdmUvd29ybGRfc3RhdGVfdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFaEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFbEQsTUFBTSxPQUFPLGlCQUFpQjtJQUM1QixZQUFxQixPQUFlLEVBQVcsYUFBeUI7UUFBbkQsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQUFXLGtCQUFhLEdBQWIsYUFBYSxDQUFZO0lBQUcsQ0FBQztJQUU1RSxNQUFNLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxRQUFnQjtRQUN2QyxNQUFNLFdBQVcsR0FBRyxNQUFNLFFBQVEsQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzdFLElBQUksV0FBVyxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQzlCLE9BQU8sU0FBUyxDQUFDO1FBQ25CLENBQUM7UUFDRCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQzVDLElBQUksV0FBVyxDQUFDLE9BQU8sS0FBSyxTQUFTLElBQUksV0FBVyxDQUFDLGFBQWEsS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUNqRixPQUFPLFNBQVMsQ0FBQztRQUNuQixDQUFDO1FBQ0QsT0FBTyxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFnQjtRQUM1QyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQzNDLE1BQU0sU0FBUyxDQUFDLFFBQVEsRUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVELE1BQU07UUFDSixPQUFPO1lBQ0wsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPO1lBQ3JCLGFBQWEsRUFBRSxJQUFJLENBQUMsYUFBYSxDQUFDLGdCQUFnQixFQUFFO1NBQ3JELENBQUM7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxHQUFRO1FBQ3RCLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUM7UUFDNUIsTUFBTSxhQUFhLEdBQUcsVUFBVSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDL0QsT0FBTyxJQUFJLGlCQUFpQixDQUFDLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBRUQsTUFBTSxDQUFDLEtBQUs7UUFDVixPQUFPLElBQUksaUJBQWlCLENBQUMsQ0FBQyxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNuRCxDQUFDO0NBQ0YifQ==
30
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ybGRfc3RhdGVfdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9uYXRpdmUvd29ybGRfc3RhdGVfdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLGFBQWEsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRWhGLE9BQU8sRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ2xELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsTUFBTSxPQUFPLGlCQUFpQjtJQUM1QixZQUE0QixPQUFlLEVBQWtCLGFBQXlCO1FBQTFELFlBQU8sR0FBUCxPQUFPLENBQVE7UUFBa0Isa0JBQWEsR0FBYixhQUFhLENBQVk7SUFBRyxDQUFDO0lBRTFGLE1BQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLFFBQWdCO1FBQ3ZDLE1BQU0sV0FBVyxHQUFHLE1BQU0sUUFBUSxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDN0UsT0FBTyxXQUFXLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUM1RyxDQUFDO0lBRU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLFFBQWdCO1FBQzVDLE1BQU0sSUFBSSxHQUFHLGFBQWEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNqQyxNQUFNLFNBQVMsQ0FBQyxRQUFRLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFRCxNQUFNLEtBQUssTUFBTTtRQUNmLE9BQU8sQ0FBQzthQUNMLE1BQU0sQ0FBQztZQUNOLE9BQU8sRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFO1lBQ25CLGFBQWEsRUFBRSxVQUFVLENBQUMsTUFBTTtTQUNqQyxDQUFDO2FBQ0QsU0FBUyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsYUFBYSxFQUFFLEVBQUUsRUFBRSxDQUFDLElBQUksaUJBQWlCLENBQUMsT0FBTyxFQUFFLGFBQWEsQ0FBQyxDQUFDLENBQUM7SUFDOUYsQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLO1FBQ1YsT0FBTyxJQUFJLGlCQUFpQixDQUFDLENBQUMsRUFBRSxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDbkQsQ0FBQztDQUNGIn0=
@@ -11,6 +11,8 @@ export interface WorldStateConfig {
11
11
  worldStateDbMapSizeKb?: number;
12
12
  /** Optional directory for the world state DB, if unspecified will default to the general data directory */
13
13
  worldStateDataDirectory?: string;
14
+ /** The number of historic blocks to maintain */
15
+ worldStateBlockHistory: number;
14
16
  }
15
17
  export declare const worldStateConfigMappings: ConfigMappingsType<WorldStateConfig>;
16
18
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/synchronizer/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA8C,MAAM,0BAA0B,CAAC;AAE/G,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAC/B,uCAAuC;IACvC,8BAA8B,EAAE,MAAM,CAAC;IAEvC,+CAA+C;IAC/C,0BAA0B,EAAE,OAAO,CAAC;IAEpC,2FAA2F;IAC3F,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC,mJAAmJ;IACnJ,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,2GAA2G;IAC3G,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CA0BzE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/synchronizer/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAC/B,uCAAuC;IACvC,8BAA8B,EAAE,MAAM,CAAC;IAEvC,+CAA+C;IAC/C,0BAA0B,EAAE,OAAO,CAAC;IAEpC,2FAA2F;IAC3F,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC,mJAAmJ;IACnJ,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,2GAA2G;IAC3G,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,gDAAgD;IAChD,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAED,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CA+BzE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D"}
@@ -1,4 +1,4 @@
1
- import { booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
1
+ import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, } from '@aztec/foundation/config';
2
2
  export const worldStateConfigMappings = {
3
3
  worldStateBlockCheckIntervalMS: {
4
4
  env: 'WS_BLOCK_CHECK_INTERVAL_MS',
@@ -25,6 +25,11 @@ export const worldStateConfigMappings = {
25
25
  env: 'WS_DATA_DIRECTORY',
26
26
  description: 'Optional directory for the world state database',
27
27
  },
28
+ worldStateBlockHistory: {
29
+ env: 'WS_NUM_HISTORIC_BLOCKS',
30
+ description: 'The number of historic blocks to maintain. Values less than 1 mean all history is maintained',
31
+ ...numberConfigHelper(64),
32
+ },
28
33
  };
29
34
  /**
30
35
  * Returns the configuration values for the world state synchronizer.
@@ -33,4 +38,4 @@ export const worldStateConfigMappings = {
33
38
  export function getWorldStateConfigFromEnv() {
34
39
  return getConfigFromMappings(worldStateConfigMappings);
35
40
  }
36
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUEyQixtQkFBbUIsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBb0IvRyxNQUFNLENBQUMsTUFBTSx3QkFBd0IsR0FBeUM7SUFDNUUsOEJBQThCLEVBQUU7UUFDOUIsR0FBRyxFQUFFLDRCQUE0QjtRQUNqQyxRQUFRLEVBQUUsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUFDLENBQUMsR0FBRztRQUMvQixZQUFZLEVBQUUsR0FBRztRQUNqQixXQUFXLEVBQUUsa0NBQWtDO0tBQ2hEO0lBQ0QsMEJBQTBCLEVBQUU7UUFDMUIsR0FBRyxFQUFFLHVCQUF1QjtRQUM1QixXQUFXLEVBQUUsMENBQTBDO1FBQ3ZELEdBQUcsbUJBQW1CLEVBQUU7S0FDekI7SUFDRCwrQkFBK0IsRUFBRTtRQUMvQixHQUFHLEVBQUUsNkJBQTZCO1FBQ2xDLFFBQVEsRUFBRSxDQUFDLEdBQXVCLEVBQUUsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1FBQy9ELFdBQVcsRUFBRSxzRkFBc0Y7S0FDcEc7SUFDRCxxQkFBcUIsRUFBRTtRQUNyQixHQUFHLEVBQUUsbUJBQW1CO1FBQ3hCLFFBQVEsRUFBRSxDQUFDLEdBQXVCLEVBQUUsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1FBQy9ELFdBQVcsRUFBRSxpREFBaUQ7S0FDL0Q7SUFDRCx1QkFBdUIsRUFBRTtRQUN2QixHQUFHLEVBQUUsbUJBQW1CO1FBQ3hCLFdBQVcsRUFBRSxpREFBaUQ7S0FDL0Q7Q0FDRixDQUFDO0FBRUY7OztHQUdHO0FBQ0gsTUFBTSxVQUFVLDBCQUEwQjtJQUN4QyxPQUFPLHFCQUFxQixDQUFtQix3QkFBd0IsQ0FBQyxDQUFDO0FBQzNFLENBQUMifQ==
41
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUVMLG1CQUFtQixFQUNuQixxQkFBcUIsRUFDckIsa0JBQWtCLEdBQ25CLE1BQU0sMEJBQTBCLENBQUM7QUF1QmxDLE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQUF5QztJQUM1RSw4QkFBOEIsRUFBRTtRQUM5QixHQUFHLEVBQUUsNEJBQTRCO1FBQ2pDLFFBQVEsRUFBRSxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHO1FBQy9CLFlBQVksRUFBRSxHQUFHO1FBQ2pCLFdBQVcsRUFBRSxrQ0FBa0M7S0FDaEQ7SUFDRCwwQkFBMEIsRUFBRTtRQUMxQixHQUFHLEVBQUUsdUJBQXVCO1FBQzVCLFdBQVcsRUFBRSwwQ0FBMEM7UUFDdkQsR0FBRyxtQkFBbUIsRUFBRTtLQUN6QjtJQUNELCtCQUErQixFQUFFO1FBQy9CLEdBQUcsRUFBRSw2QkFBNkI7UUFDbEMsUUFBUSxFQUFFLENBQUMsR0FBdUIsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDL0QsV0FBVyxFQUFFLHNGQUFzRjtLQUNwRztJQUNELHFCQUFxQixFQUFFO1FBQ3JCLEdBQUcsRUFBRSxtQkFBbUI7UUFDeEIsUUFBUSxFQUFFLENBQUMsR0FBdUIsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDL0QsV0FBVyxFQUFFLGlEQUFpRDtLQUMvRDtJQUNELHVCQUF1QixFQUFFO1FBQ3ZCLEdBQUcsRUFBRSxtQkFBbUI7UUFDeEIsV0FBVyxFQUFFLGlEQUFpRDtLQUMvRDtJQUNELHNCQUFzQixFQUFFO1FBQ3RCLEdBQUcsRUFBRSx3QkFBd0I7UUFDN0IsV0FBVyxFQUFFLDhGQUE4RjtRQUMzRyxHQUFHLGtCQUFrQixDQUFDLEVBQUUsQ0FBQztLQUMxQjtDQUNGLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsMEJBQTBCO0lBQ3hDLE9BQU8scUJBQXFCLENBQW1CLHdCQUF3QixDQUFDLENBQUM7QUFDM0UsQ0FBQyJ9
@@ -17,7 +17,9 @@ export declare class ServerWorldStateSynchronizer implements WorldStateSynchroni
17
17
  private readonly log;
18
18
  private readonly merkleTreeCommitted;
19
19
  private latestBlockNumberAtStart;
20
+ private historyToKeep;
20
21
  private currentState;
22
+ private latestBlockHashQuery;
21
23
  private syncPromise;
22
24
  protected blockStream: L2BlockStream | undefined;
23
25
  private instrumentation;
@@ -1 +1 @@
1
- {"version":3,"file":"server_world_state_synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/server_world_state_synchronizer.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,KAAK,mBAAmB,EAGxB,KAAK,aAAa,EAClB,aAAa,EACb,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC9B,KAAK,8BAA8B,EACnC,KAAK,MAAM,EAEX,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAE9B,KAAK,sBAAsB,EAC3B,KAAK,4BAA4B,EAClC,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAKnD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpD;;;;GAIG;AACH,qBAAa,4BACX,YAAW,sBAAsB,EAAE,8BAA8B,EAAE,yBAAyB;IAY1F,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdtB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2B;IAE/D,OAAO,CAAC,wBAAwB,CAAK;IACrC,OAAO,CAAC,YAAY,CAAuD;IAE3E,OAAO,CAAC,WAAW,CAAgC;IACnD,SAAS,CAAC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACjD,OAAO,CAAC,eAAe,CAA4B;gBAGhC,YAAY,EAAE,uBAAuB,EACrC,aAAa,EAAE,aAAa,GAAG,mBAAmB,EAClD,MAAM,EAAE,gBAAgB,EACzC,SAAS,EAAE,eAAe,EACT,GAAG,yCAAyC;IAMxD,YAAY,IAAI,wBAAwB;IAIxC,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,wBAAwB;IAI1D,IAAI,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAIxD,KAAK;IAgClB,SAAS,CAAC,iBAAiB;IAQd,IAAI;IASJ,MAAM,IAAI,OAAO,CAAC,4BAA4B,CAAC;IAO/C,oBAAoB;IAIjC;;;;OAIG;IACU,aAAa,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBvE,oGAAoG;IAC7F,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAMlE,gGAAgG;IACnF,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAYzC,oDAAoD;IACvC,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB7E;;;;OAIG;YACW,cAAc;IAwB5B;;;;;OAKG;YACW,aAAa;YAkBb,oBAAoB;IAKlC,OAAO,CAAC,iBAAiB;YAKX,iBAAiB;IAM/B;;;OAGG;IACH,OAAO,CAAC,eAAe;IAKvB;;;;;OAKG;IACH,SAAS,CAAC,0BAA0B,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM;CAa1E"}
1
+ {"version":3,"file":"server_world_state_synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/server_world_state_synchronizer.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,KAAK,mBAAmB,EAGxB,KAAK,aAAa,EAClB,aAAa,EACb,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC9B,KAAK,8BAA8B,EACnC,KAAK,MAAM,EAEX,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAE9B,KAAK,sBAAsB,EAC3B,KAAK,4BAA4B,EAClC,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAKnD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpD;;;;GAIG;AACH,qBAAa,4BACX,YAAW,sBAAsB,EAAE,8BAA8B,EAAE,yBAAyB;IAc1F,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAhBtB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2B;IAE/D,OAAO,CAAC,wBAAwB,CAAK;IACrC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,YAAY,CAAuD;IAC3E,OAAO,CAAC,oBAAoB,CAA4E;IAExG,OAAO,CAAC,WAAW,CAAgC;IACnD,SAAS,CAAC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACjD,OAAO,CAAC,eAAe,CAA4B;gBAGhC,YAAY,EAAE,uBAAuB,EACrC,aAAa,EAAE,aAAa,GAAG,mBAAmB,EAClD,MAAM,EAAE,gBAAgB,EACzC,SAAS,EAAE,eAAe,EACT,GAAG,yCAAyC;IAYxD,YAAY,IAAI,wBAAwB;IAIxC,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,wBAAwB;IAI1D,IAAI,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAIxD,KAAK;IAgClB,SAAS,CAAC,iBAAiB;IAQd,IAAI;IASJ,MAAM,IAAI,OAAO,CAAC,4BAA4B,CAAC;IAO/C,oBAAoB;IAIjC;;;;OAIG;IACU,aAAa,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBvE,oGAAoG;IACvF,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAexE,gGAAgG;IACnF,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAYzC,oDAAoD;IACvC,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB7E;;;;OAIG;YACW,cAAc;IAwB5B;;;;;OAKG;YACW,aAAa;YAkBb,oBAAoB;IAclC,OAAO,CAAC,iBAAiB;YAKX,iBAAiB;IAO/B;;;OAGG;IACH,OAAO,CAAC,eAAe;IAKvB;;;;;OAKG;IACH,SAAS,CAAC,0BAA0B,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM;CAa1E"}
@@ -19,9 +19,12 @@ export class ServerWorldStateSynchronizer {
19
19
  this.log = log;
20
20
  this.latestBlockNumberAtStart = 0;
21
21
  this.currentState = WorldStateRunningState.IDLE;
22
+ this.latestBlockHashQuery = undefined;
22
23
  this.syncPromise = promiseWithResolvers();
23
24
  this.instrumentation = new WorldStateInstrumentation(telemetry);
24
25
  this.merkleTreeCommitted = this.merkleTreeDb.getCommitted();
26
+ this.historyToKeep = config.worldStateBlockHistory < 1 ? undefined : config.worldStateBlockHistory;
27
+ this.log.info(`Created world state synchroniser with block history of ${this.historyToKeep === undefined ? 'infinity' : this.historyToKeep}`);
25
28
  }
26
29
  getCommitted() {
27
30
  return this.merkleTreeDb.getCommitted();
@@ -109,10 +112,19 @@ export class ServerWorldStateSynchronizer {
109
112
  return updatedBlockNumber;
110
113
  }
111
114
  /** Returns the L2 block hash for a given number. Used by the L2BlockStream for detecting reorgs. */
112
- getL2BlockHash(number) {
113
- return number === 0
114
- ? Promise.resolve(this.merkleTreeCommitted.getInitialHeader().hash().toString())
115
- : this.merkleTreeCommitted.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(number)).then(leaf => leaf?.toString());
115
+ async getL2BlockHash(number) {
116
+ if (number === 0) {
117
+ return Promise.resolve(this.merkleTreeCommitted.getInitialHeader().hash().toString());
118
+ }
119
+ if (this.latestBlockHashQuery?.hash === undefined || number !== this.latestBlockHashQuery.blockNumber) {
120
+ this.latestBlockHashQuery = {
121
+ hash: await this.merkleTreeCommitted
122
+ .getLeafValue(MerkleTreeId.ARCHIVE, BigInt(number))
123
+ .then(leaf => leaf?.toString()),
124
+ blockNumber: number,
125
+ };
126
+ }
127
+ return this.latestBlockHashQuery.hash;
116
128
  }
117
129
  /** Returns the latest L2 block number for each tip of the chain (latest, proven, finalized). */
118
130
  async getL2Tips() {
@@ -196,7 +208,16 @@ export class ServerWorldStateSynchronizer {
196
208
  }
197
209
  async handleChainFinalized(blockNumber) {
198
210
  this.log.verbose(`Chain finalized at block ${blockNumber}`);
199
- await this.merkleTreeDb.setFinalised(BigInt(blockNumber));
211
+ const summary = await this.merkleTreeDb.setFinalised(BigInt(blockNumber));
212
+ if (this.historyToKeep === undefined) {
213
+ return;
214
+ }
215
+ const newHistoricBlock = summary.finalisedBlockNumber - BigInt(this.historyToKeep) + 1n;
216
+ if (newHistoricBlock <= 1) {
217
+ return;
218
+ }
219
+ this.log.verbose(`Pruning historic blocks to ${newHistoricBlock}`);
220
+ await this.merkleTreeDb.removeHistoricalBlocks(newHistoricBlock);
200
221
  }
201
222
  handleChainProven(blockNumber) {
202
223
  this.log.verbose(`Chain proven at block ${blockNumber}`);
@@ -205,6 +226,7 @@ export class ServerWorldStateSynchronizer {
205
226
  async handleChainPruned(blockNumber) {
206
227
  this.log.info(`Chain pruned to block ${blockNumber}`);
207
228
  const status = await this.merkleTreeDb.unwindBlocks(BigInt(blockNumber));
229
+ this.latestBlockHashQuery = undefined;
208
230
  this.instrumentation.updateWorldStateMetrics(status);
209
231
  }
210
232
  /**
@@ -229,4 +251,4 @@ export class ServerWorldStateSynchronizer {
229
251
  }
230
252
  }
231
253
  }
232
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server_world_state_synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/server_world_state_synchronizer.ts"],"names":[],"mappings":"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"}
254
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server_world_state_synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/server_world_state_synchronizer.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/world-state",
3
- "version": "0.65.0",
3
+ "version": "0.65.1",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -62,16 +62,17 @@
62
62
  ]
63
63
  },
64
64
  "dependencies": {
65
- "@aztec/circuit-types": "0.65.0",
66
- "@aztec/circuits.js": "0.65.0",
67
- "@aztec/foundation": "0.65.0",
68
- "@aztec/kv-store": "0.65.0",
69
- "@aztec/merkle-tree": "0.65.0",
70
- "@aztec/telemetry-client": "0.65.0",
71
- "@aztec/types": "0.65.0",
65
+ "@aztec/circuit-types": "0.65.1",
66
+ "@aztec/circuits.js": "0.65.1",
67
+ "@aztec/foundation": "0.65.1",
68
+ "@aztec/kv-store": "0.65.1",
69
+ "@aztec/merkle-tree": "0.65.1",
70
+ "@aztec/telemetry-client": "0.65.1",
71
+ "@aztec/types": "0.65.1",
72
72
  "bindings": "^1.5.0",
73
73
  "msgpackr": "^1.10.2",
74
- "tslib": "^2.4.0"
74
+ "tslib": "^2.4.0",
75
+ "zod": "^3.23.8"
75
76
  },
76
77
  "devDependencies": {
77
78
  "@aztec/archiver": "workspace:^",
@@ -32,6 +32,7 @@ import { MerkleTreesFacade, MerkleTreesForkFacade, serializeLeaf } from './merkl
32
32
  import {
33
33
  WorldStateMessageType,
34
34
  type WorldStateStatusFull,
35
+ type WorldStateStatusSummary,
35
36
  blockStateReference,
36
37
  sanitiseFullStatus,
37
38
  sanitiseSummary,
@@ -52,6 +53,8 @@ export const WORLD_STATE_DB_VERSION = 1; // The initial version
52
53
 
53
54
  export class NativeWorldStateService implements MerkleTreeDatabase {
54
55
  protected initialHeader: Header | undefined;
56
+ // This is read heavily and only changes when data is persisted, so we cache it
57
+ private cachedStatusSummary: WorldStateStatusSummary | undefined;
55
58
 
56
59
  protected constructor(
57
60
  protected readonly instance: NativeWorldState,
@@ -188,16 +191,20 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
188
191
  );
189
192
  }
190
193
 
191
- const response = await this.instance.call(WorldStateMessageType.SYNC_BLOCK, {
192
- blockNumber: l2Block.number,
193
- blockHeaderHash: l2Block.header.hash(),
194
- paddedL1ToL2Messages: paddedL1ToL2Messages.map(serializeLeaf),
195
- paddedNoteHashes: paddedNoteHashes.map(serializeLeaf),
196
- paddedNullifiers: paddedNullifiers.map(serializeLeaf),
197
- batchesOfPublicDataWrites: batchesOfPublicDataWrites.map(batch => batch.map(serializeLeaf)),
198
- blockStateRef: blockStateReference(l2Block.header.state),
199
- });
200
- return sanitiseFullStatus(response);
194
+ return await this.instance.call(
195
+ WorldStateMessageType.SYNC_BLOCK,
196
+ {
197
+ blockNumber: l2Block.number,
198
+ blockHeaderHash: l2Block.header.hash(),
199
+ paddedL1ToL2Messages: paddedL1ToL2Messages.map(serializeLeaf),
200
+ paddedNoteHashes: paddedNoteHashes.map(serializeLeaf),
201
+ paddedNullifiers: paddedNullifiers.map(serializeLeaf),
202
+ batchesOfPublicDataWrites: batchesOfPublicDataWrites.map(batch => batch.map(serializeLeaf)),
203
+ blockStateRef: blockStateReference(l2Block.header.state),
204
+ },
205
+ this.sanitiseAndCacheSummaryFromFull.bind(this),
206
+ this.deleteCachedSummary.bind(this),
207
+ );
201
208
  }
202
209
 
203
210
  public async close(): Promise<void> {
@@ -210,16 +217,37 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
210
217
  return Header.empty({ state });
211
218
  }
212
219
 
220
+ private sanitiseAndCacheSummaryFromFull(response: WorldStateStatusFull) {
221
+ const sanitised = sanitiseFullStatus(response);
222
+ this.cachedStatusSummary = { ...sanitised.summary };
223
+ return sanitised;
224
+ }
225
+
226
+ private sanitiseAndCacheSummary(response: WorldStateStatusSummary) {
227
+ const sanitised = sanitiseSummary(response);
228
+ this.cachedStatusSummary = { ...sanitised };
229
+ return sanitised;
230
+ }
231
+
232
+ private deleteCachedSummary(_: string) {
233
+ this.cachedStatusSummary = undefined;
234
+ }
235
+
213
236
  /**
214
237
  * Advances the finalised block number to be the number provided
215
238
  * @param toBlockNumber The block number that is now the tip of the finalised chain
216
239
  * @returns The new WorldStateStatus
217
240
  */
218
241
  public async setFinalised(toBlockNumber: bigint) {
219
- const response = await this.instance.call(WorldStateMessageType.FINALISE_BLOCKS, {
220
- toBlockNumber,
221
- });
222
- return sanitiseSummary(response);
242
+ await this.instance.call(
243
+ WorldStateMessageType.FINALISE_BLOCKS,
244
+ {
245
+ toBlockNumber,
246
+ },
247
+ this.sanitiseAndCacheSummary.bind(this),
248
+ this.deleteCachedSummary.bind(this),
249
+ );
250
+ return this.getStatusSummary();
223
251
  }
224
252
 
225
253
  /**
@@ -228,10 +256,14 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
228
256
  * @returns The new WorldStateStatus
229
257
  */
230
258
  public async removeHistoricalBlocks(toBlockNumber: bigint) {
231
- const response = await this.instance.call(WorldStateMessageType.REMOVE_HISTORICAL_BLOCKS, {
232
- toBlockNumber,
233
- });
234
- return sanitiseFullStatus(response);
259
+ return await this.instance.call(
260
+ WorldStateMessageType.REMOVE_HISTORICAL_BLOCKS,
261
+ {
262
+ toBlockNumber,
263
+ },
264
+ this.sanitiseAndCacheSummaryFromFull.bind(this),
265
+ this.deleteCachedSummary.bind(this),
266
+ );
235
267
  }
236
268
 
237
269
  /**
@@ -240,15 +272,21 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
240
272
  * @returns The new WorldStateStatus
241
273
  */
242
274
  public async unwindBlocks(toBlockNumber: bigint) {
243
- const response = await this.instance.call(WorldStateMessageType.UNWIND_BLOCKS, {
244
- toBlockNumber,
245
- });
246
- return sanitiseFullStatus(response);
275
+ return await this.instance.call(
276
+ WorldStateMessageType.UNWIND_BLOCKS,
277
+ {
278
+ toBlockNumber,
279
+ },
280
+ this.sanitiseAndCacheSummaryFromFull.bind(this),
281
+ this.deleteCachedSummary.bind(this),
282
+ );
247
283
  }
248
284
 
249
285
  public async getStatusSummary() {
250
- const response = await this.instance.call(WorldStateMessageType.GET_STATUS, void 0);
251
- return sanitiseSummary(response);
286
+ if (this.cachedStatusSummary !== undefined) {
287
+ return { ...this.cachedStatusSummary };
288
+ }
289
+ return await this.instance.call(WorldStateMessageType.GET_STATUS, void 0, this.sanitiseAndCacheSummary.bind(this));
252
290
  }
253
291
 
254
292
  updateLeaf<ID extends IndexedTreeId>(
@@ -108,16 +108,28 @@ export class NativeWorldState implements NativeWorldStateInstance {
108
108
  * Sends a message to the native instance and returns the response.
109
109
  * @param messageType - The type of message to send
110
110
  * @param body - The message body
111
+ * @param responseHandler - A callback accepting the response, executed on the job queue
112
+ * @param errorHandler - A callback called on request error, executed on the job queue
111
113
  * @returns The response to the message
112
114
  */
113
115
  public call<T extends WorldStateMessageType>(
114
116
  messageType: T,
115
117
  body: WorldStateRequest[T],
118
+ // allows for the pre-processing of responses on the job queue before being passed back
119
+ responseHandler = (response: WorldStateResponse[T]): WorldStateResponse[T] => response,
120
+ errorHandler = (_: string) => {},
116
121
  ): Promise<WorldStateResponse[T]> {
117
- return this.queue.put(() => {
122
+ return this.queue.put(async () => {
118
123
  assert.notEqual(messageType, WorldStateMessageType.CLOSE, 'Use close() to close the native instance');
119
124
  assert.equal(this.open, true, 'Native instance is closed');
120
- return this._sendMessage(messageType, body);
125
+ let response: WorldStateResponse[T];
126
+ try {
127
+ response = await this._sendMessage(messageType, body);
128
+ } catch (error: any) {
129
+ errorHandler(error.message);
130
+ throw error;
131
+ }
132
+ return responseHandler(response);
121
133
  });
122
134
  }
123
135
 
@@ -1,38 +1,29 @@
1
1
  import { EthAddress } from '@aztec/circuits.js';
2
+ import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
2
3
 
3
4
  import { readFile, writeFile } from 'fs/promises';
5
+ import { z } from 'zod';
4
6
 
5
7
  export class WorldStateVersion {
6
- constructor(readonly version: number, readonly rollupAddress: EthAddress) {}
8
+ constructor(public readonly version: number, public readonly rollupAddress: EthAddress) {}
7
9
 
8
10
  static async readVersion(filename: string) {
9
11
  const versionData = await readFile(filename, 'utf-8').catch(() => undefined);
10
- if (versionData === undefined) {
11
- return undefined;
12
- }
13
- const versionJSON = JSON.parse(versionData);
14
- if (versionJSON.version === undefined || versionJSON.rollupAddress === undefined) {
15
- return undefined;
16
- }
17
- return WorldStateVersion.fromJSON(versionJSON);
12
+ return versionData === undefined ? undefined : jsonParseWithSchema(versionData, WorldStateVersion.schema);
18
13
  }
19
14
 
20
15
  public async writeVersionFile(filename: string) {
21
- const data = JSON.stringify(this.toJSON());
16
+ const data = jsonStringify(this);
22
17
  await writeFile(filename, data, 'utf-8');
23
18
  }
24
19
 
25
- toJSON() {
26
- return {
27
- version: this.version,
28
- rollupAddress: this.rollupAddress.toChecksumString(),
29
- };
30
- }
31
-
32
- static fromJSON(obj: any): WorldStateVersion {
33
- const version = obj.version;
34
- const rollupAddress = EthAddress.fromString(obj.rollupAddress);
35
- return new WorldStateVersion(version, rollupAddress);
20
+ static get schema() {
21
+ return z
22
+ .object({
23
+ version: z.number(),
24
+ rollupAddress: EthAddress.schema,
25
+ })
26
+ .transform(({ version, rollupAddress }) => new WorldStateVersion(version, rollupAddress));
36
27
  }
37
28
 
38
29
  static empty() {
@@ -1,4 +1,9 @@
1
- import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
1
+ import {
2
+ type ConfigMappingsType,
3
+ booleanConfigHelper,
4
+ getConfigFromMappings,
5
+ numberConfigHelper,
6
+ } from '@aztec/foundation/config';
2
7
 
3
8
  /** World State synchronizer configuration values. */
4
9
  export interface WorldStateConfig {
@@ -16,6 +21,9 @@ export interface WorldStateConfig {
16
21
 
17
22
  /** Optional directory for the world state DB, if unspecified will default to the general data directory */
18
23
  worldStateDataDirectory?: string;
24
+
25
+ /** The number of historic blocks to maintain */
26
+ worldStateBlockHistory: number;
19
27
  }
20
28
 
21
29
  export const worldStateConfigMappings: ConfigMappingsType<WorldStateConfig> = {
@@ -44,6 +52,11 @@ export const worldStateConfigMappings: ConfigMappingsType<WorldStateConfig> = {
44
52
  env: 'WS_DATA_DIRECTORY',
45
53
  description: 'Optional directory for the world state database',
46
54
  },
55
+ worldStateBlockHistory: {
56
+ env: 'WS_NUM_HISTORIC_BLOCKS',
57
+ description: 'The number of historic blocks to maintain. Values less than 1 mean all history is maintained',
58
+ ...numberConfigHelper(64),
59
+ },
47
60
  };
48
61
 
49
62
  /**
@@ -41,7 +41,9 @@ export class ServerWorldStateSynchronizer
41
41
  private readonly merkleTreeCommitted: MerkleTreeReadOperations;
42
42
 
43
43
  private latestBlockNumberAtStart = 0;
44
+ private historyToKeep: number | undefined;
44
45
  private currentState: WorldStateRunningState = WorldStateRunningState.IDLE;
46
+ private latestBlockHashQuery: { blockNumber: number; hash: string | undefined } | undefined = undefined;
45
47
 
46
48
  private syncPromise = promiseWithResolvers<void>();
47
49
  protected blockStream: L2BlockStream | undefined;
@@ -56,6 +58,12 @@ export class ServerWorldStateSynchronizer
56
58
  ) {
57
59
  this.instrumentation = new WorldStateInstrumentation(telemetry);
58
60
  this.merkleTreeCommitted = this.merkleTreeDb.getCommitted();
61
+ this.historyToKeep = config.worldStateBlockHistory < 1 ? undefined : config.worldStateBlockHistory;
62
+ this.log.info(
63
+ `Created world state synchroniser with block history of ${
64
+ this.historyToKeep === undefined ? 'infinity' : this.historyToKeep
65
+ }`,
66
+ );
59
67
  }
60
68
 
61
69
  public getCommitted(): MerkleTreeReadOperations {
@@ -160,10 +168,19 @@ export class ServerWorldStateSynchronizer
160
168
  }
161
169
 
162
170
  /** Returns the L2 block hash for a given number. Used by the L2BlockStream for detecting reorgs. */
163
- public getL2BlockHash(number: number): Promise<string | undefined> {
164
- return number === 0
165
- ? Promise.resolve(this.merkleTreeCommitted.getInitialHeader().hash().toString())
166
- : this.merkleTreeCommitted.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(number)).then(leaf => leaf?.toString());
171
+ public async getL2BlockHash(number: number): Promise<string | undefined> {
172
+ if (number === 0) {
173
+ return Promise.resolve(this.merkleTreeCommitted.getInitialHeader().hash().toString());
174
+ }
175
+ if (this.latestBlockHashQuery?.hash === undefined || number !== this.latestBlockHashQuery.blockNumber) {
176
+ this.latestBlockHashQuery = {
177
+ hash: await this.merkleTreeCommitted
178
+ .getLeafValue(MerkleTreeId.ARCHIVE, BigInt(number))
179
+ .then(leaf => leaf?.toString()),
180
+ blockNumber: number,
181
+ };
182
+ }
183
+ return this.latestBlockHashQuery.hash;
167
184
  }
168
185
 
169
186
  /** Returns the latest L2 block number for each tip of the chain (latest, proven, finalized). */
@@ -256,7 +273,16 @@ export class ServerWorldStateSynchronizer
256
273
 
257
274
  private async handleChainFinalized(blockNumber: number) {
258
275
  this.log.verbose(`Chain finalized at block ${blockNumber}`);
259
- await this.merkleTreeDb.setFinalised(BigInt(blockNumber));
276
+ const summary = await this.merkleTreeDb.setFinalised(BigInt(blockNumber));
277
+ if (this.historyToKeep === undefined) {
278
+ return;
279
+ }
280
+ const newHistoricBlock = summary.finalisedBlockNumber - BigInt(this.historyToKeep) + 1n;
281
+ if (newHistoricBlock <= 1) {
282
+ return;
283
+ }
284
+ this.log.verbose(`Pruning historic blocks to ${newHistoricBlock}`);
285
+ await this.merkleTreeDb.removeHistoricalBlocks(newHistoricBlock);
260
286
  }
261
287
 
262
288
  private handleChainProven(blockNumber: number) {
@@ -267,6 +293,7 @@ export class ServerWorldStateSynchronizer
267
293
  private async handleChainPruned(blockNumber: number) {
268
294
  this.log.info(`Chain pruned to block ${blockNumber}`);
269
295
  const status = await this.merkleTreeDb.unwindBlocks(BigInt(blockNumber));
296
+ this.latestBlockHashQuery = undefined;
270
297
  this.instrumentation.updateWorldStateMetrics(status);
271
298
  }
272
299