@aztec/aztec-node 0.1.0-alpha44 → 0.1.0-alpha46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.tsbuildinfo +1 -1
- package/dest/aztec-node/http-node.d.ts +3 -3
- package/dest/aztec-node/http-node.js +5 -5
- package/dest/aztec-node/http-node.test.js +6 -6
- package/dest/aztec-node/server.d.ts +3 -3
- package/dest/aztec-node/server.js +5 -5
- package/package.json +10 -10
- package/src/aztec-node/http-node.test.ts +5 -5
- package/src/aztec-node/http-node.ts +5 -5
- package/src/aztec-node/server.ts +5 -5
|
@@ -28,10 +28,10 @@ export declare class HttpNode implements AztecNode {
|
|
|
28
28
|
*/
|
|
29
29
|
getBlocks(from: number, limit: number): Promise<L2Block[]>;
|
|
30
30
|
/**
|
|
31
|
-
* Method to fetch the current block
|
|
32
|
-
* @returns The block
|
|
31
|
+
* Method to fetch the current block number.
|
|
32
|
+
* @returns The current block number.
|
|
33
33
|
*/
|
|
34
|
-
|
|
34
|
+
getBlockNumber(): Promise<number>;
|
|
35
35
|
/**
|
|
36
36
|
* Method to fetch the version of the rollup the node is connected to.
|
|
37
37
|
* @returns The rollup version.
|
|
@@ -51,14 +51,14 @@ export class HttpNode {
|
|
|
51
51
|
return Promise.resolve(blocks.map(x => L2Block.decode(Buffer.from(x, 'hex'))));
|
|
52
52
|
}
|
|
53
53
|
/**
|
|
54
|
-
* Method to fetch the current block
|
|
55
|
-
* @returns The block
|
|
54
|
+
* Method to fetch the current block number.
|
|
55
|
+
* @returns The current block number.
|
|
56
56
|
*/
|
|
57
|
-
async
|
|
58
|
-
const url = new URL(`${this.baseUrl}/get-block-
|
|
57
|
+
async getBlockNumber() {
|
|
58
|
+
const url = new URL(`${this.baseUrl}/get-block-number`);
|
|
59
59
|
const response = await fetch(url.toString());
|
|
60
60
|
const respJson = await response.json();
|
|
61
|
-
return respJson.
|
|
61
|
+
return respJson.blockNumber;
|
|
62
62
|
}
|
|
63
63
|
/**
|
|
64
64
|
* Method to fetch the version of the rollup the node is connected to.
|
|
@@ -75,12 +75,12 @@ describe('HttpNode', () => {
|
|
|
75
75
|
expect(result).toEqual(undefined);
|
|
76
76
|
});
|
|
77
77
|
});
|
|
78
|
-
describe('
|
|
79
|
-
it('should fetch and return
|
|
80
|
-
const response = {
|
|
78
|
+
describe('getBlockNumber', () => {
|
|
79
|
+
it('should fetch and return current block number', async () => {
|
|
80
|
+
const response = { blockNumber: 100 };
|
|
81
81
|
setFetchMock(response);
|
|
82
|
-
const result = await httpNode.
|
|
83
|
-
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-block-
|
|
82
|
+
const result = await httpNode.getBlockNumber();
|
|
83
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-block-number`);
|
|
84
84
|
expect(result).toBe(100);
|
|
85
85
|
});
|
|
86
86
|
});
|
|
@@ -357,4 +357,4 @@ describe('HttpNode', () => {
|
|
|
357
357
|
});
|
|
358
358
|
});
|
|
359
359
|
});
|
|
360
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http-node.test.js","sourceRoot":"","sources":["../../src/aztec-node/http-node.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACnG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,aAAa,EACb,OAAO,EACP,aAAa,EACb,OAAO,EACP,YAAY,EACZ,WAAW,EACX,MAAM,EACN,MAAM,GACP,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,QAAQ,GAAG,4BAA4B,CAAC;AAE9C,MAAM,YAAY,GAAG,CAAC,QAAa,EAAE,MAAM,GAAG,GAAG,EAAQ,EAAE;IACzD,MAAM,CAAC,KAAK,GAAG,IAAI;SAChB,EAAE,EAAuB;SACzB,kBAAkB,CAAC,CAAC,MAAyB,EAAE,KAA+B,EAAE,EAAE;QACjF,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,MAAM;YACN,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ;YACpB,WAAW,EAAE,GAAG,EAAE,CAAC,QAAQ;SAChB,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,IAAI,QAAkB,CAAC;IACvB,IAAI,QAAkB,CAAC;IAEvB,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,QAAQ,GAAG,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAClC,QAAQ,GAAG,IAAI,QAAQ,CAAC,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;QACvB,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YAC3E,MAAM,QAAQ,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YACnC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;YAExC,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;YAC7C,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,QAAQ,GAAG;gBACf,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;aAC3C,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAE9C,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,2BAA2B,CAAC,CAAC;YAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;YACxE,MAAM,QAAQ,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;YAChC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAE9C,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,2BAA2B,CAAC,CAAC;YAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;QACxB,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,QAAQ,GAAG;gBACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;aACvB,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAE1C,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,oBAAoB,CAAC,CAAC;YACpE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;YACrE,MAAM,QAAQ,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;YACtC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAE1C,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,oBAAoB,CAAC,CAAC;YACpE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;YACxD,MAAM,QAAQ,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;YACtC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,EAAE,CAAC;YAE/C,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,kBAAkB,CAAC,CAAC;YAClE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,QAAQ,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;YAChC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;YAE3C,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,aAAa,CAAC,CAAC;YAC7D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;YACpD,MAAM,QAAQ,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YACnC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;YAE3C,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,cAAc,CAAC,CAAC;YAC9D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;YACjC,MAAM,QAAQ,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpD,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,gBAAgB,EAAE,CAAC;YAEjD,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,oBAAoB,CAAC,CAAC;YACpE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAC1C,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,MAAM,uBAAuB,GAAG,uBAAuB,CAAC,MAAM,EAAE,CAAC;YACjE,MAAM,QAAQ,GAAG;gBACf,YAAY,EAAE,uBAAuB,CAAC,QAAQ,EAAE;aACjD,CAAC;YAEF,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,0BAA0B,CAAC,uBAAuB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;YAE/G,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAChC,GAAG,QAAQ,sCAAsC,uBAAuB,CAAC,YAAY,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,CACnH,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;YACzE,MAAM,QAAQ,GAAG;gBACf,YAAY,EAAE,SAAS;aACxB,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;YAE5C,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,0BAA0B,CAAC,aAAa,CAAC,CAAC;YAExE,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,sCAAsC,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAChH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;QACvB,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,iCAAiC,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;YACvF,MAAM,gBAAgB,GAAG,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;YAE3F,MAAM,IAAI,GAAG,CAAC,CAAC;YACf,MAAM,KAAK,GAAG,CAAC,CAAC;YAChB,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3C,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3C,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;aACzC,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;YAErE,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,iBAAiB,IAAI,UAAU,KAAK,YAAY,gBAAgB,EAAE,CAAC,CAAC;YAClH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CACnC,2DAA2D,EAC3D,KAAK,EAAC,OAAO,EAAC,EAAE;YACd,MAAM,gBAAgB,GAAG,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;YAE3F,MAAM,IAAI,GAAG,CAAC,CAAC;YACf,MAAM,KAAK,GAAG,CAAC,CAAC;YAChB,MAAM,QAAQ,GAAG,EAAE,CAAC;YACpB,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;YAErE,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAChC,GAAG,QAAQ,iBAAiB,IAAI,UAAU,KAAK,YAAY,gBAAgB,EAAE,CAC9E,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;YAC3C,MAAM,QAAQ,GAAG;gBACf,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;aACtC,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;YAE5E,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,yBAAyB,YAAY,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAClH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;YACzE,MAAM,QAAQ,GAAG;gBACf,YAAY,EAAE,SAAS;aACxB,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;YAE5C,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;YAE7D,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,yBAAyB,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACnG,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAC3D,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;YACpB,MAAM,kBAAkB,GAAG,EAAE,CAAC;YAC9B,YAAY,CAAC,kBAAkB,CAAC,CAAC;YAEjC,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAE1B,MAAM,IAAI,GAAgB;gBACxB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE;aACpB,CAAC;YACF,MAAM,IAAI,GAAI,KAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAU,CAAC;YACzD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,CAAC,CAAC;YAC3C,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;YACpD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;YAC/B,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAEzD,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,uBAAuB,MAAM,EAAE,CAAC,CAAC;YAC/E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;YACxE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,MAAM,QAAQ,GAAG,SAAS,CAAC;YAC3B,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAE5B,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAEzD,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,uBAAuB,MAAM,EAAE,CAAC,CAAC;YAC/E,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACvE,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC/C,MAAM,KAAK,GAAG,QAAQ,CAAC;YACvB,MAAM,QAAQ,GAAG,EAAE,KAAK,EAAE,CAAC;YAC3B,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAE3D,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,uBAAuB,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAClG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;YAC1E,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,EAAE,CAAC;YACpB,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAE3D,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,uBAAuB,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAClG,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YACjF,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;YACpE,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClE,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEzD,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,sBAAsB,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC5F,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;YACnE,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;YACnD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,QAAQ,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC;YACrD,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAE7D,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,yBAAyB,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACpG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;YAC5E,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,EAAE,CAAC;YACpB,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAE7D,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,yBAAyB,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACpG,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YACjF,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;YACpE,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClE,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEzD,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,kBAAkB,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACxF,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACxC,EAAE,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;YAChG,MAAM,UAAU,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC;YAC/C,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,QAAQ,GAAG,EAAE,OAAO,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC1G,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;YAEnE,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,QAAQ,4BAA4B,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACnG,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACrB,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE,aAAa;aACrB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YACjF,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;YACpE,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClE,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;YAEnE,MAAM,GAAG,GAAG,GAAG,QAAQ,mBAAmB,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC;YACjE,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;YACpF,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;YAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACzB,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;YACtD,MAAM,QAAQ,GAAG,EAAE,KAAK,EAAE,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzD,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;YAExE,MAAM,GAAG,GAAG,GAAG,QAAQ,6BAA6B,eAAe,SAAS,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC9F,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;YACzE,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;YAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACzB,MAAM,QAAQ,GAAG,EAAE,CAAC;YACpB,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;YAExE,MAAM,GAAG,GAAG,GAAG,QAAQ,6BAA6B,eAAe,SAAS,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC9F,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;YACtF,MAAM,KAAK,GAA6B;gBACtC,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE;gBACzC,CAAC,YAAY,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE;gBAC7C,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE;gBAC1C,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE;gBAC5C,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE;gBAClD,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE;aACxC,CAAC;YAEF,MAAM,eAAe,GAAiC,MAAM,CAAC,WAAW,CACtE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CACrC,CAAC;YAClC,MAAM,QAAQ,GAAG,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;YAE5C,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,CAAC;YAE7C,MAAM,GAAG,GAAG,GAAG,QAAQ,YAAY,CAAC;YACpC,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACpC,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;YACtF,MAAM,SAAS,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC;YAE7C,MAAM,QAAQ,GAAG,EAAE,SAAS,EAAE,CAAC;YAE/B,YAAY,CAAC,QAAQ,CAAC,CAAC;YAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,oBAAoB,EAAE,CAAC;YAErD,MAAM,GAAG,GAAG,GAAG,QAAQ,qBAAqB,CAAC;YAC7C,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
360
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http-node.test.js","sourceRoot":"","sources":["../../src/aztec-node/http-node.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,10 +49,10 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
49
49
|
*/
|
|
50
50
|
getBlocks(from: number, limit: number): Promise<L2Block[]>;
|
|
51
51
|
/**
|
|
52
|
-
* Method to fetch the current block
|
|
53
|
-
* @returns The block
|
|
52
|
+
* Method to fetch the current block number.
|
|
53
|
+
* @returns The block number.
|
|
54
54
|
*/
|
|
55
|
-
|
|
55
|
+
getBlockNumber(): Promise<number>;
|
|
56
56
|
/**
|
|
57
57
|
* Method to fetch the version of the rollup the node is connected to.
|
|
58
58
|
* @returns The rollup version.
|
|
@@ -73,11 +73,11 @@ export class AztecNodeService {
|
|
|
73
73
|
return (await this.blockSource.getL2Blocks(from, limit)) ?? [];
|
|
74
74
|
}
|
|
75
75
|
/**
|
|
76
|
-
* Method to fetch the current block
|
|
77
|
-
* @returns The block
|
|
76
|
+
* Method to fetch the current block number.
|
|
77
|
+
* @returns The block number.
|
|
78
78
|
*/
|
|
79
|
-
async
|
|
80
|
-
return await this.blockSource.
|
|
79
|
+
async getBlockNumber() {
|
|
80
|
+
return await this.blockSource.getBlockNumber();
|
|
81
81
|
}
|
|
82
82
|
/**
|
|
83
83
|
* Method to fetch the version of the rollup the node is connected to.
|
|
@@ -284,7 +284,7 @@ export class AztecNodeService {
|
|
|
284
284
|
* @returns A promise that fulfils once the world state is synced
|
|
285
285
|
*/
|
|
286
286
|
async syncWorldState() {
|
|
287
|
-
const blockSourceHeight = await this.blockSource.
|
|
287
|
+
const blockSourceHeight = await this.blockSource.getBlockNumber();
|
|
288
288
|
await this.worldStateSynchroniser.syncImmediate(blockSourceHeight);
|
|
289
289
|
}
|
|
290
290
|
}
|
package/package.json
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec-node",
|
|
3
|
-
"version": "0.1.0-
|
|
3
|
+
"version": "0.1.0-alpha46",
|
|
4
4
|
"exports": "./dest/index.js",
|
|
5
5
|
"main": "dest/index.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@aztec/archiver": "0.1.0-
|
|
9
|
-
"@aztec/circuits.js": "0.1.0-
|
|
10
|
-
"@aztec/foundation": "0.1.0-
|
|
11
|
-
"@aztec/l1-artifacts": "0.1.0-
|
|
12
|
-
"@aztec/merkle-tree": "0.1.0-
|
|
13
|
-
"@aztec/p2p": "0.1.0-
|
|
14
|
-
"@aztec/sequencer-client": "0.1.0-
|
|
15
|
-
"@aztec/types": "0.1.0-
|
|
16
|
-
"@aztec/world-state": "0.1.0-
|
|
8
|
+
"@aztec/archiver": "0.1.0-alpha46",
|
|
9
|
+
"@aztec/circuits.js": "0.1.0-alpha46",
|
|
10
|
+
"@aztec/foundation": "0.1.0-alpha46",
|
|
11
|
+
"@aztec/l1-artifacts": "0.1.0-alpha46",
|
|
12
|
+
"@aztec/merkle-tree": "0.1.0-alpha46",
|
|
13
|
+
"@aztec/p2p": "0.1.0-alpha46",
|
|
14
|
+
"@aztec/sequencer-client": "0.1.0-alpha46",
|
|
15
|
+
"@aztec/types": "0.1.0-alpha46",
|
|
16
|
+
"@aztec/world-state": "0.1.0-alpha46",
|
|
17
17
|
"tslib": "^2.4.0"
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -109,14 +109,14 @@ describe('HttpNode', () => {
|
|
|
109
109
|
});
|
|
110
110
|
});
|
|
111
111
|
|
|
112
|
-
describe('
|
|
113
|
-
it('should fetch and return
|
|
114
|
-
const response = {
|
|
112
|
+
describe('getBlockNumber', () => {
|
|
113
|
+
it('should fetch and return current block number', async () => {
|
|
114
|
+
const response = { blockNumber: 100 };
|
|
115
115
|
setFetchMock(response);
|
|
116
116
|
|
|
117
|
-
const result = await httpNode.
|
|
117
|
+
const result = await httpNode.getBlockNumber();
|
|
118
118
|
|
|
119
|
-
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-block-
|
|
119
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-block-number`);
|
|
120
120
|
expect(result).toBe(100);
|
|
121
121
|
});
|
|
122
122
|
});
|
|
@@ -79,14 +79,14 @@ export class HttpNode implements AztecNode {
|
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
/**
|
|
82
|
-
* Method to fetch the current block
|
|
83
|
-
* @returns The block
|
|
82
|
+
* Method to fetch the current block number.
|
|
83
|
+
* @returns The current block number.
|
|
84
84
|
*/
|
|
85
|
-
async
|
|
86
|
-
const url = new URL(`${this.baseUrl}/get-block-
|
|
85
|
+
async getBlockNumber(): Promise<number> {
|
|
86
|
+
const url = new URL(`${this.baseUrl}/get-block-number`);
|
|
87
87
|
const response = await fetch(url.toString());
|
|
88
88
|
const respJson = await response.json();
|
|
89
|
-
return respJson.
|
|
89
|
+
return respJson.blockNumber;
|
|
90
90
|
}
|
|
91
91
|
|
|
92
92
|
/**
|
package/src/aztec-node/server.ts
CHANGED
|
@@ -138,11 +138,11 @@ export class AztecNodeService implements AztecNode {
|
|
|
138
138
|
}
|
|
139
139
|
|
|
140
140
|
/**
|
|
141
|
-
* Method to fetch the current block
|
|
142
|
-
* @returns The block
|
|
141
|
+
* Method to fetch the current block number.
|
|
142
|
+
* @returns The block number.
|
|
143
143
|
*/
|
|
144
|
-
public async
|
|
145
|
-
return await this.blockSource.
|
|
144
|
+
public async getBlockNumber(): Promise<number> {
|
|
145
|
+
return await this.blockSource.getBlockNumber();
|
|
146
146
|
}
|
|
147
147
|
|
|
148
148
|
/**
|
|
@@ -382,7 +382,7 @@ export class AztecNodeService implements AztecNode {
|
|
|
382
382
|
* @returns A promise that fulfils once the world state is synced
|
|
383
383
|
*/
|
|
384
384
|
private async syncWorldState() {
|
|
385
|
-
const blockSourceHeight = await this.blockSource.
|
|
385
|
+
const blockSourceHeight = await this.blockSource.getBlockNumber();
|
|
386
386
|
await this.worldStateSynchroniser.syncImmediate(blockSourceHeight);
|
|
387
387
|
}
|
|
388
388
|
}
|