@aztec/aztec.js 0.71.0 → 0.73.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/account/contract.d.ts +1 -1
- package/dest/account/contract.d.ts.map +1 -1
- package/dest/account_manager/deploy_account_method.js +7 -7
- package/dest/account_manager/index.d.ts +9 -6
- package/dest/account_manager/index.d.ts.map +1 -1
- package/dest/account_manager/index.js +28 -18
- package/dest/api/ethereum.d.ts +2 -1
- package/dest/api/ethereum.d.ts.map +1 -1
- package/dest/api/ethereum.js +3 -2
- package/dest/barretenberg-threads.wasm.gz +0 -0
- package/dest/barretenberg.wasm.gz +0 -0
- package/dest/contract/base_contract_interaction.d.ts.map +1 -1
- package/dest/contract/base_contract_interaction.js +3 -2
- package/dest/contract/contract.js +2 -2
- package/dest/contract/contract_base.d.ts +2 -2
- package/dest/contract/contract_base.d.ts.map +1 -1
- package/dest/contract/contract_base.js +2 -2
- package/dest/contract/contract_function_interaction.d.ts +1 -1
- package/dest/contract/contract_function_interaction.d.ts.map +1 -1
- package/dest/contract/contract_function_interaction.js +4 -4
- package/dest/contract/deploy_method.d.ts +2 -2
- package/dest/contract/deploy_method.d.ts.map +1 -1
- package/dest/contract/deploy_method.js +19 -19
- package/dest/contract/deploy_proven_tx.d.ts +2 -2
- package/dest/contract/deploy_proven_tx.d.ts.map +1 -1
- package/dest/contract/deploy_proven_tx.js +4 -4
- package/dest/contract/deploy_sent_tx.d.ts +4 -4
- package/dest/contract/deploy_sent_tx.d.ts.map +1 -1
- package/dest/contract/deploy_sent_tx.js +9 -7
- package/dest/contract/proven_tx.d.ts.map +1 -1
- package/dest/contract/proven_tx.js +3 -3
- package/dest/contract/sent_tx.d.ts +3 -3
- package/dest/contract/sent_tx.d.ts.map +1 -1
- package/dest/contract/sent_tx.js +4 -4
- package/dest/deployment/broadcast_function.d.ts +1 -1
- package/dest/deployment/broadcast_function.d.ts.map +1 -1
- package/dest/deployment/broadcast_function.js +23 -14
- package/dest/deployment/deploy_instance.d.ts +1 -1
- package/dest/deployment/deploy_instance.d.ts.map +1 -1
- package/dest/deployment/deploy_instance.js +3 -3
- package/dest/deployment/protocol_contracts.d.ts +2 -2
- package/dest/deployment/protocol_contracts.d.ts.map +1 -1
- package/dest/deployment/protocol_contracts.js +5 -5
- package/dest/deployment/register_class.js +3 -3
- package/dest/entrypoint/default_entrypoint.d.ts.map +1 -1
- package/dest/entrypoint/default_entrypoint.js +3 -3
- package/dest/entrypoint/default_multi_call_entrypoint.d.ts.map +1 -1
- package/dest/entrypoint/default_multi_call_entrypoint.js +5 -5
- package/dest/entrypoint/payload.d.ts +22 -7
- package/dest/entrypoint/payload.d.ts.map +1 -1
- package/dest/entrypoint/payload.js +35 -28
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts.map +1 -1
- package/dest/fee/fee_juice_payment_method_with_claim.js +6 -5
- package/dest/fee/private_fee_payment_method.js +8 -8
- package/dest/fee/public_fee_payment_method.js +20 -21
- package/dest/index.d.ts +4 -5
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +4 -5
- package/dest/main.js +2 -0
- package/dest/main.js.LICENSE.txt +25 -0
- package/dest/rpc_clients/pxe_client.d.ts +1 -1
- package/dest/rpc_clients/pxe_client.d.ts.map +1 -1
- package/dest/utils/abi_types.d.ts +3 -1
- package/dest/utils/abi_types.d.ts.map +1 -1
- package/dest/utils/anvil_test_watcher.d.ts +5 -1
- package/dest/utils/anvil_test_watcher.d.ts.map +1 -1
- package/dest/utils/anvil_test_watcher.js +47 -7
- package/dest/utils/authwit.d.ts +3 -3
- package/dest/utils/authwit.d.ts.map +1 -1
- package/dest/utils/authwit.js +9 -5
- package/dest/utils/chain_monitor.d.ts +2 -1
- package/dest/utils/chain_monitor.d.ts.map +1 -1
- package/dest/utils/chain_monitor.js +7 -2
- package/dest/utils/cheat_codes.d.ts +5 -2
- package/dest/utils/cheat_codes.d.ts.map +1 -1
- package/dest/utils/cheat_codes.js +9 -2
- package/dest/utils/l1_contracts.d.ts +1 -1
- package/dest/utils/l1_contracts.d.ts.map +1 -1
- package/dest/utils/portal_manager.d.ts +2 -2
- package/dest/utils/portal_manager.d.ts.map +1 -1
- package/dest/utils/portal_manager.js +8 -8
- package/dest/utils/pub_key.d.ts +1 -1
- package/dest/utils/pub_key.d.ts.map +1 -1
- package/dest/wallet/account_wallet.d.ts +1 -1
- package/dest/wallet/account_wallet.d.ts.map +1 -1
- package/dest/wallet/account_wallet.js +9 -9
- package/dest/wallet/account_wallet_with_private_key.d.ts +1 -1
- package/dest/wallet/account_wallet_with_private_key.d.ts.map +1 -1
- package/dest/wallet/account_wallet_with_private_key.js +3 -3
- package/dest/wallet/base_wallet.d.ts +8 -12
- package/dest/wallet/base_wallet.d.ts.map +1 -1
- package/dest/wallet/base_wallet.js +13 -25
- package/package.json +10 -9
- package/src/account/contract.ts +1 -1
- package/src/account_manager/deploy_account_method.ts +6 -6
- package/src/account_manager/index.ts +34 -25
- package/src/api/ethereum.ts +2 -1
- package/src/contract/base_contract_interaction.ts +3 -1
- package/src/contract/contract.ts +1 -1
- package/src/contract/contract_base.ts +2 -2
- package/src/contract/contract_function_interaction.ts +3 -3
- package/src/contract/deploy_method.ts +20 -20
- package/src/contract/deploy_proven_tx.ts +2 -2
- package/src/contract/deploy_sent_tx.ts +7 -5
- package/src/contract/proven_tx.ts +0 -2
- package/src/contract/sent_tx.ts +4 -4
- package/src/deployment/broadcast_function.ts +28 -14
- package/src/deployment/deploy_instance.ts +5 -2
- package/src/deployment/protocol_contracts.ts +4 -4
- package/src/deployment/register_class.ts +2 -2
- package/src/entrypoint/default_entrypoint.ts +2 -2
- package/src/entrypoint/default_multi_call_entrypoint.ts +4 -4
- package/src/entrypoint/payload.ts +53 -25
- package/src/fee/fee_juice_payment_method_with_claim.ts +6 -5
- package/src/fee/private_fee_payment_method.ts +7 -7
- package/src/fee/public_fee_payment_method.ts +23 -23
- package/src/index.ts +3 -5
- package/src/utils/abi_types.ts +4 -1
- package/src/utils/anvil_test_watcher.ts +54 -6
- package/src/utils/authwit.ts +9 -5
- package/src/utils/chain_monitor.ts +8 -2
- package/src/utils/cheat_codes.ts +11 -2
- package/src/utils/l1_contracts.ts +1 -1
- package/src/utils/portal_manager.ts +8 -8
- package/src/utils/pub_key.ts +1 -1
- package/src/wallet/account_wallet.ts +12 -11
- package/src/wallet/account_wallet_with_private_key.ts +2 -2
- package/src/wallet/base_wallet.ts +17 -27
- package/dest/api/init.d.ts +0 -7
- package/dest/api/init.d.ts.map +0 -1
- package/dest/api/init.js +0 -10
- package/src/api/init.ts +0 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default_multi_call_entrypoint.d.ts","sourceRoot":"","sources":["../../src/entrypoint/default_multi_call_entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAqB,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACpH,OAAO,EAAgB,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,KAAK,YAAY,EAAa,MAAM,oBAAoB,CAAC;AAIlE;;GAEG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAElE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAFP,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,YAA0D;
|
|
1
|
+
{"version":3,"file":"default_multi_call_entrypoint.d.ts","sourceRoot":"","sources":["../../src/entrypoint/default_multi_call_entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAqB,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACpH,OAAO,EAAgB,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,KAAK,YAAY,EAAa,MAAM,oBAAoB,CAAC;AAIlE;;GAEG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAElE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAFP,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,YAA0D;IAGvE,wBAAwB,CAAC,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAkB7F,OAAO,CAAC,gBAAgB;CAwDzB"}
|
|
@@ -12,15 +12,15 @@ export class DefaultMultiCallEntrypoint {
|
|
|
12
12
|
this.version = version;
|
|
13
13
|
this.address = address;
|
|
14
14
|
}
|
|
15
|
-
createTxExecutionRequest(executions) {
|
|
15
|
+
async createTxExecutionRequest(executions) {
|
|
16
16
|
const { fee, calls, authWitnesses = [], hashedArguments = [] } = executions;
|
|
17
|
-
const payload = EntrypointPayload.fromAppExecution(calls);
|
|
17
|
+
const payload = await EntrypointPayload.fromAppExecution(calls);
|
|
18
18
|
const abi = this.getEntrypointAbi();
|
|
19
|
-
const entrypointHashedArgs = HashedValues.fromValues(encodeArguments(abi, [payload]));
|
|
19
|
+
const entrypointHashedArgs = await HashedValues.fromValues(encodeArguments(abi, [payload]));
|
|
20
20
|
const txRequest = TxExecutionRequest.from({
|
|
21
21
|
firstCallArgsHash: entrypointHashedArgs.hash,
|
|
22
22
|
origin: this.address,
|
|
23
|
-
functionSelector: FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
|
|
23
|
+
functionSelector: await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
|
|
24
24
|
txContext: new TxContext(this.chainId, this.version, fee.gasSettings),
|
|
25
25
|
argsOfCalls: [...payload.hashedArguments, ...hashedArguments, entrypointHashedArgs],
|
|
26
26
|
authWitnesses,
|
|
@@ -84,4 +84,4 @@ export class DefaultMultiCallEntrypoint {
|
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdF9tdWx0aV9jYWxsX2VudHJ5cG9pbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZW50cnlwb2ludC9kZWZhdWx0X211bHRpX2NhbGxfZW50cnlwb2ludC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRCLGlCQUFpQixFQUE2QixNQUFNLDRCQUE0QixDQUFDO0FBQ3BILE9BQU8sRUFBRSxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RSxPQUFPLEVBQXFCLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xFLE9BQU8sRUFBb0IsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDNUYsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFcEU7O0dBRUc7QUFDSCxNQUFNLE9BQU8sMEJBQTBCO0lBQ3JDLFlBQ1UsT0FBZSxFQUNmLE9BQWUsRUFDZixVQUF3Qix1QkFBdUIsQ0FBQyxtQkFBbUI7UUFGbkUsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQUNmLFlBQU8sR0FBUCxPQUFPLENBQVE7UUFDZixZQUFPLEdBQVAsT0FBTyxDQUE0RDtJQUMxRSxDQUFDO0lBRUosS0FBSyxDQUFDLHdCQUF3QixDQUFDLFVBQWdDO1FBQzdELE1BQU0sRUFBRSxHQUFHLEVBQUUsS0FBSyxFQUFFLGFBQWEsR0FBRyxFQUFFLEVBQUUsZUFBZSxHQUFHLEVBQUUsRUFBRSxHQUFHLFVBQVUsQ0FBQztRQUM1RSxNQUFNLE9BQU8sR0FBRyxNQUFNLGlCQUFpQixDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ2hFLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBQ3BDLE1BQU0sb0JBQW9CLEdBQUcsTUFBTSxZQUFZLENBQUMsVUFBVSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxPQUFP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
|
|
@@ -18,6 +18,8 @@ export type UserFeeOptions = {
|
|
|
18
18
|
paymentMethod?: FeePaymentMethod;
|
|
19
19
|
/** The gas settings */
|
|
20
20
|
gasSettings?: Partial<FieldsOf<GasSettings>>;
|
|
21
|
+
/** Percentage to pad the base fee by, if empty, defaults to 0.5 */
|
|
22
|
+
baseFeePadding?: number;
|
|
21
23
|
/** Whether to run an initial simulation of the tx with high gas limit to figure out actual gas settings. */
|
|
22
24
|
estimateGas?: boolean;
|
|
23
25
|
/** Percentage to pad the estimated gas limits by, if empty, defaults to 0.1. Only relevant if estimateGas is set. */
|
|
@@ -38,8 +40,21 @@ type EncodedFunctionCall = {
|
|
|
38
40
|
};
|
|
39
41
|
/** Assembles an entrypoint payload */
|
|
40
42
|
export declare abstract class EntrypointPayload {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
+
private functionCalls;
|
|
44
|
+
private _hashedArguments;
|
|
45
|
+
private generatorIndex;
|
|
46
|
+
private _nonce;
|
|
47
|
+
protected constructor(functionCalls: EncodedFunctionCall[], _hashedArguments: HashedValues[], generatorIndex: number, _nonce: Fr);
|
|
48
|
+
protected static create(functionCalls: FunctionCall[]): Promise<{
|
|
49
|
+
encodedFunctionCalls: {
|
|
50
|
+
args_hash: Fr;
|
|
51
|
+
function_selector: Fr;
|
|
52
|
+
target_address: Fr;
|
|
53
|
+
is_public: boolean;
|
|
54
|
+
is_static: boolean;
|
|
55
|
+
}[];
|
|
56
|
+
hashedArguments: HashedValues[];
|
|
57
|
+
}>;
|
|
43
58
|
/**
|
|
44
59
|
* The function calls to execute. This uses snake_case naming so that it is compatible with Noir encoding
|
|
45
60
|
* @internal
|
|
@@ -63,7 +78,7 @@ export declare abstract class EntrypointPayload {
|
|
|
63
78
|
* Hashes the payload
|
|
64
79
|
* @returns The hash of the payload
|
|
65
80
|
*/
|
|
66
|
-
hash(): Fr
|
|
81
|
+
hash(): Promise<Fr>;
|
|
67
82
|
/** Serializes the function calls to an array of fields. */
|
|
68
83
|
protected functionCallsToFields(): Fr[];
|
|
69
84
|
/**
|
|
@@ -71,14 +86,14 @@ export declare abstract class EntrypointPayload {
|
|
|
71
86
|
* @param functionCalls - The function calls to execute
|
|
72
87
|
* @returns The execution payload
|
|
73
88
|
*/
|
|
74
|
-
static fromFunctionCalls(functionCalls: FunctionCall[]): AppEntrypointPayload
|
|
89
|
+
static fromFunctionCalls(functionCalls: FunctionCall[]): Promise<AppEntrypointPayload>;
|
|
75
90
|
/**
|
|
76
91
|
* Creates an execution payload for the app-portion of a transaction from a set of function calls
|
|
77
92
|
* @param functionCalls - The function calls to execute
|
|
78
93
|
* @param nonce - The nonce for the payload, used to emit a nullifier identifying the call
|
|
79
94
|
* @returns The execution payload
|
|
80
95
|
*/
|
|
81
|
-
static fromAppExecution(functionCalls: FunctionCall[] | Tuple<FunctionCall, 4>, nonce?: Fr): AppEntrypointPayload
|
|
96
|
+
static fromAppExecution(functionCalls: FunctionCall[] | Tuple<FunctionCall, 4>, nonce?: Fr): Promise<AppEntrypointPayload>;
|
|
82
97
|
/**
|
|
83
98
|
* Creates an execution payload to pay the fee for a transaction
|
|
84
99
|
* @param sender - The address sending this payload
|
|
@@ -94,7 +109,7 @@ declare class AppEntrypointPayload extends EntrypointPayload {
|
|
|
94
109
|
/** Entrypoint payload for fee payment to be run during setup phase. */
|
|
95
110
|
declare class FeeEntrypointPayload extends EntrypointPayload {
|
|
96
111
|
#private;
|
|
97
|
-
constructor(functionCalls:
|
|
112
|
+
constructor(functionCalls: EncodedFunctionCall[], hashedArguments: HashedValues[], generatorIndex: number, nonce: Fr, isFeePayer: boolean);
|
|
98
113
|
toFields(): Fr[];
|
|
99
114
|
/** Whether the sender should be appointed as fee payer. */
|
|
100
115
|
get is_fee_payer(): boolean;
|
|
@@ -105,6 +120,6 @@ declare class FeeEntrypointPayload extends EntrypointPayload {
|
|
|
105
120
|
* @param feePayload - A fee payload.
|
|
106
121
|
* @returns A hash of a combined payload.
|
|
107
122
|
*/
|
|
108
|
-
export declare function computeCombinedPayloadHash(appPayload: AppEntrypointPayload, feePayload: FeeEntrypointPayload): Fr
|
|
123
|
+
export declare function computeCombinedPayloadHash(appPayload: AppEntrypointPayload, feePayload: FeeEntrypointPayload): Promise<Fr>;
|
|
109
124
|
export {};
|
|
110
125
|
//# sourceMappingURL=payload.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payload.d.ts","sourceRoot":"","sources":["../../src/entrypoint/payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,KAAK,YAAY,EAAE,EAAE,EAAE,KAAK,WAAW,EAAkB,MAAM,oBAAoB,CAAC;AAI7F,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,oCAAoC;IACpC,aAAa,EAAE,gBAAgB,CAAC;IAChC,uBAAuB;IACvB,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAC;AAEF,oCAAoC;AACpC,MAAM,MAAM,cAAc,GAAG;IAC3B,oCAAoC;IACpC,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,uBAAuB;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IAC7C,4GAA4G;IAC5G,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,qHAAqH;IACrH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AASF,4DAA4D;AAC5D,KAAK,mBAAmB,GAAG;IACzB,kCAAkC;IAClC,SAAS,EAAE,EAAE,CAAC;IACd,uCAAuC;IACvC,iBAAiB,EAAE,EAAE,CAAC;IACtB,sCAAsC;IACtC,cAAc,EAAE,EAAE,CAAC;IACnB,gDAAgD;IAChD,SAAS,EAAE,OAAO,CAAC;IACnB,2CAA2C;IAC3C,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAGF,sCAAsC;AACtC,8BAAsB,iBAAiB
|
|
1
|
+
{"version":3,"file":"payload.d.ts","sourceRoot":"","sources":["../../src/entrypoint/payload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
var
|
|
1
|
+
var _FeeEntrypointPayload_isFeePayer;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
3
|
import { FunctionCall, HashedValues } from '@aztec/circuit-types';
|
|
4
4
|
import { Fr, GeneratorIndex } from '@aztec/circuits.js';
|
|
@@ -13,25 +13,30 @@ const FEE_MAX_CALLS = 2;
|
|
|
13
13
|
/* eslint-enable camelcase */
|
|
14
14
|
/** Assembles an entrypoint payload */
|
|
15
15
|
export class EntrypointPayload {
|
|
16
|
-
constructor(functionCalls, generatorIndex,
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
16
|
+
constructor(functionCalls, _hashedArguments, generatorIndex, _nonce) {
|
|
17
|
+
this.functionCalls = functionCalls;
|
|
18
|
+
this._hashedArguments = _hashedArguments;
|
|
19
|
+
this.generatorIndex = generatorIndex;
|
|
20
|
+
this._nonce = _nonce;
|
|
21
|
+
}
|
|
22
|
+
static async create(functionCalls) {
|
|
23
|
+
const hashedArguments = [];
|
|
21
24
|
for (const call of functionCalls) {
|
|
22
|
-
|
|
25
|
+
hashedArguments.push(await HashedValues.fromValues(call.args));
|
|
23
26
|
}
|
|
24
27
|
/* eslint-disable camelcase */
|
|
25
|
-
|
|
26
|
-
args_hash:
|
|
28
|
+
const encodedFunctionCalls = functionCalls.map((call, index) => ({
|
|
29
|
+
args_hash: hashedArguments[index].hash,
|
|
27
30
|
function_selector: call.selector.toField(),
|
|
28
31
|
target_address: call.to.toField(),
|
|
29
32
|
is_public: call.type == FunctionType.PUBLIC,
|
|
30
33
|
is_static: call.isStatic,
|
|
31
|
-
}))
|
|
34
|
+
}));
|
|
32
35
|
/* eslint-enable camelcase */
|
|
33
|
-
|
|
34
|
-
|
|
36
|
+
return {
|
|
37
|
+
encodedFunctionCalls,
|
|
38
|
+
hashedArguments,
|
|
39
|
+
};
|
|
35
40
|
}
|
|
36
41
|
/* eslint-disable camelcase */
|
|
37
42
|
/**
|
|
@@ -39,7 +44,7 @@ export class EntrypointPayload {
|
|
|
39
44
|
* @internal
|
|
40
45
|
*/
|
|
41
46
|
get function_calls() {
|
|
42
|
-
return
|
|
47
|
+
return this.functionCalls;
|
|
43
48
|
}
|
|
44
49
|
/* eslint-enable camelcase */
|
|
45
50
|
/**
|
|
@@ -47,24 +52,24 @@ export class EntrypointPayload {
|
|
|
47
52
|
* @internal
|
|
48
53
|
*/
|
|
49
54
|
get nonce() {
|
|
50
|
-
return
|
|
55
|
+
return this._nonce;
|
|
51
56
|
}
|
|
52
57
|
/**
|
|
53
58
|
* The hashed arguments for the function calls
|
|
54
59
|
*/
|
|
55
60
|
get hashedArguments() {
|
|
56
|
-
return
|
|
61
|
+
return this._hashedArguments;
|
|
57
62
|
}
|
|
58
63
|
/**
|
|
59
64
|
* Hashes the payload
|
|
60
65
|
* @returns The hash of the payload
|
|
61
66
|
*/
|
|
62
67
|
hash() {
|
|
63
|
-
return poseidon2HashWithSeparator(this.toFields(),
|
|
68
|
+
return poseidon2HashWithSeparator(this.toFields(), this.generatorIndex);
|
|
64
69
|
}
|
|
65
70
|
/** Serializes the function calls to an array of fields. */
|
|
66
71
|
functionCallsToFields() {
|
|
67
|
-
return
|
|
72
|
+
return this.functionCalls.flatMap(call => [
|
|
68
73
|
call.args_hash,
|
|
69
74
|
call.function_selector,
|
|
70
75
|
call.target_address,
|
|
@@ -77,8 +82,9 @@ export class EntrypointPayload {
|
|
|
77
82
|
* @param functionCalls - The function calls to execute
|
|
78
83
|
* @returns The execution payload
|
|
79
84
|
*/
|
|
80
|
-
static fromFunctionCalls(functionCalls) {
|
|
81
|
-
|
|
85
|
+
static async fromFunctionCalls(functionCalls) {
|
|
86
|
+
const { encodedFunctionCalls, hashedArguments } = await this.create(functionCalls);
|
|
87
|
+
return new AppEntrypointPayload(encodedFunctionCalls, hashedArguments, 0, Fr.random());
|
|
82
88
|
}
|
|
83
89
|
/**
|
|
84
90
|
* Creates an execution payload for the app-portion of a transaction from a set of function calls
|
|
@@ -86,12 +92,13 @@ export class EntrypointPayload {
|
|
|
86
92
|
* @param nonce - The nonce for the payload, used to emit a nullifier identifying the call
|
|
87
93
|
* @returns The execution payload
|
|
88
94
|
*/
|
|
89
|
-
static fromAppExecution(functionCalls, nonce = Fr.random()) {
|
|
95
|
+
static async fromAppExecution(functionCalls, nonce = Fr.random()) {
|
|
90
96
|
if (functionCalls.length > APP_MAX_CALLS) {
|
|
91
97
|
throw new Error(`Expected at most ${APP_MAX_CALLS} function calls, got ${functionCalls.length}`);
|
|
92
98
|
}
|
|
93
99
|
const paddedCalls = padArrayEnd(functionCalls, FunctionCall.empty(), APP_MAX_CALLS);
|
|
94
|
-
|
|
100
|
+
const { encodedFunctionCalls, hashedArguments } = await this.create(paddedCalls);
|
|
101
|
+
return new AppEntrypointPayload(encodedFunctionCalls, hashedArguments, GeneratorIndex.SIGNATURE_PAYLOAD, nonce);
|
|
95
102
|
}
|
|
96
103
|
/**
|
|
97
104
|
* Creates an execution payload to pay the fee for a transaction
|
|
@@ -104,10 +111,10 @@ export class EntrypointPayload {
|
|
|
104
111
|
const feePayer = await feeOpts?.paymentMethod.getFeePayer(feeOpts?.gasSettings);
|
|
105
112
|
const isFeePayer = !!feePayer && feePayer.equals(sender);
|
|
106
113
|
const paddedCalls = padArrayEnd(calls, FunctionCall.empty(), FEE_MAX_CALLS);
|
|
107
|
-
|
|
114
|
+
const { encodedFunctionCalls, hashedArguments } = await this.create(paddedCalls);
|
|
115
|
+
return new FeeEntrypointPayload(encodedFunctionCalls, hashedArguments, GeneratorIndex.FEE_PAYLOAD, Fr.random(), isFeePayer);
|
|
108
116
|
}
|
|
109
117
|
}
|
|
110
|
-
_EntrypointPayload_hashedArguments = new WeakMap(), _EntrypointPayload_functionCalls = new WeakMap(), _EntrypointPayload_nonce = new WeakMap(), _EntrypointPayload_generatorIndex = new WeakMap();
|
|
111
118
|
/** Entrypoint payload for app phase execution. */
|
|
112
119
|
class AppEntrypointPayload extends EntrypointPayload {
|
|
113
120
|
toFields() {
|
|
@@ -116,8 +123,8 @@ class AppEntrypointPayload extends EntrypointPayload {
|
|
|
116
123
|
}
|
|
117
124
|
/** Entrypoint payload for fee payment to be run during setup phase. */
|
|
118
125
|
class FeeEntrypointPayload extends EntrypointPayload {
|
|
119
|
-
constructor(functionCalls, generatorIndex, isFeePayer) {
|
|
120
|
-
super(functionCalls, generatorIndex);
|
|
126
|
+
constructor(functionCalls, hashedArguments, generatorIndex, nonce, isFeePayer) {
|
|
127
|
+
super(functionCalls, hashedArguments, generatorIndex, nonce);
|
|
121
128
|
_FeeEntrypointPayload_isFeePayer.set(this, void 0);
|
|
122
129
|
__classPrivateFieldSet(this, _FeeEntrypointPayload_isFeePayer, isFeePayer, "f");
|
|
123
130
|
}
|
|
@@ -137,7 +144,7 @@ _FeeEntrypointPayload_isFeePayer = new WeakMap();
|
|
|
137
144
|
* @param feePayload - A fee payload.
|
|
138
145
|
* @returns A hash of a combined payload.
|
|
139
146
|
*/
|
|
140
|
-
export function computeCombinedPayloadHash(appPayload, feePayload) {
|
|
141
|
-
return poseidon2HashWithSeparator([appPayload.hash(), feePayload.hash()], GeneratorIndex.COMBINED_PAYLOAD);
|
|
147
|
+
export async function computeCombinedPayloadHash(appPayload, feePayload) {
|
|
148
|
+
return poseidon2HashWithSeparator([await appPayload.hash(), await feePayload.hash()], GeneratorIndex.COMBINED_PAYLOAD);
|
|
142
149
|
}
|
|
143
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
150
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF5bG9hZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbnRyeXBvaW50L3BheWxvYWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xFLE9BQU8sRUFBcUIsRUFBRSxFQUFvQixjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM3RixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNELE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBOEJ0RSwwQ0FBMEM7QUFDMUMsdURBQXVEO0FBQ3ZELE1BQU0sYUFBYSxHQUFHLENBQUMsQ0FBQztBQUN4QiwyREFBMkQ7QUFDM0QsTUFBTSxhQUFhLEdBQUcsQ0FBQyxDQUFDO0FBZ0J4Qiw2QkFBNkI7QUFFN0Isc0NBQXNDO0FBQ3RDLE1BQU0sT0FBZ0IsaUJBQWlCO0lBQ3JDLFlBQ1UsYUFBb0MsRUFDcEMsZ0JBQWdDLEVBQ2hDLGNBQXNCLEVBQ3RCLE1BQVU7UUFIVixrQkFBYSxHQUFiLGFBQWEsQ0FBdUI7UUFDcEMscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFnQjtRQUNoQyxtQkFBYyxHQUFkLGNBQWMsQ0FBUTtRQUN0QixXQUFNLEdBQU4sTUFBTSxDQUFJO0lBQ2pCLENBQUM7SUFFTSxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxhQUE2QjtRQUN6RCxNQUFNLGVBQWUsR0FBbUIsRUFBRSxDQUFDO1FBQzNDLEtBQUssTUFBTSxJQUFJLElBQUksYUFBYSxFQUFFLENBQUM7WUFDakMsZUFBZSxDQUFDLElBQUksQ0FBQyxNQUFNLFlBQVksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDakUsQ0FBQztRQUVELDhC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
|
|
@@ -1 +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,EAAwB,MAAM,oBAAoB,CAAC;AAK7E,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE;;GAEG;AACH,qBAAa,8BAA+B,SAAQ,qBAAqB;IAGrE,OAAO,CAAC,KAAK;gBADb,MAAM,EAAE,YAAY,EACZ,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,GAAG,kBAAkB,CAAC;IAKxF;;;OAGG;
|
|
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,EAAwB,MAAM,oBAAoB,CAAC;AAK7E,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE;;GAEG;AACH,qBAAa,8BAA+B,SAAQ,qBAAqB;IAGrE,OAAO,CAAC,KAAK;gBADb,MAAM,EAAE,YAAY,EACZ,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,GAAG,kBAAkB,CAAC;IAKxF;;;OAGG;IACY,gBAAgB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;CAuB3D"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Fr, FunctionSelector } from '@aztec/circuits.js';
|
|
2
|
-
import { FunctionType } from '@aztec/foundation/abi';
|
|
2
|
+
import { FunctionType, U128 } from '@aztec/foundation/abi';
|
|
3
3
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
4
4
|
import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
|
|
5
5
|
import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
|
|
@@ -15,8 +15,9 @@ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
|
|
|
15
15
|
* Creates a function call to pay the fee in Fee Juice.
|
|
16
16
|
* @returns A function call
|
|
17
17
|
*/
|
|
18
|
-
getFunctionCalls() {
|
|
19
|
-
const
|
|
18
|
+
async getFunctionCalls() {
|
|
19
|
+
const canonicalFeeJuice = await getCanonicalFeeJuice();
|
|
20
|
+
const selector = await FunctionSelector.fromNameAndParameters(canonicalFeeJuice.artifact.functions.find(f => f.name === 'claim'));
|
|
20
21
|
return Promise.resolve([
|
|
21
22
|
{
|
|
22
23
|
to: ProtocolContractAddress.FeeJuice,
|
|
@@ -25,7 +26,7 @@ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
|
|
|
25
26
|
isStatic: false,
|
|
26
27
|
args: [
|
|
27
28
|
this.sender.toField(),
|
|
28
|
-
this.claim.claimAmount,
|
|
29
|
+
...new U128(this.claim.claimAmount).toFields(),
|
|
29
30
|
this.claim.claimSecret,
|
|
30
31
|
new Fr(this.claim.messageLeafIndex),
|
|
31
32
|
],
|
|
@@ -35,4 +36,4 @@ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
|
|
|
35
36
|
]);
|
|
36
37
|
}
|
|
37
38
|
}
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2p1aWNlX3BheW1lbnRfbWV0aG9kX3dpdGhfY2xhaW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmVlL2ZlZV9qdWljZV9wYXltZW50X21ldGhvZF93aXRoX2NsYWltLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBcUIsRUFBRSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDN0UsT0FBTyxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUczRSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUV0RTs7R0FFRztBQUNILE1BQU0sT0FBTyw4QkFBK0IsU0FBUSxxQkFBcUI7SUFDdkUsWUFDRSxNQUFvQixFQUNaLEtBQThFO1FBRXRGLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUZOLFVBQUssR0FBTCxLQUFLLENBQXlFO0lBR3hGLENBQUM7SUFFRDs7O09BR0c7SUFDTSxLQUFLLENBQUMsZ0JBQWdCO1FBQzdCLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxvQkFBb0IsRUFBRSxDQUFDO1FBQ3ZELE1BQU0sUUFBUSxHQUFHLE1BQU0sZ0JBQWdCLENBQUMscUJBQXFCLENBQzNELGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxPQUFPLENBQUUsQ0FDcEUsQ0FBQztRQUVGLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQztZQUNyQjtnQkFDRSxFQUFFLEVBQUUsdUJBQXVCLENBQUMsUUFBUTtnQkFDcEMsSUFBSSxFQUFFLE9BQU87Z0JBQ2IsUUFBUTtnQkFDUixRQUFRLEVBQUUsS0FBSztnQkFDZixJQUFJLEVBQUU7b0JBQ0osSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7b0JBQ3JCLEdBQUcsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQyxRQUFRLEVBQUU7b0JBQzlDLElBQUksQ0FBQyxLQUFLLENBQUMsV0FBVztvQkFDdEIsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQztpQkFDcEM7Z0JBQ0QsV0FBVyxFQUFFLEVBQUU7Z0JBQ2YsSUFBSSxFQUFFLFlBQVksQ0FBQyxPQUFPO2FBQzNCO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIn0=
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
|
|
1
|
+
import { FunctionSelector, FunctionType, U128 } from '@aztec/foundation/abi';
|
|
2
2
|
import { Fr } from '@aztec/foundation/fields';
|
|
3
3
|
import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
|
|
4
4
|
import { SignerlessWallet } from '../wallet/signerless_wallet.js';
|
|
@@ -71,14 +71,14 @@ export class PrivateFeePaymentMethod {
|
|
|
71
71
|
async getFunctionCalls(gasSettings) {
|
|
72
72
|
// We assume 1:1 exchange rate between fee juice and token. But in reality you would need to convert feeLimit
|
|
73
73
|
// (maxFee) to be in token denomination.
|
|
74
|
-
const maxFee = this.setMaxFeeToOne ?
|
|
74
|
+
const maxFee = new U128(this.setMaxFeeToOne ? 1n : gasSettings.getFeeLimit().toBigInt());
|
|
75
75
|
const nonce = Fr.random();
|
|
76
76
|
await this.wallet.createAuthWit({
|
|
77
77
|
caller: this.paymentContract,
|
|
78
78
|
action: {
|
|
79
|
-
name: '
|
|
80
|
-
args: [this.wallet.getAddress().toField(), maxFee, nonce],
|
|
81
|
-
selector: FunctionSelector.fromSignature('
|
|
79
|
+
name: 'transfer_to_public',
|
|
80
|
+
args: [this.wallet.getAddress().toField(), this.paymentContract.toField(), ...maxFee.toFields(), nonce],
|
|
81
|
+
selector: await FunctionSelector.fromSignature('transfer_to_public((Field),(Field),(Field,Field),Field)'),
|
|
82
82
|
type: FunctionType.PRIVATE,
|
|
83
83
|
isStatic: false,
|
|
84
84
|
to: await this.getAsset(),
|
|
@@ -89,13 +89,13 @@ export class PrivateFeePaymentMethod {
|
|
|
89
89
|
{
|
|
90
90
|
name: 'fee_entrypoint_private',
|
|
91
91
|
to: this.paymentContract,
|
|
92
|
-
selector: FunctionSelector.fromSignature('fee_entrypoint_private(Field,Field)'),
|
|
92
|
+
selector: await FunctionSelector.fromSignature('fee_entrypoint_private((Field,Field),Field)'),
|
|
93
93
|
type: FunctionType.PRIVATE,
|
|
94
94
|
isStatic: false,
|
|
95
|
-
args: [maxFee, nonce],
|
|
95
|
+
args: [...maxFee.toFields(), nonce],
|
|
96
96
|
returnTypes: [],
|
|
97
97
|
},
|
|
98
98
|
];
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9mZWVfcGF5bWVudF9tZXRob2QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmVlL3ByaXZhdGVfZmVlX3BheW1lbnRfbWV0aG9kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFN0UsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRzlDLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQzNGLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBR2xFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHVCQUF1QjtJQUdsQztJQUNFOztPQUVHO0lBQ0ssZUFBNkI7SUFFckM7O09BRUc7SUFDSyxNQUFjO0lBRXRCOzs7T0FHRztJQUNLLGlCQUFpQixLQUFLO1FBWHRCLG9CQUFlLEdBQWYsZUFBZSxDQUFjO1FBSzdCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFNZCxtQkFBYyxHQUFkLGNBQWMsQ0FBUTtRQWpCeEIsaUJBQVksR0FBaUMsSUFBSSxDQUFDO0lBa0J2RCxDQUFDO0lBRUo7OztPQUdHO0lBQ0gsUUFBUTtRQUNOLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7WUFDdkIsZ0hBQWdIO1lBQ2hILE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7WUFFM0QsTUFBTSxXQUFXLEdBQUcsSUFBSSwyQkFBMkIsQ0FDakQsZ0JBQWdCLEVBQ2hCLElBQUksQ0FBQyxlQUFlLEVBQ3BCO2dCQUNFLElBQUksRUFBRSxvQkFBb0I7Z0JBQzFCLFlBQVksRUFBRSxZQUFZLENBQUMsT0FBTztnQkFDbEMsVUFBVSxFQUFFLEtBQUs7Z0JBQ2pCLFFBQVEsRUFBRSxLQUFLO2dCQUNmLFVBQVUsRUFBRSxFQUFFO2dCQUNkLFdBQVcsRUFBRTtvQkFDWDt3QkFDRSxJQUFJLEVBQUUsUUFBUTt3QkFDZCxJQUFJLEVBQUUsc0VBQXNFO3dCQUM1RSxNQUFNLEVBQUU7NEJBQ047Z0NBQ0UsSUFBSSxFQUFFLE9BQU87Z0NBQ2IsSUFBSSxFQUFFO29DQUNKLElBQUksRUFBRSxPQUFPO2lDQUNkOzZCQUNGO3lCQUNGO3FCQUNGO2lCQUNGO2dCQUNELFVBQVUsRUFBRSxFQUFFO2dCQUNkLGFBQWEsRUFBRSxLQUFLO2FBQ3JCLEVBQ0QsRUFBRSxDQUNILENBQUM7WUFFRixJQUFJLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUM3QyxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUMsWUFBYSxDQUFDO0lBQzVCLENBQUM7SUFFRCxXQUFXO1FBQ1QsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUMvQyxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxXQUF3QjtRQUM3Qyw2R0FBNkc7UUFDN0csd0NBQXdDO1FBQ3hDLE1BQU0sTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLFdBQVcsRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDekYsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBRTFCLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUM7WUFDOUIsTUFBTSxFQUFFLElBQUksQ0FBQyxlQUFlO1lBQzVCLE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsb0JBQW9CO2dCQUMxQixJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsT0FBTyxFQUFFLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsS0FBSyxDQUFDO2dCQUN2RyxRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMseURBQXlELENBQUM7Z0JBQ3pHLElBQUksRUFBRSxZQUFZLENBQUMsT0FBTztnQkFDMUIsUUFBUSxFQUFFLEtBQUs7Z0JBQ2YsRUFBRSxFQUFFLE1BQU0sSUFBSSxDQUFDLFFBQVEsRUFBRTtnQkFDekIsV0FBVyxFQUFFLEVBQUU7YUFDaEI7U0FDRixDQUFDLENBQUM7UUFFSCxPQUFPO1lBQ0w7Z0JBQ0UsSUFBSSxFQUFFLHdCQUF3QjtnQkFDOUIsRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlO2dCQUN4QixRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMsNkNBQTZDLENBQUM7Z0JBQzdGLElBQUksRUFBRSxZQUFZLENBQUMsT0FBTztnQkFDMUIsUUFBUSxFQUFFLEtBQUs7Z0JBQ2YsSUFBSSxFQUFFLENBQUMsR0FBRyxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsS0FBSyxDQUFDO2dCQUNuQyxXQUFXLEVBQUUsRUFBRTthQUNoQjtTQUNGLENBQUM7SUFDSixDQUFDO0NBQ0YifQ==
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
|
|
1
|
+
import { FunctionSelector, FunctionType, U128 } from '@aztec/foundation/abi';
|
|
2
2
|
import { Fr } from '@aztec/foundation/fields';
|
|
3
3
|
import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
|
|
4
4
|
import { SignerlessWallet } from '../wallet/signerless_wallet.js';
|
|
@@ -64,32 +64,31 @@ export class PublicFeePaymentMethod {
|
|
|
64
64
|
*/
|
|
65
65
|
async getFunctionCalls(gasSettings) {
|
|
66
66
|
const nonce = Fr.random();
|
|
67
|
-
const maxFee = gasSettings.getFeeLimit();
|
|
68
|
-
|
|
69
|
-
this.
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
.request(),
|
|
67
|
+
const maxFee = new U128(gasSettings.getFeeLimit().toBigInt());
|
|
68
|
+
const setPublicAuthWitInteraction = await this.wallet.setPublicAuthWit({
|
|
69
|
+
caller: this.paymentContract,
|
|
70
|
+
action: {
|
|
71
|
+
name: 'transfer_in_public',
|
|
72
|
+
args: [this.wallet.getAddress().toField(), this.paymentContract.toField(), ...maxFee.toFields(), nonce],
|
|
73
|
+
selector: await FunctionSelector.fromSignature('transfer_in_public((Field),(Field),(Field,Field),Field)'),
|
|
74
|
+
type: FunctionType.PUBLIC,
|
|
75
|
+
isStatic: false,
|
|
76
|
+
to: await this.getAsset(),
|
|
77
|
+
returnTypes: [],
|
|
78
|
+
},
|
|
79
|
+
}, true);
|
|
80
|
+
return [
|
|
81
|
+
await setPublicAuthWitInteraction.request(),
|
|
83
82
|
{
|
|
84
83
|
name: 'fee_entrypoint_public',
|
|
85
84
|
to: this.paymentContract,
|
|
86
|
-
selector: FunctionSelector.fromSignature('fee_entrypoint_public(Field,Field)'),
|
|
85
|
+
selector: await FunctionSelector.fromSignature('fee_entrypoint_public((Field,Field),Field)'),
|
|
87
86
|
type: FunctionType.PRIVATE,
|
|
88
87
|
isStatic: false,
|
|
89
|
-
args: [maxFee, nonce],
|
|
88
|
+
args: [...maxFee.toFields(), nonce],
|
|
90
89
|
returnTypes: [],
|
|
91
90
|
},
|
|
92
|
-
]
|
|
91
|
+
];
|
|
93
92
|
}
|
|
94
93
|
}
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2ZlZV9wYXltZW50X21ldGhvZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mZWUvcHVibGljX2ZlZV9wYXltZW50X21ldGhvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTdFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU5QyxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUUzRixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdsRTs7R0FFRztBQUNILE1BQU0sT0FBTyxzQkFBc0I7SUFHakM7SUFDRTs7T0FFRztJQUNPLGVBQTZCO0lBQ3ZDOztPQUVHO0lBQ08sTUFBcUI7UUFKckIsb0JBQWUsR0FBZixlQUFlLENBQWM7UUFJN0IsV0FBTSxHQUFOLE1BQU0sQ0FBZTtRQVZ6QixpQkFBWSxHQUFpQyxJQUFJLENBQUM7SUFXdkQsQ0FBQztJQUVKOzs7T0FHRztJQUNILFFBQVE7UUFDTixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1lBQ3ZCLGdIQUFnSDtZQUNoSCxNQUFNLGdCQUFnQixHQUFHLElBQUksZ0JBQWdCLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBRTNELE1BQU0sV0FBVyxHQUFHLElBQUksMkJBQTJCLENBQ2pELGdCQUFnQixFQUNoQixJQUFJLENBQUMsZUFBZSxFQUNwQjtnQkFDRSxJQUFJLEVBQUUsb0JBQW9CO2dCQUMxQixZQUFZLEVBQUUsWUFBWSxDQUFDLE9BQU87Z0JBQ2xDLFVBQVUsRUFBRSxLQUFLO2dCQUNqQixRQUFRLEVBQUUsS0FBSztnQkFDZixVQUFVLEVBQUUsRUFBRTtnQkFDZCxXQUFXLEVBQUU7b0JBQ1g7d0JBQ0UsSUFBSSxFQUFFLFFBQVE7d0JBQ2QsSUFBSSxFQUFFLHNFQUFzRTt3QkFDNUUsTUFBTSxFQUFFOzRCQUNOO2dDQUNFLElBQUksRUFBRSxPQUFPO2dDQUNiLElBQUksRUFBRTtvQ0FDSixJQUFJLEVBQUUsT0FBTztpQ0FDZDs2QkFDRjt5QkFDRjtxQkFDRjtpQkFDRjtnQkFDRCxVQUFVLEVBQUUsRUFBRTtnQkFDZCxhQUFhLEVBQUUsS0FBSzthQUNyQixFQUNELEVBQUUsQ0FDSCxDQUFDO1lBRUYsSUFBSSxDQUFDLFlBQVksR0FBRyxXQUFXLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDN0MsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDLFlBQWEsQ0FBQztJQUM1QixDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsZ0JBQWdCLENBQUMsV0FBd0I7UUFDN0MsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQzFCLE1BQU0sTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBRTlELE1BQU0sMkJBQTJCLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUNwRTtZQUNFLE1BQU0sRUFBRSxJQUFJLENBQUMsZUFBZTtZQUM1QixNQUFNLEVBQUU7Z0JBQ04sSUFBSSxFQUFFLG9CQUFvQjtnQkFDMUIsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxJQUFJLENBQUMsZUFBZSxDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFLEtBQUssQ0FBQztnQkFDdkcsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUMsYUFBYSxDQUFDLHlEQUF5RCxDQUFDO2dCQUN6RyxJQUFJLEVBQUUsWUFBWSxDQUFDLE1BQU07Z0JBQ3pCLFFBQVEsRUFBRSxLQUFLO2dCQUNmLEVBQUUsRUFBRSxNQUFNLElBQUksQ0FBQyxRQUFRLEVBQUU7Z0JBQ3pCLFdBQVcsRUFBRSxFQUFFO2FBQ2hCO1NBQ0YsRUFDRCxJQUFJLENBQ0wsQ0FBQztRQUVGLE9BQU87WUFDTCxNQUFNLDJCQUEyQixDQUFDLE9BQU8sRUFBRTtZQUMzQztnQkFDRSxJQUFJLEVBQUUsdUJBQXVCO2dCQUM3QixFQUFFLEVBQUUsSUFBSSxDQUFDLGVBQWU7Z0JBQ3hCLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyw0Q0FBNEMsQ0FBQztnQkFDNUYsSUFBSSxFQUFFLFlBQVksQ0FBQyxPQUFPO2dCQUMxQixRQUFRLEVBQUUsS0FBSztnQkFDZixJQUFJLEVBQUUsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxLQUFLLENBQUM7Z0JBQ25DLFdBQVcsRUFBRSxFQUFFO2FBQ2hCO1NBQ0YsQ0FBQztJQUNKLENBQUM7Q0FDRiJ9
|
package/dest/index.d.ts
CHANGED
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
* TODO: Ultimately reimplement this mega exporter by mega exporting a granular api (then deprecate it).
|
|
21
21
|
*/
|
|
22
22
|
export { ContractDeployer } from './deployment/index.js';
|
|
23
|
-
export { AnvilTestWatcher, CheatCodes, L1FeeJuicePortalManager, L1ToL2TokenPortalManager, L1TokenManager, L1TokenPortalManager, computeAuthWitMessageHash, computeInnerAuthWitHash, computeInnerAuthWitHashFromAction, generateClaimSecret, generatePublicKey, readFieldCompressedString, waitForPXE, waitForNode, type AztecAddressLike, type EthAddressLike, type EventSelectorLike, type FieldLike, type FunctionSelectorLike, type L2AmountClaim, type L2AmountClaimWithRecipient, type L2Claim, type WrappedFieldLike, type IntentAction, } from './utils/index.js';
|
|
23
|
+
export { AnvilTestWatcher, CheatCodes, L1FeeJuicePortalManager, L1ToL2TokenPortalManager, L1TokenManager, L1TokenPortalManager, computeAuthWitMessageHash, computeInnerAuthWitHash, computeInnerAuthWitHashFromAction, generateClaimSecret, generatePublicKey, readFieldCompressedString, waitForPXE, waitForNode, type AztecAddressLike, type EthAddressLike, type EventSelectorLike, type FieldLike, type FunctionSelectorLike, type L2AmountClaim, type L2AmountClaimWithRecipient, type L2Claim, type U128Like, type WrappedFieldLike, type IntentAction, } from './utils/index.js';
|
|
24
24
|
export { NoteSelector } from '@aztec/foundation/abi';
|
|
25
25
|
export { createCompatibleClient, createPXEClient } from './rpc_clients/index.js';
|
|
26
26
|
export { type AuthWitnessProvider } from './account/index.js';
|
|
@@ -31,7 +31,7 @@ export { ContractClassWithId, ContractInstanceWithAddress, EthAddress, Fq, Fr, G
|
|
|
31
31
|
export { computeSecretHash } from '@aztec/circuits.js/hash';
|
|
32
32
|
export { computeAppNullifierSecretKey, deriveKeys, deriveMasterIncomingViewingSecretKey, deriveMasterNullifierSecretKey, } from '@aztec/circuits.js/keys';
|
|
33
33
|
export { Grumpkin, Schnorr } from '@aztec/circuits.js/barretenberg';
|
|
34
|
-
export { AuthWitness, Body, Comparator, ContractClass2BlockL2Logs, EncryptedLogPayload, EpochProofQuote, EpochProofQuotePayload, EventMetadata, EventType, ExtendedNote, FunctionCall, L1Actor, L1EventPayload, L1NotePayload, L1ToL2Message, L2Actor, L2Block, LogId, MerkleTreeId, Note, HashedValues, SiblingPath, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus,
|
|
34
|
+
export { AuthWitness, Body, Comparator, ContractClass2BlockL2Logs, EncryptedLogPayload, EpochProofQuote, EpochProofQuotePayload, EventMetadata, EventType, ExtendedNote, FunctionCall, L1Actor, L1EventPayload, L1NotePayload, L1ToL2Message, L2Actor, L2Block, LogId, MerkleTreeId, Note, HashedValues, SiblingPath, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, UnencryptedL2Log, UniqueNote, createAztecNodeClient, getTimestampRangeForEpoch, merkleTreeIds, mockEpochProofQuote, mockTx, type AztecNode, type LogFilter, type PXE, type PartialAddress, type PublicKey, } from '@aztec/circuit-types';
|
|
35
35
|
export { decodeFromAbi, encodeArguments, type AbiType } from '@aztec/foundation/abi';
|
|
36
36
|
export { toBigIntBE } from '@aztec/foundation/bigint-buffer';
|
|
37
37
|
export { sha256 } from '@aztec/foundation/crypto';
|
|
@@ -43,10 +43,9 @@ export { sleep } from '@aztec/foundation/sleep';
|
|
|
43
43
|
export { elapsed } from '@aztec/foundation/timer';
|
|
44
44
|
export { type FieldsOf } from '@aztec/foundation/types';
|
|
45
45
|
export { fileURLToPath } from '@aztec/foundation/url';
|
|
46
|
-
export { EthCheatCodes, deployL1Contract, deployL1Contracts, type DeployL1Contracts } from '@aztec/ethereum';
|
|
47
46
|
export * from './api/abi.js';
|
|
48
47
|
export * from './api/fee.js';
|
|
49
|
-
export * from './api/init.js';
|
|
50
|
-
export * from './contract/index.js';
|
|
51
48
|
export * from './api/addresses.js';
|
|
49
|
+
export * from './api/ethereum.js';
|
|
50
|
+
export * from './contract/index.js';
|
|
52
51
|
//# sourceMappingURL=index.d.ts.map
|
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;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,uBAAuB,EACvB,wBAAwB,EACxB,cAAc,EACd,oBAAoB,EACpB,yBAAyB,EACzB,uBAAuB,EACvB,iCAAiC,EACjC,mBAAmB,EACnB,iBAAiB,EACjB,yBAAyB,EACzB,UAAU,EACV,WAAW,EACX,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,0BAA0B,EAC/B,KAAK,OAAO,EACZ,KAAK,gBAAgB,EACrB,KAAK,YAAY,GAClB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEjF,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvF,OAAO,EAAE,aAAa,EAAE,0BAA0B,EAAE,gBAAgB,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI7G,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,UAAU,EACV,EAAE,EACF,EAAE,EACF,eAAe,EACf,cAAc,EACd,oBAAoB,EACpB,QAAQ,EACR,KAAK,EACL,UAAU,EACV,4BAA4B,EAC5B,mCAAmC,GACpC,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EACL,4BAA4B,EAC5B,UAAU,EACV,oCAAoC,EACpC,8BAA8B,GAC/B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EACL,WAAW,EACX,IAAI,EACJ,UAAU,EACV,yBAAyB,EACzB,mBAAmB,EACnB,eAAe,EACf,sBAAsB,EACtB,aAAa,EACb,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,cAAc,EACd,aAAa,EACb,aAAa,EACb,OAAO,EACP,OAAO,EACP,KAAK,EACL,YAAY,EACZ,IAAI,EACJ,YAAY,EACZ,WAAW,EACX,EAAE,EACF,kBAAkB,EAClB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dest/index.js
CHANGED
|
@@ -31,7 +31,7 @@ export { EthAddress, Fq, Fr, GlobalVariables, GrumpkinScalar, INITIAL_L2_BLOCK_N
|
|
|
31
31
|
export { computeSecretHash } from '@aztec/circuits.js/hash';
|
|
32
32
|
export { computeAppNullifierSecretKey, deriveKeys, deriveMasterIncomingViewingSecretKey, deriveMasterNullifierSecretKey, } from '@aztec/circuits.js/keys';
|
|
33
33
|
export { Grumpkin, Schnorr } from '@aztec/circuits.js/barretenberg';
|
|
34
|
-
export { AuthWitness, Body, Comparator, ContractClass2BlockL2Logs, EncryptedLogPayload, EpochProofQuote, EpochProofQuotePayload, EventMetadata, EventType, ExtendedNote, FunctionCall, L1Actor, L1EventPayload, L1NotePayload, L1ToL2Message, L2Actor, L2Block, LogId, MerkleTreeId, Note, HashedValues, SiblingPath, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus,
|
|
34
|
+
export { AuthWitness, Body, Comparator, ContractClass2BlockL2Logs, EncryptedLogPayload, EpochProofQuote, EpochProofQuotePayload, EventMetadata, EventType, ExtendedNote, FunctionCall, L1Actor, L1EventPayload, L1NotePayload, L1ToL2Message, L2Actor, L2Block, LogId, MerkleTreeId, Note, HashedValues, SiblingPath, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, UnencryptedL2Log, UniqueNote, createAztecNodeClient, getTimestampRangeForEpoch, merkleTreeIds, mockEpochProofQuote, mockTx, } from '@aztec/circuit-types';
|
|
35
35
|
// TODO: These kinds of things have no place on our public api.
|
|
36
36
|
// External devs will almost certainly have their own methods of doing these things.
|
|
37
37
|
// If we want to use them in our own "aztec.js consuming code", import them from foundation as needed.
|
|
@@ -45,14 +45,13 @@ export { to2Fields, toBigInt } from '@aztec/foundation/serialize';
|
|
|
45
45
|
export { sleep } from '@aztec/foundation/sleep';
|
|
46
46
|
export { elapsed } from '@aztec/foundation/timer';
|
|
47
47
|
export { fileURLToPath } from '@aztec/foundation/url';
|
|
48
|
-
export { EthCheatCodes, deployL1Contract, deployL1Contracts } from '@aztec/ethereum';
|
|
49
48
|
// Start of section that exports public api via granular api.
|
|
50
49
|
// Here you *can* do `export *` as the granular api defacto exports things explicitly.
|
|
51
50
|
// This entire index file will be deprecated at some point after we're satisfied.
|
|
52
51
|
export * from './api/abi.js';
|
|
53
52
|
export * from './api/fee.js';
|
|
54
|
-
export * from './api/
|
|
53
|
+
export * from './api/addresses.js';
|
|
54
|
+
export * from './api/ethereum.js';
|
|
55
55
|
// Granular export, even if not in the api folder
|
|
56
56
|
export * from './contract/index.js';
|
|
57
|
-
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JHO0FBRUgsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFekQsT0FBTyxFQUNMLGdCQUFnQixFQUNoQixVQUFVLEVBQ1YsdUJBQXVCLEVBQ3ZCLHdCQUF3QixFQUN4QixjQUFjLEVBQ2Qsb0JBQW9CLEVBQ3BCLHlCQUF5QixFQUN6Qix1QkFBdUIsRUFDdkIsaUNBQWlDLEVBQ2pDLG1CQUFtQixFQUNuQixpQkFBaUIsRUFDakIseUJBQXlCLEVBQ3pCLFVBQVUsRUFDVixXQUFXLEdBV1osTUFBTSxrQkFBa0IsQ0FBQztBQUUxQixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFckQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBS2pGLE9BQU8sRUFBRSxjQUFjLEVBQTZCLE1BQU0sNEJBQTRCLENBQUM7QUFFdkYsT0FBTyxFQUFFLGFBQWEsRUFBRSwwQkFBMEIsRUFBRSxnQkFBZ0IsRUFBZSxNQUFNLG1CQUFtQixDQUFDO0FBRTdHLHdIQUF3SDtBQUN4SCxzQ0FBc0M7QUFDdEMsT0FBTyxFQUdMLFVBQVUsRUFDVixFQUFFLEVBQ0YsRUFBRSxFQUNGLGVBQWUsRUFDZixjQUFjLEVBQ2Qsb0JBQW9CLEVBRXBCLEtBQUssRUFDTCxVQUFVLEVBQ1YsNEJBQTRCLEVBQzVCLG1DQUFtQyxHQUNwQyxNQUFNLG9CQUFvQixDQUFDO0FBRTVCLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTVELE9BQU8sRUFDTCw0QkFBNEIsRUFDNUIsVUFBVSxFQUNWLG9DQUFvQyxFQUNwQyw4QkFBOEIsR0FDL0IsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXBFLE9BQU8sRUFDTCxXQUFXLEVBQ1gsSUFBSSxFQUNKLFVBQVUsRUFDVix5QkFBeUIsRUFDekIsbUJBQW1CLEVBQ25CLGVBQWUsRUFDZixzQkFBc0IsRUFDdEIsYUFBYSxFQUNiLFNBQVMsRUFDVCxZQUFZLEVBQ1osWUFBWSxFQUNaLE9BQU8sRUFDUCxjQUFjLEVBQ2QsYUFBYSxFQUNiLGFBQWEsRUFDYixPQUFPLEVBQ1AsT0FBTyxFQUNQLEtBQUssRUFDTCxZQUFZLEVBQ1osSUFBSSxFQUNKLFlBQVksRUFDWixXQUFXLEVBQ1gsRUFBRSxFQUNGLGtCQUFrQixFQUNsQixNQUFNLEVBQ04sU0FBUyxFQUNULFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsZ0JBQWdCLEVBQ2hCLFVBQVUsRUFDVixxQkFBcUIsRUFDckIseUJBQXlCLEVBQ3pCLGFBQWEsRUFDYixtQkFBbUIsRUFDbkIsTUFBTSxHQU1QLE1BQU0sc0JBQXNCLENBQUM7QUFFOUIsK0RBQStEO0FBQy9ELG9GQUFvRjtBQUNwRixzR0FBc0c7QUFDdEcsT0FBTyxFQUFFLGFBQWEsRUFBRSxlQUFlLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDckYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzdELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDOUQsT0FBTyxFQUFFLFlBQVksRUFBZSxNQUFNLHVCQUF1QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDaEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWxELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV0RCxPQUFPLEVBQUUsYUFBYSxFQUFFLGdCQUFnQixFQUFFLGlCQUFpQixFQUEwQixNQUFNLGlCQUFpQixDQUFDO0FBRTdHLDZEQUE2RDtBQUM3RCxzRkFBc0Y7QUFDdEYsaUZBQWlGO0FBQ2pGLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGlEQUFpRDtBQUNqRCxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsb0JBQW9CLENBQUMifQ==
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JHO0FBRUgsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFekQsT0FBTyxFQUNMLGdCQUFnQixFQUNoQixVQUFVLEVBQ1YsdUJBQXVCLEVBQ3ZCLHdCQUF3QixFQUN4QixjQUFjLEVBQ2Qsb0JBQW9CLEVBQ3BCLHlCQUF5QixFQUN6Qix1QkFBdUIsRUFDdkIsaUNBQWlDLEVBQ2pDLG1CQUFtQixFQUNuQixpQkFBaUIsRUFDakIseUJBQXlCLEVBQ3pCLFVBQVUsRUFDVixXQUFXLEdBWVosTUFBTSxrQkFBa0IsQ0FBQztBQUUxQixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFckQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBS2pGLE9BQU8sRUFBRSxjQUFjLEVBQTZCLE1BQU0sNEJBQTRCLENBQUM7QUFFdkYsT0FBTyxFQUFFLGFBQWEsRUFBRSwwQkFBMEIsRUFBRSxnQkFBZ0IsRUFBZSxNQUFNLG1CQUFtQixDQUFDO0FBRTdHLHdIQUF3SDtBQUN4SCxzQ0FBc0M7QUFDdEMsT0FBTyxFQUdMLFVBQVUsRUFDVixFQUFFLEVBQ0YsRUFBRSxFQUNGLGVBQWUsRUFDZixjQUFjLEVBQ2Qsb0JBQW9CLEVBRXBCLEtBQUssRUFDTCxVQUFVLEVBQ1YsNEJBQTRCLEVBQzVCLG1DQUFtQyxHQUNwQyxNQUFNLG9CQUFvQixDQUFDO0FBRTVCLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTVELE9BQU8sRUFDTCw0QkFBNEIsRUFDNUIsVUFBVSxFQUNWLG9DQUFvQyxFQUNwQyw4QkFBOEIsR0FDL0IsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXBFLE9BQU8sRUFDTCxXQUFXLEVBQ1gsSUFBSSxFQUNKLFVBQVUsRUFDVix5QkFBeUIsRUFDekIsbUJBQW1CLEVBQ25CLGVBQWUsRUFDZixzQkFBc0IsRUFDdEIsYUFBYSxFQUNiLFNBQVMsRUFDVCxZQUFZLEVBQ1osWUFBWSxFQUNaLE9BQU8sRUFDUCxjQUFjLEVBQ2QsYUFBYSxFQUNiLGFBQWEsRUFDYixPQUFPLEVBQ1AsT0FBTyxFQUNQLEtBQUssRUFDTCxZQUFZLEVBQ1osSUFBSSxFQUNKLFlBQVksRUFDWixXQUFXLEVBQ1gsRUFBRSxFQUNGLGtCQUFrQixFQUNsQixNQUFNLEVBQ04sU0FBUyxFQUNULFFBQVEsRUFDUixnQkFBZ0IsRUFDaEIsVUFBVSxFQUNWLHFCQUFxQixFQUNyQix5QkFBeUIsRUFDekIsYUFBYSxFQUNiLG1CQUFtQixFQUNuQixNQUFNLEdBTVAsTUFBTSxzQkFBc0IsQ0FBQztBQUU5QiwrREFBK0Q7QUFDL0Qsb0ZBQW9GO0FBQ3BGLHNHQUFzRztBQUN0RyxPQUFPLEVBQUUsYUFBYSxFQUFFLGVBQWUsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsWUFBWSxFQUFlLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXRELDZEQUE2RDtBQUM3RCxzRkFBc0Y7QUFDdEYsaUZBQWlGO0FBQ2pGLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxpREFBaUQ7QUFDakQsY0FBYyxxQkFBcUIsQ0FBQyJ9
|