@aztec/aztec.js 0.47.1 → 0.49.2
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/fee.d.ts +2 -2
- package/dest/api/fee.d.ts.map +1 -1
- package/dest/api/fee.js +3 -3
- package/dest/contract/base_contract_interaction.d.ts +1 -1
- package/dest/contract/base_contract_interaction.d.ts.map +1 -1
- package/dest/contract/contract_function_interaction.d.ts +2 -0
- package/dest/contract/contract_function_interaction.d.ts.map +1 -1
- package/dest/contract/contract_function_interaction.js +2 -2
- package/dest/contract/sent_tx.d.ts +6 -0
- package/dest/contract/sent_tx.d.ts.map +1 -1
- package/dest/contract/sent_tx.js +12 -1
- package/dest/entrypoint/payload.js +3 -3
- package/dest/fee/{native_fee_payment_method.d.ts → fee_juice_payment_method.d.ts} +3 -3
- package/dest/fee/fee_juice_payment_method.d.ts.map +1 -0
- package/dest/fee/fee_juice_payment_method.js +19 -0
- package/dest/fee/{native_fee_payment_method_with_claim.d.ts → fee_juice_payment_method_with_claim.d.ts} +5 -5
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts.map +1 -0
- package/dest/fee/fee_juice_payment_method_with_claim.js +32 -0
- package/dest/index.d.ts +2 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +3 -3
- package/dest/rpc_clients/index.d.ts +1 -0
- package/dest/rpc_clients/index.d.ts.map +1 -1
- package/dest/rpc_clients/index.js +2 -1
- package/dest/rpc_clients/node/index.d.ts +11 -0
- package/dest/rpc_clients/node/index.d.ts.map +1 -0
- package/dest/rpc_clients/node/index.js +62 -0
- package/dest/rpc_clients/pxe_client.d.ts.map +1 -1
- package/dest/rpc_clients/pxe_client.js +5 -2
- package/dest/utils/authwit.js +4 -4
- package/dest/utils/cheat_codes.d.ts +15 -6
- package/dest/utils/cheat_codes.d.ts.map +1 -1
- package/dest/utils/cheat_codes.js +34 -18
- package/dest/wallet/account_wallet.js +2 -2
- package/dest/wallet/base_wallet.d.ts +7 -6
- package/dest/wallet/base_wallet.d.ts.map +1 -1
- package/dest/wallet/base_wallet.js +10 -10
- package/package.json +8 -7
- package/src/api/fee.ts +2 -2
- package/src/contract/contract_function_interaction.ts +3 -1
- package/src/contract/sent_tx.ts +21 -0
- package/src/entrypoint/payload.ts +2 -2
- package/src/fee/{native_fee_payment_method.ts → fee_juice_payment_method.ts} +4 -4
- package/src/fee/{native_fee_payment_method_with_claim.ts → fee_juice_payment_method_with_claim.ts} +6 -6
- package/src/index.ts +2 -1
- package/src/rpc_clients/index.ts +1 -0
- package/src/rpc_clients/node/index.ts +69 -0
- package/src/rpc_clients/pxe_client.ts +4 -0
- package/src/utils/authwit.ts +3 -3
- package/src/utils/cheat_codes.ts +35 -17
- package/src/wallet/account_wallet.ts +1 -1
- package/src/wallet/base_wallet.ts +17 -11
- package/dest/fee/native_fee_payment_method.d.ts.map +0 -1
- package/dest/fee/native_fee_payment_method.js +0 -19
- package/dest/fee/native_fee_payment_method_with_claim.d.ts.map +0 -1
- package/dest/fee/native_fee_payment_method_with_claim.js +0 -32
package/dest/api/fee.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export type { FeePaymentMethod } from '../fee/fee_payment_method.js';
|
|
2
|
-
export {
|
|
2
|
+
export { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';
|
|
3
3
|
export { PrivateFeePaymentMethod } from '../fee/private_fee_payment_method.js';
|
|
4
4
|
export { PublicFeePaymentMethod } from '../fee/public_fee_payment_method.js';
|
|
5
|
-
export {
|
|
5
|
+
export { FeeJuicePaymentMethodWithClaim } from '../fee/fee_juice_payment_method_with_claim.js';
|
|
6
6
|
export { NoFeePaymentMethod } from '../fee/no_fee_payment_method.js';
|
|
7
7
|
//# sourceMappingURL=fee.d.ts.map
|
package/dest/api/fee.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fee.d.ts","sourceRoot":"","sources":["../../src/api/fee.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"fee.d.ts","sourceRoot":"","sources":["../../src/api/fee.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,+CAA+C,CAAC;AAC/F,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC"}
|
package/dest/api/fee.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';
|
|
2
2
|
export { PrivateFeePaymentMethod } from '../fee/private_fee_payment_method.js';
|
|
3
3
|
export { PublicFeePaymentMethod } from '../fee/public_fee_payment_method.js';
|
|
4
|
-
export {
|
|
4
|
+
export { FeeJuicePaymentMethodWithClaim } from '../fee/fee_juice_payment_method_with_claim.js';
|
|
5
5
|
export { NoFeePaymentMethod } from '../fee/no_fee_payment_method.js';
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwaS9mZWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDM0UsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDL0UsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDN0UsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFDL0YsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0saUNBQWlDLENBQUMifQ==
|
|
@@ -64,7 +64,7 @@ export declare abstract class BaseContractInteraction {
|
|
|
64
64
|
*/
|
|
65
65
|
protected getFeeOptionsFromEstimatedGas(request: ExecutionRequestInit): Promise<{
|
|
66
66
|
gasSettings: GasSettings;
|
|
67
|
-
paymentMethod: import("../index.js").FeePaymentMethod;
|
|
67
|
+
paymentMethod: import("../index.js").FeePaymentMethod;
|
|
68
68
|
} | undefined>;
|
|
69
69
|
}
|
|
70
70
|
//# sourceMappingURL=base_contract_interaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_contract_interaction.d.ts","sourceRoot":"","sources":["../../src/contract/base_contract_interaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzF,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,2EAA2E;IAC3E,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,2CAA2C;IAC3C,GAAG,CAAC,EAAE,UAAU,CAAC;IACjB,uJAAuJ;IACvJ,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,8BAAsB,uBAAuB;IAU/B,SAAS,CAAC,MAAM,EAAE,MAAM;IATpC;;;OAGG;IACI,EAAE,CAAC,EAAE,EAAE,CAAC;IACf,SAAS,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAEzC,SAAS,CAAC,GAAG,yCAAsD;gBAE7C,MAAM,EAAE,MAAM;IAEpC;;;;OAIG;aACa,MAAM,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAEhF;;;;OAIG;IACU,KAAK,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,EAAE,CAAC;IAMhE;;;;;;;;OAQG;IACI,IAAI,CAAC,OAAO,GAAE,iBAAsB;IAS3C;;;;OAIG;IACU,WAAW,CACtB,IAAI,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,sBAAsB,CAAC,GACrE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,CAAC;IAkBhE;;;;OAIG;cACa,6BAA6B,CAAC,OAAO,EAAE,oBAAoB
|
|
1
|
+
{"version":3,"file":"base_contract_interaction.d.ts","sourceRoot":"","sources":["../../src/contract/base_contract_interaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzF,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,2EAA2E;IAC3E,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,2CAA2C;IAC3C,GAAG,CAAC,EAAE,UAAU,CAAC;IACjB,uJAAuJ;IACvJ,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,8BAAsB,uBAAuB;IAU/B,SAAS,CAAC,MAAM,EAAE,MAAM;IATpC;;;OAGG;IACI,EAAE,CAAC,EAAE,EAAE,CAAC;IACf,SAAS,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAEzC,SAAS,CAAC,GAAG,yCAAsD;gBAE7C,MAAM,EAAE,MAAM;IAEpC;;;;OAIG;aACa,MAAM,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAEhF;;;;OAIG;IACU,KAAK,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,EAAE,CAAC;IAMhE;;;;;;;;OAQG;IACI,IAAI,CAAC,OAAO,GAAE,iBAAsB;IAS3C;;;;OAIG;IACU,WAAW,CACtB,IAAI,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,sBAAsB,CAAC,GACrE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,CAAC;IAkBhE;;;;OAIG;cACa,6BAA6B,CAAC,OAAO,EAAE,oBAAoB;;;;CAiB5E"}
|
|
@@ -14,6 +14,8 @@ export type SimulateMethodOptions = {
|
|
|
14
14
|
from?: AztecAddress;
|
|
15
15
|
/** Gas settings for the simulation. */
|
|
16
16
|
gasSettings?: GasSettings;
|
|
17
|
+
/** Simulate without checking for the validity of the resulting transaction, e.g. whether it emits any existing nullifiers. */
|
|
18
|
+
skipTxValidation?: boolean;
|
|
17
19
|
};
|
|
18
20
|
/**
|
|
19
21
|
* This is the class that is returned when calling e.g. `contract.methods.myMethod(arg0, arg1)`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract_function_interaction.d.ts","sourceRoot":"","sources":["../../src/contract/contract_function_interaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EACL,KAAK,WAAW,EAKjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,KAAK,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEjG,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAE7B;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,kCAAkC;IAClC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,uCAAuC;IACvC,WAAW,CAAC,EAAE,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"contract_function_interaction.d.ts","sourceRoot":"","sources":["../../src/contract/contract_function_interaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EACL,KAAK,WAAW,EAKjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,KAAK,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEjG,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAE7B;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,kCAAkC;IAClC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,uCAAuC;IACvC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,8HAA8H;IAC9H,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,uBAAuB;IAGpE,SAAS,CAAC,eAAe,EAAE,YAAY;IACvC,SAAS,CAAC,WAAW,EAAE,WAAW;IAClC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE;gBAHrB,MAAM,EAAE,MAAM,EACJ,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,GAAG,EAAE;IAQvB;;;;;OAKG;IACU,MAAM,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAY1E;;;;OAIG;IACI,OAAO,IAAI,YAAY;IAa9B;;;;;;;;OAQG;IACU,QAAQ,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,GAAG,CAAC;CAkBzE"}
|
|
@@ -62,7 +62,7 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
|
|
|
62
62
|
return this.wallet.simulateUnconstrained(this.functionDao.name, this.args, this.contractAddress, options?.from);
|
|
63
63
|
}
|
|
64
64
|
const txRequest = await this.create();
|
|
65
|
-
const simulatedTx = await this.wallet.simulateTx(txRequest, true, options?.from);
|
|
65
|
+
const simulatedTx = await this.wallet.simulateTx(txRequest, true, options?.from, options?.skipTxValidation);
|
|
66
66
|
// As account entrypoints are private, for private functions we retrieve the return values from the first nested call
|
|
67
67
|
// since we're interested in the first set of values AFTER the account entrypoint
|
|
68
68
|
// For public functions we retrieve the first values directly from the public output.
|
|
@@ -72,4 +72,4 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
|
|
|
72
72
|
return rawReturnValues ? decodeReturnValues(this.functionDao.returnTypes, rawReturnValues) : [];
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfZnVuY3Rpb25faW50ZXJhY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvY29udHJhY3RfZnVuY3Rpb25faW50ZXJhY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUVMLGdCQUFnQixFQUNoQixZQUFZLEVBQ1osa0JBQWtCLEVBQ2xCLGVBQWUsR0FDaEIsTUFBTSx1QkFBdUIsQ0FBQztBQUcvQixPQUFPLEVBQUUsdUJBQXVCLEVBQTBCLE1BQU0sZ0NBQWdDLENBQUM7QUFrQmpHOzs7R0FHRztBQUNILE1BQU0sT0FBTywyQkFBNEIsU0FBUSx1QkFBdUI7SUFDdEUsWUFDRSxNQUFjLEVBQ0osZUFBNkIsRUFDN0IsV0FBd0IsRUFDeEIsSUFBVztRQUVyQixLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7UUFKSixvQkFBZSxHQUFmLGVBQWUsQ0FBYztRQUM3QixnQkFBVyxHQUFYLFdBQVcsQ0FBYTtRQUN4QixTQUFJLEdBQUosSUFBSSxDQUFPO1FBR3JCLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSyxTQUFTLElBQUksR0FBRyxLQUFLLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDeEQsTUFBTSxJQUFJLEtBQUssQ0FBQyw2RUFBNkUsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUN4RyxDQUFDO0lBQ0gsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0ksS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUF3QjtRQUMxQyxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsWUFBWSxLQUFLLFlBQVksQ0FBQyxhQUFhLEVBQUUsQ0FBQztZQUNqRSxNQUFNLElBQUksS0FBSyxDQUFDLG1EQUFtRCxDQUFDLENBQUM7UUFDdkUsQ0FBQztRQUNELElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDcEIsTUFBTSxLQUFLLEdBQUcsQ0FBQyxJ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
|
|
@@ -4,8 +4,12 @@ import { type FieldsOf } from '@aztec/foundation/types';
|
|
|
4
4
|
export type WaitOpts = {
|
|
5
5
|
/** The maximum time (in seconds) to wait for the transaction to be mined. Defaults to 60. */
|
|
6
6
|
timeout?: number;
|
|
7
|
+
/** The maximum time (in seconds) to wait for the transaction to be proven. Defaults to 600. */
|
|
8
|
+
provenTimeout?: number;
|
|
7
9
|
/** The time interval (in seconds) between retries to fetch the transaction receipt. Defaults to 1. */
|
|
8
10
|
interval?: number;
|
|
11
|
+
/** Whether to wait for the tx to be proven. */
|
|
12
|
+
proven?: boolean;
|
|
9
13
|
/**
|
|
10
14
|
* Whether to wait for the PXE Service to sync all notes up to the block in which this tx was mined.
|
|
11
15
|
* If false, then any queries that depend on state set by this transaction may return stale data. Defaults to true.
|
|
@@ -30,6 +34,7 @@ export declare class SentTx {
|
|
|
30
34
|
* The function internally awaits for the 'txHashPromise' to resolve, and then returns the resolved transaction hash.
|
|
31
35
|
*
|
|
32
36
|
* @returns A promise that resolves to the transaction hash of the SentTx instance.
|
|
37
|
+
* TODO(#7717): Don't throw here.
|
|
33
38
|
*/
|
|
34
39
|
getTxHash(): Promise<TxHash>;
|
|
35
40
|
/**
|
|
@@ -59,5 +64,6 @@ export declare class SentTx {
|
|
|
59
64
|
*/
|
|
60
65
|
getVisibleNotes(): Promise<ExtendedNote[]>;
|
|
61
66
|
protected waitForReceipt(opts?: WaitOpts): Promise<TxReceipt>;
|
|
67
|
+
protected waitForProven(minedBlock: number, opts?: WaitOpts): Promise<number>;
|
|
62
68
|
}
|
|
63
69
|
//# sourceMappingURL=sent_tx.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sent_tx.d.ts","sourceRoot":"","sources":["../../src/contract/sent_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAC/B,KAAK,GAAG,EACR,KAAK,MAAM,EACX,KAAK,SAAS,EAEf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,2CAA2C;AAC3C,MAAM,MAAM,QAAQ,GAAG;IACrB,6FAA6F;IAC7F,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sGAAsG;IACtG,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;QAGI;IACJ,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,kFAAkF;IAClF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,0HAA0H;IAC1H,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"sent_tx.d.ts","sourceRoot":"","sources":["../../src/contract/sent_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAC/B,KAAK,GAAG,EACR,KAAK,MAAM,EACX,KAAK,SAAS,EAEf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,2CAA2C;AAC3C,MAAM,MAAM,QAAQ,GAAG;IACrB,6FAA6F;IAC7F,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+FAA+F;IAC/F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sGAAsG;IACtG,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+CAA+C;IAC/C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;QAGI;IACJ,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,kFAAkF;IAClF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,0HAA0H;IAC1H,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,QAM7B,CAAC;AAEF;;;GAGG;AACH,qBAAa,MAAM;IACL,SAAS,CAAC,GAAG,EAAE,GAAG;IAAE,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC;gBAAlD,GAAG,EAAE,GAAG,EAAY,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC;IAExE;;;;;;OAMG;IACI,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAInC;;;;;;OAMG;IACU,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC;IAK7C;;;;OAIG;IACU,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IA8BhE;;;;OAIG;IACU,kBAAkB,IAAI,OAAO,CAAC,0BAA0B,CAAC;IAKtE;;;;OAIG;IACU,eAAe,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAKvC,cAAc,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;cA8BnD,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ;CAWlE"}
|
package/dest/contract/sent_tx.js
CHANGED
|
@@ -2,6 +2,7 @@ import { TxStatus, } from '@aztec/circuit-types';
|
|
|
2
2
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
3
3
|
export const DefaultWaitOpts = {
|
|
4
4
|
timeout: 60,
|
|
5
|
+
provenTimeout: 600,
|
|
5
6
|
interval: 1,
|
|
6
7
|
waitForNotesSync: true,
|
|
7
8
|
debug: false,
|
|
@@ -20,6 +21,7 @@ export class SentTx {
|
|
|
20
21
|
* The function internally awaits for the 'txHashPromise' to resolve, and then returns the resolved transaction hash.
|
|
21
22
|
*
|
|
22
23
|
* @returns A promise that resolves to the transaction hash of the SentTx instance.
|
|
24
|
+
* TODO(#7717): Don't throw here.
|
|
23
25
|
*/
|
|
24
26
|
getTxHash() {
|
|
25
27
|
return this.txHashPromise;
|
|
@@ -48,6 +50,9 @@ export class SentTx {
|
|
|
48
50
|
if (receipt.status !== TxStatus.SUCCESS && !opts?.dontThrowOnRevert) {
|
|
49
51
|
throw new Error(`Transaction ${await this.getTxHash()} was ${receipt.status}. Reason: ${receipt.error ?? 'unknown'}`);
|
|
50
52
|
}
|
|
53
|
+
if (opts?.proven && receipt.blockNumber !== undefined) {
|
|
54
|
+
await this.waitForProven(receipt.blockNumber, opts);
|
|
55
|
+
}
|
|
51
56
|
if (opts?.debug) {
|
|
52
57
|
const txHash = await this.getTxHash();
|
|
53
58
|
const tx = (await this.pxe.getTxEffect(txHash));
|
|
@@ -106,5 +111,11 @@ export class SentTx {
|
|
|
106
111
|
return areNotesSynced ? txReceipt : undefined;
|
|
107
112
|
}, 'isMined', opts?.timeout ?? DefaultWaitOpts.timeout, opts?.interval ?? DefaultWaitOpts.interval);
|
|
108
113
|
}
|
|
114
|
+
async waitForProven(minedBlock, opts) {
|
|
115
|
+
return await retryUntil(async () => {
|
|
116
|
+
const provenBlock = await this.pxe.getProvenBlockNumber();
|
|
117
|
+
return provenBlock >= minedBlock ? provenBlock : undefined;
|
|
118
|
+
}, 'isProven', opts?.provenTimeout ?? DefaultWaitOpts.provenTimeout, opts?.interval ?? DefaultWaitOpts.interval);
|
|
119
|
+
}
|
|
109
120
|
}
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VudF90eC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9zZW50X3R4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFNTCxRQUFRLEdBQ1QsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUF3QnJELE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBYTtJQUN2QyxPQUFPLEVBQUUsRUFBRTtJQUNYLGFBQWEsRUFBRSxHQUFHO0lBQ2xCLFFBQVEsRUFBRSxDQUFDO0lBQ1gsZ0JBQWdCLEVBQUUsSUFBSTtJQUN0QixLQUFLLEVBQUUsS0FBSztDQUNiLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sTUFBTTtJQUNqQixZQUFzQixHQUFRLEVBQVksYUFBOEI7UUFBbEQsUUFBRyxHQUFILEdBQUcsQ0FBSztRQUFZLGtCQUFhLEdBQWIsYUFBYSxDQUFpQjtJQUFHLENBQUM7SUFFNUU7Ozs7OztPQU1HO0lBQ0ksU0FBUztRQUNkLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQztJQUM1QixDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0ksS0FBSyxDQUFDLFVBQVU7UUFDckIsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDdEMsT0FBTyxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFlO1FBQy9CLElBQUksSUFBSSxFQUFFLEtBQUssSUFBSSxJQUFJLENBQUMsZ0JBQWdCLEtBQUssS0FBSyxFQUFFLENBQUM7WUFDbkQsTUFBTSxJQUFJLEtBQUssQ0FBQyx1REFBdUQsQ0FBQyxDQUFDO1FBQzNFLENBQUM7UUFDRCxNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFj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
|
|
@@ -4,7 +4,7 @@ import { FunctionCall, PackedValues } from '@aztec/circuit-types';
|
|
|
4
4
|
import { Fr, GeneratorIndex } from '@aztec/circuits.js';
|
|
5
5
|
import { FunctionType } from '@aztec/foundation/abi';
|
|
6
6
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
7
|
-
import {
|
|
7
|
+
import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
|
|
8
8
|
// These must match the values defined in:
|
|
9
9
|
// - noir-projects/aztec-nr/aztec/src/entrypoint/app.nr
|
|
10
10
|
const APP_MAX_CALLS = 4;
|
|
@@ -59,7 +59,7 @@ export class EntrypointPayload {
|
|
|
59
59
|
* @returns The hash of the payload
|
|
60
60
|
*/
|
|
61
61
|
hash() {
|
|
62
|
-
return
|
|
62
|
+
return poseidon2HashWithSeparator(this.toFields(), __classPrivateFieldGet(this, _EntrypointPayload_generatorIndex, "f"));
|
|
63
63
|
}
|
|
64
64
|
/** Serializes the function calls to an array of fields. */
|
|
65
65
|
functionCallsToFields() {
|
|
@@ -129,4 +129,4 @@ class FeeEntrypointPayload extends EntrypointPayload {
|
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
_FeeEntrypointPayload_isFeePayer = new WeakMap();
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
132
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF5bG9hZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbnRyeXBvaW50L3BheWxvYWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xFLE9BQU8sRUFBcUIsRUFBRSxFQUFvQixjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM3RixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNELE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBZXRFLDBDQUEwQztBQUMxQyx1REFBdUQ7QUFDdkQsTUFBTSxhQUFhLEdBQUcsQ0FBQyxDQUFDO0FBQ3hCLDJEQUEyRDtBQUMzRCxNQUFNLGFBQWEsR0FBRyxDQUFDLENBQUM7QUFnQnhCLDZCQUE2QjtBQUU3QixzQ0FBc0M7QUFDdEMsTUFBTSxPQUFnQixpQkFBaUI7SUFNckMsWUFBc0IsYUFBNkIsRUFBRSxjQUFzQjtRQUwzRSw2Q0FBbUMsRUFBRSxFQUFDO1FBQ3RDLDJDQUF3QyxFQUFFLEVBQUM7UUFDM0MsbUNBQVMsRUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFDO1FBQ3JCLG9EQUF3QjtRQUd0QixLQUFLLE1BQU0sSUFBSSxJQUFJLGFBQWEsRUFBRSxDQUFDO1lBQ2pDLHVCQUFBLElBQUksMENBQWlCLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDakUsQ0FBQztRQUVELDhCQUE4QjtRQUM5Qix1QkFBQSxJQUFJLG9DQUFrQixhQUFhLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN4RCxTQUFTLEVBQUUsdUJBQUEsSUFBSSww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
|
|
@@ -2,13 +2,13 @@ import { type FunctionCall } from '@aztec/circuit-types';
|
|
|
2
2
|
import { type AztecAddress } from '@aztec/circuits.js';
|
|
3
3
|
import { type FeePaymentMethod } from './fee_payment_method.js';
|
|
4
4
|
/**
|
|
5
|
-
* Pay fee directly in the
|
|
5
|
+
* Pay fee directly in the Fee Juice.
|
|
6
6
|
*/
|
|
7
|
-
export declare class
|
|
7
|
+
export declare class FeeJuicePaymentMethod implements FeePaymentMethod {
|
|
8
8
|
protected sender: AztecAddress;
|
|
9
9
|
constructor(sender: AztecAddress);
|
|
10
10
|
getAsset(): AztecAddress;
|
|
11
11
|
getFunctionCalls(): Promise<FunctionCall[]>;
|
|
12
12
|
getFeePayer(): Promise<AztecAddress>;
|
|
13
13
|
}
|
|
14
|
-
//# sourceMappingURL=
|
|
14
|
+
//# sourceMappingURL=fee_juice_payment_method.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fee_juice_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/fee_juice_payment_method.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;GAEG;AACH,qBAAa,qBAAsB,YAAW,gBAAgB;IAChD,SAAS,CAAC,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;IAE1C,QAAQ;IAIR,gBAAgB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAI3C,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;CAGrC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { FeeJuiceAddress } from '@aztec/protocol-contracts/fee-juice';
|
|
2
|
+
/**
|
|
3
|
+
* Pay fee directly in the Fee Juice.
|
|
4
|
+
*/
|
|
5
|
+
export class FeeJuicePaymentMethod {
|
|
6
|
+
constructor(sender) {
|
|
7
|
+
this.sender = sender;
|
|
8
|
+
}
|
|
9
|
+
getAsset() {
|
|
10
|
+
return FeeJuiceAddress;
|
|
11
|
+
}
|
|
12
|
+
getFunctionCalls() {
|
|
13
|
+
return Promise.resolve([]);
|
|
14
|
+
}
|
|
15
|
+
getFeePayer() {
|
|
16
|
+
return Promise.resolve(this.sender);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2p1aWNlX3BheW1lbnRfbWV0aG9kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZlZS9mZWVfanVpY2VfcGF5bWVudF9tZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBSXRFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHFCQUFxQjtJQUNoQyxZQUFzQixNQUFvQjtRQUFwQixXQUFNLEdBQU4sTUFBTSxDQUFjO0lBQUcsQ0FBQztJQUU5QyxRQUFRO1FBQ04sT0FBTyxlQUFlLENBQUM7SUFDekIsQ0FBQztJQUVELGdCQUFnQjtRQUNkLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUM3QixDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDdEMsQ0FBQztDQUNGIn0=
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { type FunctionCall } from '@aztec/circuit-types';
|
|
2
2
|
import { type AztecAddress, Fr } from '@aztec/circuits.js';
|
|
3
|
-
import {
|
|
3
|
+
import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
|
|
4
4
|
/**
|
|
5
|
-
* Pay fee directly with
|
|
5
|
+
* Pay fee directly with Fee Juice claimed on the same tx.
|
|
6
6
|
*/
|
|
7
|
-
export declare class
|
|
7
|
+
export declare class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
|
|
8
8
|
private claimAmount;
|
|
9
9
|
private claimSecret;
|
|
10
10
|
constructor(sender: AztecAddress, claimAmount: bigint | Fr, claimSecret: Fr);
|
|
11
11
|
/**
|
|
12
|
-
* Creates a function call to pay the fee in
|
|
12
|
+
* Creates a function call to pay the fee in Fee Juice.
|
|
13
13
|
* @returns A function call
|
|
14
14
|
*/
|
|
15
15
|
getFunctionCalls(): Promise<FunctionCall[]>;
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=
|
|
17
|
+
//# sourceMappingURL=fee_juice_payment_method_with_claim.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fee_juice_payment_method_with_claim.d.ts","sourceRoot":"","sources":["../../src/fee/fee_juice_payment_method_with_claim.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,KAAK,YAAY,EAAE,EAAE,EAAoB,MAAM,oBAAoB,CAAC;AAI7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE;;GAEG;AACH,qBAAa,8BAA+B,SAAQ,qBAAqB;IACrC,OAAO,CAAC,WAAW;IAAe,OAAO,CAAC,WAAW;gBAA3E,MAAM,EAAE,YAAY,EAAU,WAAW,EAAE,MAAM,GAAG,EAAE,EAAU,WAAW,EAAE,EAAE;IAI3F;;;OAGG;IACM,gBAAgB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;CAarD"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { Fr, FunctionSelector } from '@aztec/circuits.js';
|
|
2
|
+
import { FunctionType } from '@aztec/foundation/abi';
|
|
3
|
+
import { FeeJuiceAddress } from '@aztec/protocol-contracts/fee-juice';
|
|
4
|
+
import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
|
|
5
|
+
/**
|
|
6
|
+
* Pay fee directly with Fee Juice claimed on the same tx.
|
|
7
|
+
*/
|
|
8
|
+
export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
|
|
9
|
+
constructor(sender, claimAmount, claimSecret) {
|
|
10
|
+
super(sender);
|
|
11
|
+
this.claimAmount = claimAmount;
|
|
12
|
+
this.claimSecret = claimSecret;
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Creates a function call to pay the fee in Fee Juice.
|
|
16
|
+
* @returns A function call
|
|
17
|
+
*/
|
|
18
|
+
getFunctionCalls() {
|
|
19
|
+
return Promise.resolve([
|
|
20
|
+
{
|
|
21
|
+
to: FeeJuiceAddress,
|
|
22
|
+
name: 'claim',
|
|
23
|
+
selector: FunctionSelector.fromSignature('claim((Field),Field,Field)'),
|
|
24
|
+
isStatic: false,
|
|
25
|
+
args: [this.sender, new Fr(this.claimAmount), this.claimSecret],
|
|
26
|
+
returnTypes: [],
|
|
27
|
+
type: FunctionType.PRIVATE,
|
|
28
|
+
},
|
|
29
|
+
]);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2p1aWNlX3BheW1lbnRfbWV0aG9kX3dpdGhfY2xhaW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmVlL2ZlZV9qdWljZV9wYXltZW50X21ldGhvZF93aXRoX2NsYWltLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBcUIsRUFBRSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDN0UsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUV0RSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUV0RTs7R0FFRztBQUNILE1BQU0sT0FBTyw4QkFBK0IsU0FBUSxxQkFBcUI7SUFDdkUsWUFBWSxNQUFvQixFQUFVLFdBQXdCLEVBQVUsV0FBZTtRQUN6RixLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7UUFEMEIsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFBVSxnQkFBVyxHQUFYLFdBQVcsQ0FBSTtJQUUzRixDQUFDO0lBRUQ7OztPQUdHO0lBQ00sZ0JBQWdCO1FBQ3ZCLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQztZQUNyQjtnQkFDRSxFQUFFLEVBQUUsZUFBZTtnQkFDbkIsSUFBSSxFQUFFLE9BQU87Z0JBQ2IsUUFBUSxFQUFFLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyw0QkFBNEIsQ0FBQztnQkFDdEUsUUFBUSxFQUFFLEtBQUs7Z0JBQ2YsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQztnQkFDL0QsV0FBVyxFQUFFLEVBQUU7Z0JBQ2YsSUFBSSxFQUFFLFlBQVksQ0FBQyxPQUFPO2FBQzNCO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIn0=
|
package/dest/index.d.ts
CHANGED
|
@@ -23,7 +23,7 @@ export { BatchCall, Contract, ContractBase, ContractFunctionInteraction, type Co
|
|
|
23
23
|
export { ContractDeployer } from './deployment/index.js';
|
|
24
24
|
export { AztecAddressLike, CheatCodes, EthAddressLike, EthCheatCodes, EventSelectorLike, FieldLike, FunctionSelectorLike, WrappedFieldLike, computeAuthWitMessageHash, computeInnerAuthWitHashFromAction, computeInnerAuthWitHash, generatePublicKey, waitForAccountSynch, waitForPXE, } from './utils/index.js';
|
|
25
25
|
export { NoteSelector } from '@aztec/foundation/abi';
|
|
26
|
-
export { createPXEClient } from './rpc_clients/index.js';
|
|
26
|
+
export { createPXEClient, createCompatibleClient } from './rpc_clients/index.js';
|
|
27
27
|
export { AuthWitnessProvider } from './account/index.js';
|
|
28
28
|
export { AccountContract } from './account/index.js';
|
|
29
29
|
export { AccountManager, DeployAccountOptions } from './account_manager/index.js';
|
|
@@ -32,7 +32,7 @@ export { AztecAddress, EthAddress, Fq, Fr, GlobalVariables, GrumpkinScalar, INIT
|
|
|
32
32
|
export { computeSecretHash } from '@aztec/circuits.js/hash';
|
|
33
33
|
export { computeAppNullifierSecretKey, deriveKeys, deriveMasterIncomingViewingSecretKey, deriveMasterNullifierSecretKey, } from '@aztec/circuits.js/keys';
|
|
34
34
|
export { Grumpkin, Schnorr } from '@aztec/circuits.js/barretenberg';
|
|
35
|
-
export { AuthWitness, AztecNode, Body, Comparator, CompleteAddress, EncryptedL2BlockL2Logs, EncryptedLogHeader, EncryptedNoteLogIncomingBody, EncryptedLogOutgoingBody, EventType, ExtendedNote, FunctionCall, L1Actor, L1ToL2Message, L2Actor, L2Block, L2BlockL2Logs, EncryptedNoteL2BlockL2Logs, LogFilter, LogId, LogType, MerkleTreeId, Note, PXE, PackedValues, PartialAddress, PublicKey, SiblingPath, SyncStatus, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, UnencryptedL2BlockL2Logs, UnencryptedL2Log, createAztecNodeClient, merkleTreeIds, mockTx, TaggedLog, L1NotePayload, L1EventPayload, } from '@aztec/circuit-types';
|
|
35
|
+
export { AuthWitness, AztecNode, Body, Comparator, CompleteAddress, EncryptedL2BlockL2Logs, EncryptedLogHeader, EncryptedNoteLogIncomingBody, EncryptedLogOutgoingBody, EventType, ExtendedNote, UniqueNote, FunctionCall, L1Actor, L1ToL2Message, L2Actor, L2Block, L2BlockL2Logs, EncryptedNoteL2BlockL2Logs, LogFilter, LogId, LogType, MerkleTreeId, Note, PXE, PackedValues, PartialAddress, PublicKey, SiblingPath, SyncStatus, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, UnencryptedL2BlockL2Logs, UnencryptedL2Log, createAztecNodeClient, merkleTreeIds, mockTx, TaggedLog, L1NotePayload, L1EventPayload, } from '@aztec/circuit-types';
|
|
36
36
|
export { NodeInfo } from '@aztec/types/interfaces';
|
|
37
37
|
export { ContractClassWithId, ContractInstanceWithAddress } from '@aztec/types/contracts';
|
|
38
38
|
export { encodeArguments } from '@aztec/foundation/abi';
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,EACL,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,2BAA2B,EAC3B,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,qBAAqB,EAC1B,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,KAAK,iBAAiB,EACtB,MAAM,EACN,KAAK,QAAQ,GACd,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,cAAc,EACd,aAAa,EACb,iBAAiB,EACjB,SAAS,EACT,oBAAoB,EACpB,gBAAgB,EAChB,yBAAyB,EACzB,iCAAiC,EACjC,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACnB,UAAU,GACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dest/index.js
CHANGED
|
@@ -23,7 +23,7 @@ export { BatchCall, Contract, ContractBase, ContractFunctionInteraction, Default
|
|
|
23
23
|
export { ContractDeployer } from './deployment/index.js';
|
|
24
24
|
export { CheatCodes, EthCheatCodes, computeAuthWitMessageHash, computeInnerAuthWitHashFromAction, computeInnerAuthWitHash, generatePublicKey, waitForAccountSynch, waitForPXE, } from './utils/index.js';
|
|
25
25
|
export { NoteSelector } from '@aztec/foundation/abi';
|
|
26
|
-
export { createPXEClient } from './rpc_clients/index.js';
|
|
26
|
+
export { createPXEClient, createCompatibleClient } from './rpc_clients/index.js';
|
|
27
27
|
export { AccountManager } from './account_manager/index.js';
|
|
28
28
|
export { AccountWallet, AccountWalletWithSecretKey, SignerlessWallet } from './wallet/index.js';
|
|
29
29
|
// // TODO https://github.com/AztecProtocol/aztec-packages/issues/2632 --> FunctionSelector might not need to be exposed
|
|
@@ -32,7 +32,7 @@ export { AztecAddress, EthAddress, Fq, Fr, GlobalVariables, GrumpkinScalar, INIT
|
|
|
32
32
|
export { computeSecretHash } from '@aztec/circuits.js/hash';
|
|
33
33
|
export { computeAppNullifierSecretKey, deriveKeys, deriveMasterIncomingViewingSecretKey, deriveMasterNullifierSecretKey, } from '@aztec/circuits.js/keys';
|
|
34
34
|
export { Grumpkin, Schnorr } from '@aztec/circuits.js/barretenberg';
|
|
35
|
-
export { AuthWitness, Body, Comparator, CompleteAddress, EncryptedL2BlockL2Logs, EncryptedLogHeader, EncryptedNoteLogIncomingBody, EncryptedLogOutgoingBody, EventType, ExtendedNote, FunctionCall, L1Actor, L1ToL2Message, L2Actor, L2Block, L2BlockL2Logs, EncryptedNoteL2BlockL2Logs, LogId, LogType, MerkleTreeId, Note, PackedValues, SiblingPath, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, UnencryptedL2BlockL2Logs, UnencryptedL2Log, createAztecNodeClient, merkleTreeIds, mockTx, TaggedLog, L1NotePayload, L1EventPayload, } from '@aztec/circuit-types';
|
|
35
|
+
export { AuthWitness, Body, Comparator, CompleteAddress, EncryptedL2BlockL2Logs, EncryptedLogHeader, EncryptedNoteLogIncomingBody, EncryptedLogOutgoingBody, EventType, ExtendedNote, UniqueNote, FunctionCall, L1Actor, L1ToL2Message, L2Actor, L2Block, L2BlockL2Logs, EncryptedNoteL2BlockL2Logs, LogId, LogType, MerkleTreeId, Note, PackedValues, SiblingPath, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, UnencryptedL2BlockL2Logs, UnencryptedL2Log, createAztecNodeClient, merkleTreeIds, mockTx, TaggedLog, L1NotePayload, L1EventPayload, } from '@aztec/circuit-types';
|
|
36
36
|
// TODO: These kinds of things have no place on our public api.
|
|
37
37
|
// External devs will almost certainly have their own methods of doing these things.
|
|
38
38
|
// If we want to use them in our own "aztec.js consuming code", import them from foundation as needed.
|
|
@@ -53,4 +53,4 @@ export { deployL1Contract, deployL1Contracts, } from '@aztec/ethereum';
|
|
|
53
53
|
export * from './api/abi.js';
|
|
54
54
|
export * from './api/fee.js';
|
|
55
55
|
export * from './api/init.js';
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JHO0FBQ0gsT0FBTyxFQUNMLFNBQVMsRUFDVCxRQUFRLEVBQ1IsWUFBWSxFQUNaLDJCQUEyQixFQUkzQixlQUFlLEVBQ2YsWUFBWSxFQUNaLFlBQVksRUFFWixNQUFNLEdBRVAsTUFBTSxxQkFBcUIsQ0FBQztBQUU3QixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV6RCxPQUFPLEVBRUwsVUFBVSxFQUVWLGFBQWEsRUFLYix5QkFBeUIsRUFDekIsaUNBQWlDLEVBQ2pDLHVCQUF1QixFQUN2QixpQkFBaUIsRUFDakIsbUJBQW1CLEVBQ25CLFVBQVUsR0FDWCxNQUFNLGtCQUFrQixDQUFDO0FBQzFCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVyRCxPQUFPLEVBQUUsZUFBZSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFLakYsT0FBTyxFQUFFLGNBQWMsRUFBd0IsTUFBTSw0QkFBNEIsQ0FBQztBQUVsRixPQUFPLEVBQUUsYUFBYSxFQUFFLDBCQUEwQixFQUFFLGdCQUFnQixFQUFVLE1BQU0sbUJBQW1CLENBQUM7QUFFeEcsd0hBQXdIO0FBQ3hILHNDQUFzQztBQUN0QyxPQUFPLEVBQ0wsWUFBWSxFQUNaLFVBQVUsRUFDVixFQUFFLEVBQ0YsRUFBRSxFQUNGLGVBQWUsRUFDZixjQUFjLEVBQ2Qsb0JBQW9CLEVBQ3BCLEtBQUssRUFDTCw0QkFBNEIsRUFDNUIsbUNBQW1DLEdBQ3BDLE1BQU0sb0JBQW9CLENBQUM7QUFFNUIsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFNUQsT0FBTyxFQUNMLDRCQUE0QixFQUM1QixVQUFVLEVBQ1Ysb0NBQW9DLEVBQ3BDLDhCQUE4QixHQUMvQixNQUFNLHlCQUF5QixDQUFDO0FBRWpDLE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFcEUsT0FBTyxFQUNMLFdBQVcsRUFFWCxJQUFJLEVBQ0osVUFBVSxFQUNWLGVBQWUsRUFDZixzQkFBc0IsRUFDdEIsa0JBQWtCLEVBQ2xCLDRCQUE0QixFQUM1Qix3QkFBd0IsRUFDeEIsU0FBUyxFQUNULFlBQVksRUFDWixVQUFVLEVBQ1YsWUFBWSxFQUNaLE9BQU8sRUFDUCxhQUFhLEVBQ2IsT0FBTyxFQUNQLE9BQU8sRUFDUCxhQUFhLEVBQ2IsMEJBQTBCLEVBRTFCLEtBQUssRUFDTCxPQUFPLEVBQ1AsWUFBWSxFQUNaLElBQUksRUFFSixZQUFZLEVBR1osV0FBVyxFQUVYLEVBQUUsRUFDRixrQkFBa0IsRUFDbEIsTUFBTSxFQUNOLFNBQVMsRUFDVCxRQUFRLEVBQ1Isd0JBQXdCLEVBQ3hCLGdCQUFnQixFQUNoQixxQkFBcUIsRUFDckIsYUFBYSxFQUNiLE1BQU0sRUFDTixTQUFTLEVBQ1QsYUFBYSxFQUNiLGNBQWMsR0FDZixNQUFNLHNCQUFzQixDQUFDO0FBSzlCLCtEQUErRDtBQUMvRCxvRkFBb0Y7QUFDcEYsc0dBQXNHO0FBQ3RHLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN4RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUM5RCxPQUFPLEVBQWUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDOUUsT0FBTyxFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXRELE9BQU8sRUFHTCxnQkFBZ0IsRUFDaEIsaUJBQWlCLEdBQ2xCLE1BQU0saUJBQWlCLENBQUM7QUFFekIsNkRBQTZEO0FBQzdELHNGQUFzRjtBQUN0RixpRkFBaUY7QUFDakYsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxlQUFlLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rpc_clients/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rpc_clients/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export * from './pxe_client.js';
|
|
2
|
-
|
|
2
|
+
export * from './node/index.js';
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcnBjX2NsaWVudHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGlCQUFpQixDQUFDIn0=
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { type PXE } from '@aztec/circuit-types';
|
|
2
|
+
import { type DebugLogger } from '@aztec/foundation/log';
|
|
3
|
+
/**
|
|
4
|
+
* Creates a PXE client with a given set of retries on non-server errors.
|
|
5
|
+
* Checks that PXE matches the expected version, and warns if not.
|
|
6
|
+
* @param rpcUrl - URL of the RPC server wrapping the PXE.
|
|
7
|
+
* @param _logger - Debug logger to warn version incompatibilities.
|
|
8
|
+
* @returns A PXE client.
|
|
9
|
+
*/
|
|
10
|
+
export declare function createCompatibleClient(rpcUrl: string, _logger: DebugLogger): Promise<PXE>;
|
|
11
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +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;AAChD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAwDzD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAIzF"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { NoRetryError } from '@aztec/foundation/retry';
|
|
2
|
+
import axios from 'axios';
|
|
3
|
+
import { createPXEClient } from '../pxe_client.js';
|
|
4
|
+
/**
|
|
5
|
+
* A fetch implementation using axios.
|
|
6
|
+
* @param host - The URL of the host.
|
|
7
|
+
* @param rpcMethod - The RPC method to call.
|
|
8
|
+
* @param body - The body of the request.
|
|
9
|
+
* @param useApiEndpoints - Whether to use the API endpoints or inject the method in the body.
|
|
10
|
+
* @param _noRetry - Whether to retry on non-server errors.
|
|
11
|
+
* @returns The response data.
|
|
12
|
+
*/
|
|
13
|
+
async function axiosFetch(host, rpcMethod, body, useApiEndpoints, _noRetry = true) {
|
|
14
|
+
let resp;
|
|
15
|
+
if (useApiEndpoints) {
|
|
16
|
+
resp = await axios
|
|
17
|
+
.post(`${host}/${rpcMethod}`, body, {
|
|
18
|
+
headers: { 'content-type': 'application/json' },
|
|
19
|
+
})
|
|
20
|
+
.catch((error) => {
|
|
21
|
+
if (error.response) {
|
|
22
|
+
return error.response;
|
|
23
|
+
}
|
|
24
|
+
throw error;
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
resp = await axios
|
|
29
|
+
.post(host, { ...body, method: rpcMethod }, {
|
|
30
|
+
headers: { 'content-type': 'application/json' },
|
|
31
|
+
})
|
|
32
|
+
.catch((error) => {
|
|
33
|
+
if (error.response) {
|
|
34
|
+
return error.response;
|
|
35
|
+
}
|
|
36
|
+
throw error;
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
const isOK = resp.status >= 200 && resp.status < 300;
|
|
40
|
+
if (isOK) {
|
|
41
|
+
return resp.data;
|
|
42
|
+
}
|
|
43
|
+
else if (resp.status >= 400 && resp.status < 500) {
|
|
44
|
+
throw new NoRetryError('(JSON-RPC PROPAGATED) ' + resp.data.error.message);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
throw new Error('(JSON-RPC PROPAGATED) ' + resp.data.error.message);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Creates a PXE client with a given set of retries on non-server errors.
|
|
52
|
+
* Checks that PXE matches the expected version, and warns if not.
|
|
53
|
+
* @param rpcUrl - URL of the RPC server wrapping the PXE.
|
|
54
|
+
* @param _logger - Debug logger to warn version incompatibilities.
|
|
55
|
+
* @returns A PXE client.
|
|
56
|
+
*/
|
|
57
|
+
export function createCompatibleClient(rpcUrl, _logger) {
|
|
58
|
+
// Use axios due to timeout issues with fetch when proving TXs.
|
|
59
|
+
const pxe = createPXEClient(rpcUrl, axiosFetch);
|
|
60
|
+
return Promise.resolve(pxe);
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcnBjX2NsaWVudHMvbm9kZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFdkQsT0FBTyxLQUE4QyxNQUFNLE9BQU8sQ0FBQztBQUVuRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQ7Ozs7Ozs7O0dBUUc7QUFDSCxLQUFLLFVBQVUsVUFBVSxDQUFDLElBQVksRUFBRSxTQUFpQixFQUFFLElBQVMsRUFBRSxlQUF3QixFQUFFLFFBQVEsR0FBRyxJQUFJO0lBQzdHLElBQUksSUFBbUIsQ0FBQztJQUN4QixJQUFJLGVBQWUsRUFBRSxDQUFDO1FBQ3BCLElBQUksR0FBRyxNQUFNLEtBQUs7YUFDZixJQUFJLENBQUMsR0FBRyxJQUFJLElBQUksU0FBUyxFQUFFLEVBQUUsSUFBSSxFQUFFO1lBQ2xDLE9BQU8sRUFBRSxFQUFFLGNBQWMsRUFBRSxrQkFBa0IsRUFBRTtTQUNoRCxDQUFDO2FBQ0QsS0FBSyxDQUFDLENBQUMsS0FBaUIsRUFBRSxFQUFFO1lBQzNCLElBQUksS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDO2dCQUNuQixPQUFPLEtBQUssQ0FBQyxRQUFRLENBQUM7WUFDeEIsQ0FBQztZQUNELE1BQU0sS0FBSyxDQUFDO1FBQ2QsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO1NBQU0sQ0FBQztRQUNOLElBQUksR0FBRyxNQUFNLEtBQUs7YUFDZixJQUFJLENBQ0gsSUFBSSxFQUNKLEVBQUUsR0FBRyxJQUFJLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxFQUM5QjtZQUNFLE9BQU8sRUFBRSxFQUFFLGNBQWMsRUFBRSxrQkFBa0IsRUFBRTtTQUNoRCxDQUNGO2FBQ0EsS0FBSyxDQUFDLENBQUMsS0FBaUIsRUFBRSxFQUFFO1lBQzNCLElBQUksS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDO2dCQUNuQixPQUFPLEtBQUssQ0FBQyxRQUFRLENBQUM7WUFDeEIsQ0FBQztZQUNELE1BQU0sS0FBSyxDQUFDO1FBQ2QsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBRUQsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxHQUFHLElBQUksSUFBSSxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUM7SUFDckQsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUNULE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQztJQUNuQixDQUFDO1NBQU0sSUFBSSxJQUFJLENBQUMsTUFBTSxJQUFJLEdBQUcsSUFBSSxJQUFJLENBQUMsTUFBTSxHQUFHLEdBQUcsRUFBRSxDQUFDO1FBQ25ELE1BQU0sSUFBSSxZQUFZLENBQUMsd0JBQXdCLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDN0UsQ0FBQztTQUFNLENBQUM7UUFDTixNQUFNLElBQUksS0FBSyxDQUFDLHdCQUF3QixHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3RFLENBQUM7QUFDSCxDQUFDO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLHNCQUFzQixDQUFDLE1BQWMsRUFBRSxPQUFvQjtJQUN6RSwrREFBK0Q7SUFDL0QsTUFBTSxHQUFHLEdBQUcsZUFBZSxDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsQ0FBQztJQUNoRCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDOUIsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pxe_client.d.ts","sourceRoot":"","sources":["../../src/rpc_clients/pxe_client.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"pxe_client.d.ts","sourceRoot":"","sources":["../../src/rpc_clients/pxe_client.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,GAAG,EAST,MAAM,sBAAsB,CAAC;AAc9B;;;;;GAKG;AACH,eAAO,MAAM,eAAe,QAAS,MAAM,qGAAwC,GAmCzE,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { AuthWitness, EncryptedNoteL2BlockL2Logs, ExtendedNote, ExtendedUnencryptedL2Log, L2Block, LogId, Note, NullifierMembershipWitness, SimulatedTx, Tx, TxEffect, TxExecutionRequest, TxHash, TxReceipt, UnencryptedL2BlockL2Logs, } from '@aztec/circuit-types';
|
|
1
|
+
import { AuthWitness, EncryptedNoteL2BlockL2Logs, ExtendedNote, ExtendedUnencryptedL2Log, L2Block, LogId, Note, NullifierMembershipWitness, SimulatedTx, Tx, TxEffect, TxExecutionRequest, TxHash, TxReceipt, UnencryptedL2BlockL2Logs, UniqueNote, } from '@aztec/circuit-types';
|
|
2
2
|
import { AztecAddress, CompleteAddress, EthAddress, Fr, FunctionSelector, GrumpkinScalar, Point, } from '@aztec/circuits.js';
|
|
3
3
|
import { NoteSelector } from '@aztec/foundation/abi';
|
|
4
|
+
import { BaseHashType } from '@aztec/foundation/hash';
|
|
4
5
|
import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
5
6
|
/**
|
|
6
7
|
* Creates a JSON-RPC client to remotely talk to PXE.
|
|
@@ -15,6 +16,7 @@ export const createPXEClient = (url, fetch = makeFetch([1, 2, 3], false)) => cre
|
|
|
15
16
|
FunctionSelector,
|
|
16
17
|
EthAddress,
|
|
17
18
|
ExtendedNote,
|
|
19
|
+
UniqueNote,
|
|
18
20
|
ExtendedUnencryptedL2Log,
|
|
19
21
|
Fr,
|
|
20
22
|
GrumpkinScalar,
|
|
@@ -25,6 +27,7 @@ export const createPXEClient = (url, fetch = makeFetch([1, 2, 3], false)) => cre
|
|
|
25
27
|
Point,
|
|
26
28
|
TxExecutionRequest,
|
|
27
29
|
TxHash,
|
|
30
|
+
BaseHashType,
|
|
28
31
|
}, {
|
|
29
32
|
EncryptedNoteL2BlockL2Logs,
|
|
30
33
|
NoteSelector,
|
|
@@ -34,4 +37,4 @@ export const createPXEClient = (url, fetch = makeFetch([1, 2, 3], false)) => cre
|
|
|
34
37
|
TxReceipt,
|
|
35
38
|
UnencryptedL2BlockL2Logs,
|
|
36
39
|
}, false, 'pxe', fetch);
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHhlX2NsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ycGNfY2xpZW50cy9weGVfY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxXQUFXLEVBQ1gsMEJBQTBCLEVBQzFCLFlBQVksRUFDWix3QkFBd0IsRUFDeEIsT0FBTyxFQUNQLEtBQUssRUFDTCxJQUFJLEVBQ0osMEJBQTBCLEVBRTFCLFdBQVcsRUFDWCxFQUFFLEVBQ0YsUUFBUSxFQUNSLGtCQUFrQixFQUNsQixNQUFNLEVBQ04sU0FBUyxFQUNULHdCQUF3QixFQUN4QixVQUFVLEdBQ1gsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQ0wsWUFBWSxFQUNaLGVBQWUsRUFDZixVQUFVLEVBQ1YsRUFBRSxFQUNGLGdCQUFnQixFQUNoQixjQUFjLEVBQ2QsS0FBSyxHQUNOLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsU0FBUyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFbkY7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsQ0FBQyxHQUFXLEVBQUUsS0FBSyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLEVBQU8sRUFBRSxDQUN2RixtQkFBbUIsQ0FDakIsR0FBRyxFQUNIO0lBQ0UsV0FBVztJQUNYLFlBQVk7SUFDWixlQUFlO0lBQ2YsZ0JBQWdCO0lBQ2hCLFVBQVU7SUFDVixZQUFZO0lBQ1osVUFBVTtJQUNWLHdCQUF3QjtJQUN4QixFQUFFO0lBQ0YsY0FBYztJQUNkLE9BQU87SUFDUCxRQUFRO0lBQ1IsS0FBSztJQUNMLElBQUk7SUFDSixLQUFLO0lBQ0wsa0JBQWtCO0lBQ2xCLE1BQU07SUFDTixZQUFZO0NBQ2IsRUFDRDtJQUNFLDBCQUEwQjtJQUMxQixZQUFZO0lBQ1osMEJBQTBCO0lBQzFCLFdBQVc7SUFDWCxFQUFFO0lBQ0YsU0FBUztJQUNULHdCQUF3QjtDQUN6QixFQUNELEtBQUssRUFDTCxLQUFLLEVBQ0wsS0FBSyxDQUNDLENBQUMifQ==
|
package/dest/utils/authwit.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PackedValues } from '@aztec/circuit-types';
|
|
2
2
|
import { Fr, GeneratorIndex } from '@aztec/circuits.js';
|
|
3
|
-
import {
|
|
3
|
+
import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
|
|
4
4
|
import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
|
|
5
5
|
// docs:start:authwit_computeAuthWitMessageHash
|
|
6
6
|
/**
|
|
@@ -47,7 +47,7 @@ export const computeInnerAuthWitHashFromAction = (caller, action) => computeInne
|
|
|
47
47
|
* @returns The inner hash for the witness
|
|
48
48
|
*/
|
|
49
49
|
export const computeInnerAuthWitHash = (args) => {
|
|
50
|
-
return
|
|
50
|
+
return poseidon2HashWithSeparator(args, GeneratorIndex.AUTHWIT_INNER);
|
|
51
51
|
};
|
|
52
52
|
/**
|
|
53
53
|
* Compute the outer hash for an authentication witness.
|
|
@@ -64,6 +64,6 @@ export const computeInnerAuthWitHash = (args) => {
|
|
|
64
64
|
* @returns The outer hash for the witness
|
|
65
65
|
*/
|
|
66
66
|
const computeOuterAuthWitHash = (consumer, chainId, version, innerHash) => {
|
|
67
|
-
return
|
|
67
|
+
return poseidon2HashWithSeparator([consumer.toField(), chainId, version, innerHash], GeneratorIndex.AUTHWIT_OUTER);
|
|
68
68
|
};
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aHdpdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9hdXRod2l0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBcUIsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdkUsT0FBTyxFQUFxQixFQUFFLEVBQUUsY0FBYyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDM0UsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFdEUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sOENBQThDLENBQUM7QUEwQjNGLCtDQUErQztBQUMvQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FvQkc7QUFDSCxNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBRyxDQUFDLE1BQXNDLEVBQUUsUUFBd0IsRUFBRSxFQUFFO0lBQzVHLE1BQU0sT0FBTyxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQUM7SUFDakMsTUFBTSxPQUFPLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQztJQUVqQyxJQUFJLFFBQVEsSUFBSSxNQUFNLEVBQUUsQ0FBQztRQUN2QixNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsTUFBTSxZQUFZLDJCQUEyQixDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDO1FBQzlHLE9BQU8sdUJBQXVCLENBQzVCLE1BQU0sQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEVBQ25CLE9BQU8sRUFDUCxPQUFPLEVBQ1AsaUNBQWlDLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FDekQsQ0FBQztJQUNKLENBQUM7U0FBTSxDQUFDO1FBQ04sTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDO1FBQ3JHLE9BQU8sdUJBQXVCLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzNFLENBQUM7QUFDSCxDQUFDLENBQUM7QUFDRiw2Q0FBNkM7QUFFN0MsTUFBTSxDQUFDLE1BQU0saUNBQWlDLEdBQUcsQ0FBQyxNQUFvQixFQUFFLE1BQW9CLEVBQUUsRUFBRSxDQUM5Rix1QkFBdUIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsRUFBRSxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxFQUFFLFlBQVksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7QUFFcEg7Ozs7Ozs7R0FPRztBQUNILE1BQU0sQ0FBQyxNQUFNLHVCQUF1QixHQUFHLENBQUMsSUFBVSxFQUFFLEVBQUU7SUFDcEQsT0FBTywwQkFBMEIsQ0FBQyxJQUFJLEVBQUUsY0FBYyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0FBQ3hFLENBQUMsQ0FBQztBQUVGOzs7Ozs7Ozs7Ozs7O0dBYUc7QUFDSCxNQUFNLHVCQUF1QixHQUFHLENBQUMsUUFBc0IsRUFBRSxPQUFXLEVBQUUsT0FBVyxFQUFFLFNBQWEsRUFBRSxFQUFFO0lBQ2xHLE9BQU8sMEJBQTBCLENBQUMsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxTQUFTLENBQUMsRUFBRSxjQUFjLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDckgsQ0FBQyxDQUFDIn0=
|