@aztec/archiver 0.1.0-alpha44 → 0.1.0-alpha45

package/dest/archiver/archiver.d.ts

@@ -130,7 +130,7 @@ export declare class Archiver implements L2BlockSource, L2LogsSource, ContractDa
      * Gets the number of the latest L2 block processed by the block source implementation.
      * @returns The number of the latest L2 block processed by the block source implementation.
      */
-    getBlockHeight(): Promise<number>;
+    getBlockNumber(): Promise<number>;
     /**
      * Gets up to `limit` amount of pending L1 to L2 messages.
      * @param limit - The number of messages to return.

package/dest/archiver/archiver.js

@@ -244,8 +244,8 @@ export class Archiver {
      * Gets the number of the latest L2 block processed by the block source implementation.
      * @returns The number of the latest L2 block processed by the block source implementation.
      */
-    getBlockHeight() {
-        return this.store.getBlockHeight();
+    getBlockNumber() {
+        return this.store.getBlockNumber();
     }
     /**
      * Gets up to `limit` amount of pending L1 to L2 messages.

package/dest/archiver/archiver.test.js

@@ -21,7 +21,7 @@ describe('Archiver', () => {
     });
     it('can start, sync and stop and handle l1 to l2 messages and logs', async () => {
         const archiver = new Archiver(publicClient, EthAddress.fromString(rollupAddress), EthAddress.fromString(inboxAddress), EthAddress.fromString(contractDeploymentEmitterAddress), 0, archiverStore, 1000);
-        let latestBlockNum = await archiver.getBlockHeight();
+        let latestBlockNum = await archiver.getBlockNumber();
         expect(latestBlockNum).toEqual(0);
         const blocks = blockNums.map(x => L2Block.random(x, 4, x, x + 1, x * 2, x * 3));
         const rollupTxs = blocks.map(makeRollupTx);
@@ -60,10 +60,10 @@ describe('Archiver', () => {
         rollupTxs.forEach(tx => publicClient.getTransaction.mockResolvedValueOnce(tx));
         await archiver.start(false);
         // Wait until block 3 is processed. If this won't happen the test will fail with timeout.
-        while ((await archiver.getBlockHeight()) !== 3) {
+        while ((await archiver.getBlockNumber()) !== 3) {
             await sleep(100);
         }
-        latestBlockNum = await archiver.getBlockHeight();
+        latestBlockNum = await archiver.getBlockNumber();
         expect(latestBlockNum).toEqual(3);
         // Check that only 2 messages (l1ToL2MessageAddedEvents[3][2] and l1ToL2MessageAddedEvents[3][3]) are pending.
         // Other two (l1ToL2MessageAddedEvents[3][0..2]) were cancelled. And the previous messages were confirmed.

package/dest/archiver/archiver_store.d.ts

@@ -102,7 +102,7 @@ export interface ArchiverDataStore {
      * Gets the number of the latest L2 block processed.
      * @returns The number of the latest L2 block processed.
      */
-    getBlockHeight(): Promise<number>;
+    getBlockNumber(): Promise<number>;
     /**
      * Gets the length of L2 blocks in store.
      * @returns The length of L2 Blocks stored.
@@ -241,7 +241,7 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      * Gets the number of the latest L2 block processed.
      * @returns The number of the latest L2 block processed.
      */
-    getBlockHeight(): Promise<number>;
+    getBlockNumber(): Promise<number>;
     /**
      * Gets the length of L2 blocks in store.
      * @returns The length of L2 Blocks array.

package/dest/archiver/archiver_store.js

@@ -226,7 +226,7 @@ export class MemoryArchiverStore {
      * Gets the number of the latest L2 block processed.
      * @returns The number of the latest L2 block processed.
      */
-    getBlockHeight() {
+    getBlockNumber() {
         if (this.l2Blocks.length === 0)
             return Promise.resolve(INITIAL_L2_BLOCK_NUM - 1);
         return Promise.resolve(this.l2Blocks[this.l2Blocks.length - 1].number);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@aztec/archiver",
-  "version": "0.1.0-alpha44",
+  "version": "0.1.0-alpha45",
   "exports": "./dest/index.js",
   "type": "module",
   "dependencies": {
-    "@aztec/circuits.js": "0.1.0-alpha44",
-    "@aztec/ethereum": "0.1.0-alpha44",
-    "@aztec/foundation": "0.1.0-alpha44",
-    "@aztec/l1-artifacts": "0.1.0-alpha44",
-    "@aztec/types": "0.1.0-alpha44",
+    "@aztec/circuits.js": "0.1.0-alpha45",
+    "@aztec/ethereum": "0.1.0-alpha45",
+    "@aztec/foundation": "0.1.0-alpha45",
+    "@aztec/l1-artifacts": "0.1.0-alpha45",
+    "@aztec/types": "0.1.0-alpha45",
     "@types/lodash.omit": "^4.5.7",
     "debug": "^4.3.4",
     "lodash.omit": "^4.5.0",

package/src/archiver/archiver.test.ts

@@ -42,7 +42,7 @@ describe('Archiver', () => {
       1000,
     );
 
-    let latestBlockNum = await archiver.getBlockHeight();
+    let latestBlockNum = await archiver.getBlockNumber();
     expect(latestBlockNum).toEqual(0);
 
     const blocks = blockNums.map(x => L2Block.random(x, 4, x, x + 1, x * 2, x * 3));
@@ -95,11 +95,11 @@ describe('Archiver', () => {
     await archiver.start(false);
 
     // Wait until block 3 is processed. If this won't happen the test will fail with timeout.
-    while ((await archiver.getBlockHeight()) !== 3) {
+    while ((await archiver.getBlockNumber()) !== 3) {
       await sleep(100);
     }
 
-    latestBlockNum = await archiver.getBlockHeight();
+    latestBlockNum = await archiver.getBlockNumber();
     expect(latestBlockNum).toEqual(3);
 
     // Check that only 2 messages (l1ToL2MessageAddedEvents[3][2] and l1ToL2MessageAddedEvents[3][3]) are pending.

package/src/archiver/archiver.ts

@@ -353,8 +353,8 @@ export class Archiver implements L2BlockSource, L2LogsSource, ContractDataSource
    * Gets the number of the latest L2 block processed by the block source implementation.
    * @returns The number of the latest L2 block processed by the block source implementation.
    */
-  public getBlockHeight(): Promise<number> {
-    return this.store.getBlockHeight();
+  public getBlockNumber(): Promise<number> {
+    return this.store.getBlockNumber();
   }
 
   /**

package/src/archiver/archiver_store.ts

@@ -127,7 +127,7 @@ export interface ArchiverDataStore {
    * Gets the number of the latest L2 block processed.
    * @returns The number of the latest L2 block processed.
    */
-  getBlockHeight(): Promise<number>;
+  getBlockNumber(): Promise<number>;
 
   /**
    * Gets the length of L2 blocks in store.
@@ -382,7 +382,7 @@ export class MemoryArchiverStore implements ArchiverDataStore {
    * Gets the number of the latest L2 block processed.
    * @returns The number of the latest L2 block processed.
    */
-  public getBlockHeight(): Promise<number> {
+  public getBlockNumber(): Promise<number> {
     if (this.l2Blocks.length === 0) return Promise.resolve(INITIAL_L2_BLOCK_NUM - 1);
     return Promise.resolve(this.l2Blocks[this.l2Blocks.length - 1].number);
   }