@aztec/aztec.js 0.75.0 → 0.76.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/api/ethereum/l1_contracts.js +2 -2
- package/dest/rpc_clients/node/index.d.ts +2 -2
- package/dest/rpc_clients/node/index.d.ts.map +1 -1
- package/dest/rpc_clients/node/index.js +9 -5
- package/dest/rpc_clients/pxe_client.d.ts +2 -1
- package/dest/rpc_clients/pxe_client.d.ts.map +1 -1
- package/dest/rpc_clients/pxe_client.js +12 -3
- package/dest/utils/index.d.ts +1 -1
- package/dest/utils/index.d.ts.map +1 -1
- package/dest/utils/index.js +1 -1
- package/package.json +9 -8
- package/src/api/ethereum/l1_contracts.ts +1 -1
- package/src/rpc_clients/node/index.ts +14 -6
- package/src/rpc_clients/pxe_client.ts +15 -2
- package/src/utils/index.ts +1 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
2
2
|
import { createPXEClient } from '../../rpc_clients/index.js';
|
|
3
3
|
export const getL1ContractAddresses = async (url) => {
|
|
4
|
-
const pxeClient = createPXEClient(url);
|
|
4
|
+
const pxeClient = createPXEClient(url, {});
|
|
5
5
|
const response = await retryUntil(async () => {
|
|
6
6
|
try {
|
|
7
7
|
return (await pxeClient.getNodeInfo()).l1ContractAddresses;
|
|
@@ -12,4 +12,4 @@ export const getL1ContractAddresses = async (url) => {
|
|
|
12
12
|
}, 'isNodeReady', 120, 1);
|
|
13
13
|
return response;
|
|
14
14
|
};
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfY29udHJhY3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FwaS9ldGhlcmV1bS9sMV9jb250cmFjdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXJELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUU3RCxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxLQUFLLEVBQUUsR0FBVyxFQUFnQyxFQUFFO0lBQ3hGLE1BQU0sU0FBUyxHQUFHLGVBQWUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDM0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxVQUFVLENBQy9CLEtBQUssSUFBSSxFQUFFO1FBQ1QsSUFBSSxDQUFDO1lBQ0gsT0FBTyxDQUFDLE1BQU0sU0FBUyxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsbUJBQW1CLENBQUM7UUFDN0QsQ0FBQztRQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7WUFDYixhQUFhO1FBQ2YsQ0FBQztJQUNILENBQUMsRUFDRCxhQUFhLEVBQ2IsR0FBRyxFQUNILENBQUMsQ0FDRixDQUFDO0lBQ0YsT0FBTyxRQUFRLENBQUM7QUFDbEIsQ0FBQyxDQUFDIn0=
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type PXE } from '@aztec/circuit-types';
|
|
1
|
+
import { type ComponentsVersions, type PXE } from '@aztec/circuit-types';
|
|
2
2
|
import { type Logger } from '@aztec/foundation/log';
|
|
3
3
|
/**
|
|
4
4
|
* Creates a PXE client with a given set of retries on non-server errors.
|
|
@@ -7,5 +7,5 @@ import { type Logger } from '@aztec/foundation/log';
|
|
|
7
7
|
* @param _logger - Debug logger to warn version incompatibilities.
|
|
8
8
|
* @returns A PXE client.
|
|
9
9
|
*/
|
|
10
|
-
export declare function createCompatibleClient(rpcUrl: string, logger
|
|
10
|
+
export declare function createCompatibleClient(rpcUrl: string, logger?: Logger, versions?: Partial<ComponentsVersions>): Promise<PXE>;
|
|
11
11
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rpc_clients/node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rpc_clients/node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAgDlE;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAA2C,EACnD,QAAQ,GAAE,OAAO,CAAC,kBAAkB,CAAM,GACzC,OAAO,CAAC,GAAG,CAAC,CAcd"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
2
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
2
3
|
import { NoRetryError, makeBackoff, retry } from '@aztec/foundation/retry';
|
|
3
4
|
import { Axios } from 'axios';
|
|
4
5
|
import { inspect } from 'util';
|
|
@@ -27,10 +28,13 @@ async function axiosFetch(host, rpcMethod, body, useApiEndpoints) {
|
|
|
27
28
|
});
|
|
28
29
|
const isOK = resp.status >= 200 && resp.status < 300;
|
|
29
30
|
if (isOK) {
|
|
30
|
-
|
|
31
|
+
const headers = {
|
|
32
|
+
get: (header) => typeof resp.headers.get === 'function' ? resp.headers.get(header)?.toString() : undefined,
|
|
33
|
+
};
|
|
34
|
+
return { response: resp.data, headers };
|
|
31
35
|
}
|
|
32
36
|
else {
|
|
33
|
-
const errorMessage = `
|
|
37
|
+
const errorMessage = `Error ${resp.status} from json-rpc server ${host} on ${rpcMethod}: ${resp.data.error.message}`;
|
|
34
38
|
if (resp.status >= 400 && resp.status < 500) {
|
|
35
39
|
throw new NoRetryError(errorMessage);
|
|
36
40
|
}
|
|
@@ -46,12 +50,12 @@ async function axiosFetch(host, rpcMethod, body, useApiEndpoints) {
|
|
|
46
50
|
* @param _logger - Debug logger to warn version incompatibilities.
|
|
47
51
|
* @returns A PXE client.
|
|
48
52
|
*/
|
|
49
|
-
export function createCompatibleClient(rpcUrl, logger) {
|
|
53
|
+
export function createCompatibleClient(rpcUrl, logger = createLogger('aztecjs:pxe_client'), versions = {}) {
|
|
50
54
|
// Use axios due to timeout issues with fetch when proving TXs.
|
|
51
55
|
const fetch = async (host, rpcMethod, body, useApiEndpoints) => {
|
|
52
56
|
return await retry(() => axiosFetch(host, rpcMethod, body, useApiEndpoints), `JsonRpcClient request ${rpcMethod} to ${host}`, makeBackoff([1, 2, 3]), logger, false);
|
|
53
57
|
};
|
|
54
|
-
const pxe = createPXEClient(rpcUrl, fetch);
|
|
58
|
+
const pxe = createPXEClient(rpcUrl, versions, fetch);
|
|
55
59
|
return Promise.resolve(pxe);
|
|
56
60
|
}
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcnBjX2NsaWVudHMvbm9kZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDM0QsT0FBTyxFQUFlLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTNFLE9BQU8sRUFBRSxLQUFLLEVBQW1CLE1BQU0sT0FBTyxDQUFDO0FBQy9DLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFL0IsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5EOzs7Ozs7O0dBT0c7QUFDSCxLQUFLLFVBQVUsVUFBVSxDQUFDLElBQVksRUFBRSxTQUFpQixFQUFFLElBQVMsRUFBRSxlQUF3QjtJQUM1RixNQUFNLE9BQU8sR0FBRyxJQUFJLEtBQUssQ0FBQztRQUN4QixPQUFPLEVBQUUsRUFBRSxjQUFjLEVBQUUsa0JBQWtCLEVBQUU7UUFDL0MsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDLElBQVMsRUFBRSxFQUFFLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RELGlCQUFpQixFQUFFLENBQUMsQ0FBQyxJQUFTLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7S0FDckQsQ0FBQyxDQUFDO0lBQ0gsTUFBTSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsR0FBRyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLElBQUksU0FBUyxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsR0FBRyxJQUFJLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFB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
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type ComponentsVersions } from '@aztec/circuit-types';
|
|
1
2
|
import { type PXE } from '@aztec/circuit-types/interfaces';
|
|
2
3
|
/**
|
|
3
4
|
* Creates a JSON-RPC client to remotely talk to PXE.
|
|
@@ -5,5 +6,5 @@ import { type PXE } from '@aztec/circuit-types/interfaces';
|
|
|
5
6
|
* @param fetch - The fetch implementation to use.
|
|
6
7
|
* @returns A JSON-RPC client of PXE.
|
|
7
8
|
*/
|
|
8
|
-
export declare function createPXEClient(url: string, fetch?: typeof import("@aztec/foundation/json-rpc/client").defaultFetch): PXE;
|
|
9
|
+
export declare function createPXEClient(url: string, versions?: Partial<ComponentsVersions>, fetch?: typeof import("@aztec/foundation/json-rpc/client").defaultFetch): PXE;
|
|
9
10
|
//# sourceMappingURL=pxe_client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pxe_client.d.ts","sourceRoot":"","sources":["../../src/rpc_clients/pxe_client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"pxe_client.d.ts","sourceRoot":"","sources":["../../src/rpc_clients/pxe_client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAgC,MAAM,sBAAsB,CAAC;AAC7F,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,iCAAiC,CAAC;AAItE;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,OAAO,CAAC,kBAAkB,CAAM,EAC1C,KAAK,kEAA8B,GAClC,GAAG,CASL"}
|
|
@@ -1,12 +1,21 @@
|
|
|
1
|
+
import { getVersioningResponseHandler } from '@aztec/circuit-types';
|
|
1
2
|
import { PXESchema } from '@aztec/circuit-types/interfaces';
|
|
2
3
|
import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
4
|
+
import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
|
|
3
5
|
/**
|
|
4
6
|
* Creates a JSON-RPC client to remotely talk to PXE.
|
|
5
7
|
* @param url - The URL of the PXE.
|
|
6
8
|
* @param fetch - The fetch implementation to use.
|
|
7
9
|
* @returns A JSON-RPC client of PXE.
|
|
8
10
|
*/
|
|
9
|
-
export function createPXEClient(url, fetch = makeFetch([1, 2, 3], false)) {
|
|
10
|
-
return createSafeJsonRpcClient(url, PXESchema,
|
|
11
|
+
export function createPXEClient(url, versions = {}, fetch = makeFetch([1, 2, 3], false)) {
|
|
12
|
+
return createSafeJsonRpcClient(url, PXESchema, {
|
|
13
|
+
namespaceMethods: 'pxe',
|
|
14
|
+
fetch,
|
|
15
|
+
onResponse: getVersioningResponseHandler({
|
|
16
|
+
l2ProtocolContractsTreeRoot: protocolContractTreeRoot.toString(),
|
|
17
|
+
...versions,
|
|
18
|
+
}),
|
|
19
|
+
});
|
|
11
20
|
}
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHhlX2NsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ycGNfY2xpZW50cy9weGVfY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBMkIsNEJBQTRCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RixPQUFPLEVBQVksU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUFFLHVCQUF1QixFQUFFLFNBQVMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3ZGLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXJFOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLGVBQWUsQ0FDN0IsR0FBVyxFQUNYLFdBQXdDLEVBQUUsRUFDMUMsS0FBSyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDO0lBRW5DLE9BQU8sdUJBQXVCLENBQU0sR0FBRyxFQUFFLFNBQVMsRUFBRTtRQUNsRCxnQkFBZ0IsRUFBRSxLQUFLO1FBQ3ZCLEtBQUs7UUFDTCxVQUFVLEVBQUUsNEJBQTRCLENBQUM7WUFDdkMsMkJBQTJCLEVBQUUsd0JBQXdCLENBQUMsUUFBUSxFQUFFO1lBQ2hFLEdBQUcsUUFBUTtTQUNaLENBQUM7S0FDSCxDQUFDLENBQUM7QUFDTCxDQUFDIn0=
|
package/dest/utils/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { generatePublicKey } from './pub_key.js';
|
|
2
2
|
export { type AztecAddressLike, type EthAddressLike, type EventSelectorLike, type FieldLike, type FunctionSelectorLike, type U128Like, type WrappedFieldLike, } from './abi_types.js';
|
|
3
|
-
export { computeAuthWitMessageHash, computeInnerAuthWitHash, computeInnerAuthWitHashFromAction, type IntentAction, } from './authwit.js';
|
|
3
|
+
export { computeAuthWitMessageHash, computeInnerAuthWitHash, computeInnerAuthWitHashFromAction, type IntentAction, type IntentInnerHash, } from './authwit.js';
|
|
4
4
|
export { waitForPXE } from './pxe.js';
|
|
5
5
|
export { waitForNode, createAztecNodeClient, AztecNode } from './node.js';
|
|
6
6
|
export { readFieldCompressedString } from './field_compressed_string.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,oBAAoB,EACzB,KAAK,QAAQ,EACb,KAAK,gBAAgB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,iCAAiC,EACjC,KAAK,YAAY,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,oBAAoB,EACzB,KAAK,QAAQ,EACb,KAAK,gBAAgB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,iCAAiC,EACjC,KAAK,YAAY,EACjB,KAAK,eAAe,GACrB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC"}
|
package/dest/utils/index.js
CHANGED
|
@@ -3,4 +3,4 @@ export { computeAuthWitMessageHash, computeInnerAuthWitHash, computeInnerAuthWit
|
|
|
3
3
|
export { waitForPXE } from './pxe.js';
|
|
4
4
|
export { waitForNode, createAztecNodeClient } from './node.js';
|
|
5
5
|
export { readFieldCompressedString } from './field_compressed_string.js';
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBVWpELE9BQU8sRUFDTCx5QkFBeUIsRUFDekIsdUJBQXVCLEVBQ3ZCLGlDQUFpQyxHQUdsQyxNQUFNLGNBQWMsQ0FBQztBQUN0QixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxXQUFXLEVBQUUscUJBQXFCLEVBQWEsTUFBTSxXQUFXLENBQUM7QUFDMUUsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sOEJBQThCLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec.js",
|
|
3
3
|
"homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.76.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": "./dest/index.js",
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
"./ethereum": "./dest/api/ethereum/index.js",
|
|
18
18
|
"./fee": "./dest/api/fee.js",
|
|
19
19
|
"./fields": "./dest/api/fields.js",
|
|
20
|
+
"./log": "./dest/api/log.js",
|
|
20
21
|
"./log_id": "./dest/api/log_id.js",
|
|
21
22
|
"./rpc": "./dest/rpc_clients/index.js",
|
|
22
23
|
"./tx_hash": "./dest/api/tx_hash.js",
|
|
@@ -77,13 +78,13 @@
|
|
|
77
78
|
]
|
|
78
79
|
},
|
|
79
80
|
"dependencies": {
|
|
80
|
-
"@aztec/circuit-types": "0.
|
|
81
|
-
"@aztec/circuits.js": "0.
|
|
82
|
-
"@aztec/ethereum": "0.
|
|
83
|
-
"@aztec/foundation": "0.
|
|
84
|
-
"@aztec/l1-artifacts": "0.
|
|
85
|
-
"@aztec/protocol-contracts": "0.
|
|
86
|
-
"@aztec/types": "0.
|
|
81
|
+
"@aztec/circuit-types": "0.76.0",
|
|
82
|
+
"@aztec/circuits.js": "0.76.0",
|
|
83
|
+
"@aztec/ethereum": "0.76.0",
|
|
84
|
+
"@aztec/foundation": "0.76.0",
|
|
85
|
+
"@aztec/l1-artifacts": "0.76.0",
|
|
86
|
+
"@aztec/protocol-contracts": "0.76.0",
|
|
87
|
+
"@aztec/types": "0.76.0",
|
|
87
88
|
"axios": "^1.7.2",
|
|
88
89
|
"tslib": "^2.4.0",
|
|
89
90
|
"viem": "2.22.8"
|
|
@@ -4,7 +4,7 @@ import { retryUntil } from '@aztec/foundation/retry';
|
|
|
4
4
|
import { createPXEClient } from '../../rpc_clients/index.js';
|
|
5
5
|
|
|
6
6
|
export const getL1ContractAddresses = async (url: string): Promise<L1ContractAddresses> => {
|
|
7
|
-
const pxeClient = createPXEClient(url);
|
|
7
|
+
const pxeClient = createPXEClient(url, {});
|
|
8
8
|
const response = await retryUntil(
|
|
9
9
|
async () => {
|
|
10
10
|
try {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { type PXE } from '@aztec/circuit-types';
|
|
1
|
+
import { type ComponentsVersions, type PXE } from '@aztec/circuit-types';
|
|
2
2
|
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
3
|
-
import { type Logger } from '@aztec/foundation/log';
|
|
3
|
+
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { NoRetryError, makeBackoff, retry } from '@aztec/foundation/retry';
|
|
5
5
|
|
|
6
6
|
import { Axios, type AxiosError } from 'axios';
|
|
@@ -33,9 +33,13 @@ async function axiosFetch(host: string, rpcMethod: string, body: any, useApiEndp
|
|
|
33
33
|
|
|
34
34
|
const isOK = resp.status >= 200 && resp.status < 300;
|
|
35
35
|
if (isOK) {
|
|
36
|
-
|
|
36
|
+
const headers = {
|
|
37
|
+
get: (header: string) =>
|
|
38
|
+
typeof resp.headers.get === 'function' ? resp.headers.get(header)?.toString() : undefined,
|
|
39
|
+
};
|
|
40
|
+
return { response: resp.data, headers };
|
|
37
41
|
} else {
|
|
38
|
-
const errorMessage = `
|
|
42
|
+
const errorMessage = `Error ${resp.status} from json-rpc server ${host} on ${rpcMethod}: ${resp.data.error.message}`;
|
|
39
43
|
if (resp.status >= 400 && resp.status < 500) {
|
|
40
44
|
throw new NoRetryError(errorMessage);
|
|
41
45
|
} else {
|
|
@@ -51,7 +55,11 @@ async function axiosFetch(host: string, rpcMethod: string, body: any, useApiEndp
|
|
|
51
55
|
* @param _logger - Debug logger to warn version incompatibilities.
|
|
52
56
|
* @returns A PXE client.
|
|
53
57
|
*/
|
|
54
|
-
export function createCompatibleClient(
|
|
58
|
+
export function createCompatibleClient(
|
|
59
|
+
rpcUrl: string,
|
|
60
|
+
logger: Logger = createLogger('aztecjs:pxe_client'),
|
|
61
|
+
versions: Partial<ComponentsVersions> = {},
|
|
62
|
+
): Promise<PXE> {
|
|
55
63
|
// Use axios due to timeout issues with fetch when proving TXs.
|
|
56
64
|
const fetch = async (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean) => {
|
|
57
65
|
return await retry(
|
|
@@ -62,7 +70,7 @@ export function createCompatibleClient(rpcUrl: string, logger: Logger): Promise<
|
|
|
62
70
|
false,
|
|
63
71
|
);
|
|
64
72
|
};
|
|
65
|
-
const pxe = createPXEClient(rpcUrl, fetch);
|
|
73
|
+
const pxe = createPXEClient(rpcUrl, versions, fetch);
|
|
66
74
|
|
|
67
75
|
return Promise.resolve(pxe);
|
|
68
76
|
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { type ComponentsVersions, getVersioningResponseHandler } from '@aztec/circuit-types';
|
|
1
2
|
import { type PXE, PXESchema } from '@aztec/circuit-types/interfaces';
|
|
2
3
|
import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
4
|
+
import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
|
|
3
5
|
|
|
4
6
|
/**
|
|
5
7
|
* Creates a JSON-RPC client to remotely talk to PXE.
|
|
@@ -7,6 +9,17 @@ import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/c
|
|
|
7
9
|
* @param fetch - The fetch implementation to use.
|
|
8
10
|
* @returns A JSON-RPC client of PXE.
|
|
9
11
|
*/
|
|
10
|
-
export function createPXEClient(
|
|
11
|
-
|
|
12
|
+
export function createPXEClient(
|
|
13
|
+
url: string,
|
|
14
|
+
versions: Partial<ComponentsVersions> = {},
|
|
15
|
+
fetch = makeFetch([1, 2, 3], false),
|
|
16
|
+
): PXE {
|
|
17
|
+
return createSafeJsonRpcClient<PXE>(url, PXESchema, {
|
|
18
|
+
namespaceMethods: 'pxe',
|
|
19
|
+
fetch,
|
|
20
|
+
onResponse: getVersioningResponseHandler({
|
|
21
|
+
l2ProtocolContractsTreeRoot: protocolContractTreeRoot.toString(),
|
|
22
|
+
...versions,
|
|
23
|
+
}),
|
|
24
|
+
});
|
|
12
25
|
}
|
package/src/utils/index.ts
CHANGED
|
@@ -13,6 +13,7 @@ export {
|
|
|
13
13
|
computeInnerAuthWitHash,
|
|
14
14
|
computeInnerAuthWitHashFromAction,
|
|
15
15
|
type IntentAction,
|
|
16
|
+
type IntentInnerHash,
|
|
16
17
|
} from './authwit.js';
|
|
17
18
|
export { waitForPXE } from './pxe.js';
|
|
18
19
|
export { waitForNode, createAztecNodeClient, AztecNode } from './node.js';
|