@aztec/aztec.js 0.73.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2
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/README.md +1 -1
- package/dest/account/contract.js +5 -3
- package/dest/account/index.js +8 -2
- package/dest/account/interface.js +4 -3
- package/dest/account/wallet.js +3 -2
- package/dest/account_manager/deploy_account_method.js +22 -25
- package/dest/account_manager/deploy_account_sent_tx.js +16 -17
- package/dest/account_manager/index.js +67 -78
- package/dest/api/abi.js +0 -1
- package/dest/api/account.js +0 -1
- package/dest/api/addresses.js +0 -1
- package/dest/api/cheat_codes.js +25 -0
- package/dest/api/deployment.js +0 -1
- package/dest/api/entrypoint.js +0 -1
- package/dest/api/eth_address.js +0 -1
- package/dest/api/ethereum/anvil_test_watcher.js +113 -0
- package/dest/api/ethereum/chain_monitor.js +69 -0
- package/dest/api/ethereum/cheat_codes.js +142 -0
- package/dest/api/ethereum/index.js +6 -0
- package/dest/api/ethereum/l1_contracts.js +13 -0
- package/dest/api/ethereum/portal_manager.js +284 -0
- package/dest/api/fee.js +0 -1
- package/dest/api/fields.js +0 -1
- package/dest/api/interfaces/pxe.js +1 -2
- package/dest/api/log.js +1 -0
- package/dest/api/log_id.js +0 -1
- package/dest/api/tx_hash.js +0 -1
- package/dest/api/wallet.js +1 -2
- package/dest/contract/base_contract_interaction.js +75 -52
- package/dest/contract/batch_call.js +57 -39
- package/dest/contract/checker.js +29 -20
- package/dest/contract/contract.js +22 -27
- package/dest/contract/contract_base.js +21 -30
- package/dest/contract/contract_function_interaction.js +48 -48
- package/dest/contract/deploy_method.js +99 -84
- package/dest/contract/deploy_proven_tx.js +8 -11
- package/dest/contract/deploy_sent_tx.js +19 -22
- package/dest/contract/get_gas_limits.js +2 -4
- package/dest/contract/index.js +4 -6
- package/dest/contract/proven_tx.js +7 -10
- package/dest/contract/sent_tx.js +32 -34
- package/dest/contract/unsafe_contract.js +2 -10
- package/dest/deployment/broadcast_function.js +28 -26
- package/dest/deployment/contract_deployer.js +15 -14
- package/dest/deployment/deploy_instance.js +1 -3
- package/dest/deployment/index.js +0 -1
- package/dest/deployment/protocol_contracts.js +2 -5
- package/dest/deployment/register_class.js +8 -8
- package/dest/entrypoint/default_entrypoint.js +8 -5
- package/dest/entrypoint/default_multi_call_entrypoint.js +66 -23
- package/dest/entrypoint/entrypoint.js +0 -1
- package/dest/entrypoint/payload.js +73 -82
- package/dest/fee/fee_juice_payment_method.js +3 -4
- package/dest/fee/fee_juice_payment_method_with_claim.js +11 -14
- package/dest/fee/fee_payment_method.js +3 -2
- package/dest/fee/no_fee_payment_method.js +2 -4
- package/dest/fee/private_fee_payment_method.js +36 -34
- package/dest/fee/public_fee_payment_method.js +34 -31
- package/dest/index.js +8 -9
- package/dest/rpc_clients/index.js +0 -1
- package/dest/rpc_clients/node/index.js +30 -16
- package/dest/rpc_clients/pxe_client.js +5 -3
- package/dest/utils/abi_types.js +1 -2
- package/dest/utils/authwit.js +15 -15
- package/dest/utils/aztec_cheatcodes.js +62 -0
- package/dest/utils/field_compressed_string.js +2 -4
- package/dest/utils/index.js +5 -12
- package/dest/utils/node.js +4 -5
- package/dest/utils/pub_key.js +1 -3
- package/dest/utils/pxe.js +3 -5
- package/dest/wallet/account_wallet.js +118 -81
- package/dest/wallet/account_wallet_with_private_key.js +9 -15
- package/dest/wallet/base_wallet.js +7 -5
- package/dest/wallet/index.js +2 -4
- package/dest/wallet/signerless_wallet.js +4 -6
- package/package.json +14 -17
- package/src/api/account.ts +7 -1
- package/src/api/cheat_codes.ts +35 -0
- package/src/{utils → api/ethereum}/anvil_test_watcher.ts +2 -1
- package/src/{utils → api/ethereum}/cheat_codes.ts +6 -109
- package/src/api/ethereum/index.ts +15 -0
- package/src/{utils → api/ethereum}/l1_contracts.ts +1 -1
- package/src/{utils → api/ethereum}/portal_manager.ts +4 -9
- package/src/api/interfaces/pxe.ts +1 -1
- package/src/api/log.ts +1 -0
- package/src/api/wallet.ts +1 -1
- package/src/contract/contract_function_interaction.ts +1 -1
- package/src/contract/index.ts +2 -2
- package/src/entrypoint/default_multi_call_entrypoint.ts +2 -1
- package/src/entrypoint/entrypoint.ts +1 -1
- package/src/fee/fee_juice_payment_method_with_claim.ts +1 -1
- package/src/index.ts +7 -35
- package/src/utils/aztec_cheatcodes.ts +75 -0
- package/src/utils/index.ts +19 -11
- package/src/utils/node.ts +2 -0
- package/src/wallet/index.ts +1 -1
- package/dest/account/contract.d.ts +0 -33
- package/dest/account/contract.d.ts.map +0 -1
- package/dest/account/index.d.ts +0 -15
- package/dest/account/index.d.ts.map +0 -1
- package/dest/account/interface.d.ts +0 -30
- package/dest/account/interface.d.ts.map +0 -1
- package/dest/account/wallet.d.ts +0 -10
- package/dest/account/wallet.d.ts.map +0 -1
- package/dest/account_manager/deploy_account_method.d.ts +0 -15
- package/dest/account_manager/deploy_account_method.d.ts.map +0 -1
- package/dest/account_manager/deploy_account_sent_tx.d.ts +0 -29
- package/dest/account_manager/deploy_account_sent_tx.d.ts.map +0 -1
- package/dest/account_manager/index.d.ts +0 -99
- package/dest/account_manager/index.d.ts.map +0 -1
- package/dest/api/abi.d.ts +0 -4
- package/dest/api/abi.d.ts.map +0 -1
- package/dest/api/account.d.ts +0 -4
- package/dest/api/account.d.ts.map +0 -1
- package/dest/api/addresses.d.ts +0 -3
- package/dest/api/addresses.d.ts.map +0 -1
- package/dest/api/deployment.d.ts +0 -4
- package/dest/api/deployment.d.ts.map +0 -1
- package/dest/api/entrypoint.d.ts +0 -2
- package/dest/api/entrypoint.d.ts.map +0 -1
- package/dest/api/eth_address.d.ts +0 -2
- package/dest/api/eth_address.d.ts.map +0 -1
- package/dest/api/ethereum.d.ts +0 -3
- package/dest/api/ethereum.d.ts.map +0 -1
- package/dest/api/ethereum.js +0 -3
- package/dest/api/fee.d.ts +0 -7
- package/dest/api/fee.d.ts.map +0 -1
- package/dest/api/fields.d.ts +0 -2
- package/dest/api/fields.d.ts.map +0 -1
- package/dest/api/interfaces/pxe.d.ts +0 -2
- package/dest/api/interfaces/pxe.d.ts.map +0 -1
- package/dest/api/log_id.d.ts +0 -2
- package/dest/api/log_id.d.ts.map +0 -1
- package/dest/api/tx_hash.d.ts +0 -2
- package/dest/api/tx_hash.d.ts.map +0 -1
- package/dest/api/wallet.d.ts +0 -2
- package/dest/api/wallet.d.ts.map +0 -1
- package/dest/barretenberg-threads.wasm.gz +0 -0
- package/dest/barretenberg.wasm.gz +0 -0
- package/dest/contract/base_contract_interaction.d.ts +0 -82
- package/dest/contract/base_contract_interaction.d.ts.map +0 -1
- package/dest/contract/batch_call.d.ts +0 -27
- package/dest/contract/batch_call.d.ts.map +0 -1
- package/dest/contract/checker.d.ts +0 -11
- package/dest/contract/checker.d.ts.map +0 -1
- package/dest/contract/contract.d.ts +0 -41
- package/dest/contract/contract.d.ts.map +0 -1
- package/dest/contract/contract_base.d.ts +0 -61
- package/dest/contract/contract_base.d.ts.map +0 -1
- package/dest/contract/contract_function_interaction.d.ts +0 -67
- package/dest/contract/contract_function_interaction.d.ts.map +0 -1
- package/dest/contract/deploy_method.d.ts +0 -110
- package/dest/contract/deploy_method.d.ts.map +0 -1
- package/dest/contract/deploy_proven_tx.d.ts +0 -19
- package/dest/contract/deploy_proven_tx.d.ts.map +0 -1
- package/dest/contract/deploy_sent_tx.d.ts +0 -43
- package/dest/contract/deploy_sent_tx.d.ts.map +0 -1
- package/dest/contract/get_gas_limits.d.ts +0 -18
- package/dest/contract/get_gas_limits.d.ts.map +0 -1
- package/dest/contract/index.d.ts +0 -45
- package/dest/contract/index.d.ts.map +0 -1
- package/dest/contract/proven_tx.d.ts +0 -16
- package/dest/contract/proven_tx.d.ts.map +0 -1
- package/dest/contract/sent_tx.d.ts +0 -60
- package/dest/contract/sent_tx.d.ts.map +0 -1
- package/dest/contract/unsafe_contract.d.ts +0 -15
- package/dest/contract/unsafe_contract.d.ts.map +0 -1
- package/dest/deployment/broadcast_function.d.ts +0 -24
- package/dest/deployment/broadcast_function.d.ts.map +0 -1
- package/dest/deployment/contract_deployer.d.ts +0 -27
- package/dest/deployment/contract_deployer.d.ts.map +0 -1
- package/dest/deployment/deploy_instance.d.ts +0 -10
- package/dest/deployment/deploy_instance.d.ts.map +0 -1
- package/dest/deployment/index.d.ts +0 -2
- package/dest/deployment/index.d.ts.map +0 -1
- package/dest/deployment/protocol_contracts.d.ts +0 -7
- package/dest/deployment/protocol_contracts.d.ts.map +0 -1
- package/dest/deployment/register_class.d.ts +0 -6
- package/dest/deployment/register_class.d.ts.map +0 -1
- package/dest/entrypoint/default_entrypoint.d.ts +0 -12
- package/dest/entrypoint/default_entrypoint.d.ts.map +0 -1
- package/dest/entrypoint/default_multi_call_entrypoint.d.ts +0 -15
- package/dest/entrypoint/default_multi_call_entrypoint.d.ts.map +0 -1
- package/dest/entrypoint/entrypoint.d.ts +0 -31
- package/dest/entrypoint/entrypoint.d.ts.map +0 -1
- package/dest/entrypoint/payload.d.ts +0 -125
- package/dest/entrypoint/payload.d.ts.map +0 -1
- package/dest/fee/fee_juice_payment_method.d.ts +0 -14
- package/dest/fee/fee_juice_payment_method.d.ts.map +0 -1
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts +0 -17
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts.map +0 -1
- package/dest/fee/fee_payment_method.d.ts +0 -22
- package/dest/fee/fee_payment_method.d.ts.map +0 -1
- package/dest/fee/no_fee_payment_method.d.ts +0 -13
- package/dest/fee/no_fee_payment_method.d.ts.map +0 -1
- package/dest/fee/private_fee_payment_method.d.ts +0 -51
- package/dest/fee/private_fee_payment_method.d.ts.map +0 -1
- package/dest/fee/public_fee_payment_method.d.ts +0 -41
- package/dest/fee/public_fee_payment_method.d.ts.map +0 -1
- package/dest/index.d.ts +0 -51
- package/dest/index.d.ts.map +0 -1
- package/dest/main.js +0 -2
- package/dest/main.js.LICENSE.txt +0 -25
- package/dest/rpc_clients/index.d.ts +0 -3
- package/dest/rpc_clients/index.d.ts.map +0 -1
- package/dest/rpc_clients/node/index.d.ts +0 -11
- package/dest/rpc_clients/node/index.d.ts.map +0 -1
- package/dest/rpc_clients/pxe_client.d.ts +0 -9
- package/dest/rpc_clients/pxe_client.d.ts.map +0 -1
- package/dest/utils/abi_types.d.ts +0 -26
- package/dest/utils/abi_types.d.ts.map +0 -1
- package/dest/utils/anvil_test_watcher.d.ts +0 -28
- package/dest/utils/anvil_test_watcher.d.ts.map +0 -1
- package/dest/utils/anvil_test_watcher.js +0 -108
- package/dest/utils/authwit.d.ts +0 -59
- package/dest/utils/authwit.d.ts.map +0 -1
- package/dest/utils/chain_monitor.d.ts +0 -21
- package/dest/utils/chain_monitor.d.ts.map +0 -1
- package/dest/utils/chain_monitor.js +0 -58
- package/dest/utils/cheat_codes.d.ts +0 -137
- package/dest/utils/cheat_codes.d.ts.map +0 -1
- package/dest/utils/cheat_codes.js +0 -225
- package/dest/utils/field_compressed_string.d.ts +0 -17
- package/dest/utils/field_compressed_string.d.ts.map +0 -1
- package/dest/utils/index.d.ts +0 -12
- package/dest/utils/index.d.ts.map +0 -1
- package/dest/utils/l1_contracts.d.ts +0 -3
- package/dest/utils/l1_contracts.d.ts.map +0 -1
- package/dest/utils/l1_contracts.js +0 -15
- package/dest/utils/node.d.ts +0 -4
- package/dest/utils/node.d.ts.map +0 -1
- package/dest/utils/portal_manager.d.ts +0 -130
- package/dest/utils/portal_manager.d.ts.map +0 -1
- package/dest/utils/portal_manager.js +0 -265
- package/dest/utils/pub_key.d.ts +0 -8
- package/dest/utils/pub_key.d.ts.map +0 -1
- package/dest/utils/pxe.d.ts +0 -4
- package/dest/utils/pxe.d.ts.map +0 -1
- package/dest/wallet/account_wallet.d.ts +0 -73
- package/dest/wallet/account_wallet.d.ts.map +0 -1
- package/dest/wallet/account_wallet_with_private_key.d.ts +0 -26
- package/dest/wallet/account_wallet_with_private_key.d.ts.map +0 -1
- package/dest/wallet/base_wallet.d.ts +0 -64
- package/dest/wallet/base_wallet.d.ts.map +0 -1
- package/dest/wallet/index.d.ts +0 -17
- package/dest/wallet/index.d.ts.map +0 -1
- package/dest/wallet/signerless_wallet.d.ts +0 -22
- package/dest/wallet/signerless_wallet.d.ts.map +0 -1
- package/src/api/ethereum.ts +0 -2
- /package/src/{utils → api/ethereum}/chain_monitor.ts +0 -0
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
var _FeeEntrypointPayload_isFeePayer;
|
|
2
|
-
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
1
|
import { FunctionCall, HashedValues } from '@aztec/circuit-types';
|
|
4
2
|
import { Fr, GeneratorIndex } from '@aztec/circuits.js';
|
|
5
3
|
import { FunctionType } from '@aztec/foundation/abi';
|
|
@@ -10,10 +8,12 @@ import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
|
|
|
10
8
|
const APP_MAX_CALLS = 4;
|
|
11
9
|
// - and noir-projects/aztec-nr/aztec/src/entrypoint/fee.nr
|
|
12
10
|
const FEE_MAX_CALLS = 2;
|
|
13
|
-
/* eslint-enable camelcase */
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
11
|
+
/* eslint-enable camelcase */ /** Assembles an entrypoint payload */ export class EntrypointPayload {
|
|
12
|
+
functionCalls;
|
|
13
|
+
_hashedArguments;
|
|
14
|
+
generatorIndex;
|
|
15
|
+
_nonce;
|
|
16
|
+
constructor(functionCalls, _hashedArguments, generatorIndex, _nonce){
|
|
17
17
|
this.functionCalls = functionCalls;
|
|
18
18
|
this._hashedArguments = _hashedArguments;
|
|
19
19
|
this.generatorIndex = generatorIndex;
|
|
@@ -21,78 +21,67 @@ export class EntrypointPayload {
|
|
|
21
21
|
}
|
|
22
22
|
static async create(functionCalls) {
|
|
23
23
|
const hashedArguments = [];
|
|
24
|
-
for (const call of functionCalls)
|
|
24
|
+
for (const call of functionCalls){
|
|
25
25
|
hashedArguments.push(await HashedValues.fromValues(call.args));
|
|
26
26
|
}
|
|
27
|
-
/* eslint-disable camelcase */
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
/* eslint-enable camelcase */
|
|
36
|
-
return {
|
|
27
|
+
/* eslint-disable camelcase */ const encodedFunctionCalls = functionCalls.map((call, index)=>({
|
|
28
|
+
args_hash: hashedArguments[index].hash,
|
|
29
|
+
function_selector: call.selector.toField(),
|
|
30
|
+
target_address: call.to.toField(),
|
|
31
|
+
is_public: call.type == FunctionType.PUBLIC,
|
|
32
|
+
is_static: call.isStatic
|
|
33
|
+
}));
|
|
34
|
+
/* eslint-enable camelcase */ return {
|
|
37
35
|
encodedFunctionCalls,
|
|
38
|
-
hashedArguments
|
|
36
|
+
hashedArguments
|
|
39
37
|
};
|
|
40
38
|
}
|
|
41
|
-
/* eslint-disable camelcase */
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
*/
|
|
46
|
-
get function_calls() {
|
|
39
|
+
/* eslint-disable camelcase */ /**
|
|
40
|
+
* The function calls to execute. This uses snake_case naming so that it is compatible with Noir encoding
|
|
41
|
+
* @internal
|
|
42
|
+
*/ get function_calls() {
|
|
47
43
|
return this.functionCalls;
|
|
48
44
|
}
|
|
49
|
-
/* eslint-enable camelcase */
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
*/
|
|
54
|
-
get nonce() {
|
|
45
|
+
/* eslint-enable camelcase */ /**
|
|
46
|
+
* The nonce
|
|
47
|
+
* @internal
|
|
48
|
+
*/ get nonce() {
|
|
55
49
|
return this._nonce;
|
|
56
50
|
}
|
|
57
51
|
/**
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
get hashedArguments() {
|
|
52
|
+
* The hashed arguments for the function calls
|
|
53
|
+
*/ get hashedArguments() {
|
|
61
54
|
return this._hashedArguments;
|
|
62
55
|
}
|
|
63
56
|
/**
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
hash() {
|
|
57
|
+
* Hashes the payload
|
|
58
|
+
* @returns The hash of the payload
|
|
59
|
+
*/ hash() {
|
|
68
60
|
return poseidon2HashWithSeparator(this.toFields(), this.generatorIndex);
|
|
69
61
|
}
|
|
70
|
-
/** Serializes the function calls to an array of fields. */
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
]);
|
|
62
|
+
/** Serializes the function calls to an array of fields. */ functionCallsToFields() {
|
|
63
|
+
return this.functionCalls.flatMap((call)=>[
|
|
64
|
+
call.args_hash,
|
|
65
|
+
call.function_selector,
|
|
66
|
+
call.target_address,
|
|
67
|
+
new Fr(call.is_public),
|
|
68
|
+
new Fr(call.is_static)
|
|
69
|
+
]);
|
|
79
70
|
}
|
|
80
71
|
/**
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
static async fromFunctionCalls(functionCalls) {
|
|
72
|
+
* Creates an execution payload for a dapp from a set of function calls
|
|
73
|
+
* @param functionCalls - The function calls to execute
|
|
74
|
+
* @returns The execution payload
|
|
75
|
+
*/ static async fromFunctionCalls(functionCalls) {
|
|
86
76
|
const { encodedFunctionCalls, hashedArguments } = await this.create(functionCalls);
|
|
87
77
|
return new AppEntrypointPayload(encodedFunctionCalls, hashedArguments, 0, Fr.random());
|
|
88
78
|
}
|
|
89
79
|
/**
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
static async fromAppExecution(functionCalls, nonce = Fr.random()) {
|
|
80
|
+
* Creates an execution payload for the app-portion of a transaction from a set of function calls
|
|
81
|
+
* @param functionCalls - The function calls to execute
|
|
82
|
+
* @param nonce - The nonce for the payload, used to emit a nullifier identifying the call
|
|
83
|
+
* @returns The execution payload
|
|
84
|
+
*/ static async fromAppExecution(functionCalls, nonce = Fr.random()) {
|
|
96
85
|
if (functionCalls.length > APP_MAX_CALLS) {
|
|
97
86
|
throw new Error(`Expected at most ${APP_MAX_CALLS} function calls, got ${functionCalls.length}`);
|
|
98
87
|
}
|
|
@@ -101,13 +90,12 @@ export class EntrypointPayload {
|
|
|
101
90
|
return new AppEntrypointPayload(encodedFunctionCalls, hashedArguments, GeneratorIndex.SIGNATURE_PAYLOAD, nonce);
|
|
102
91
|
}
|
|
103
92
|
/**
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
const calls = (await feeOpts?.paymentMethod.getFunctionCalls(feeOpts?.gasSettings)) ?? [];
|
|
93
|
+
* Creates an execution payload to pay the fee for a transaction
|
|
94
|
+
* @param sender - The address sending this payload
|
|
95
|
+
* @param feeOpts - The fee payment options
|
|
96
|
+
* @returns The execution payload
|
|
97
|
+
*/ static async fromFeeOptions(sender, feeOpts) {
|
|
98
|
+
const calls = await feeOpts?.paymentMethod.getFunctionCalls(feeOpts?.gasSettings) ?? [];
|
|
111
99
|
const feePayer = await feeOpts?.paymentMethod.getFeePayer(feeOpts?.gasSettings);
|
|
112
100
|
const isFeePayer = !!feePayer && feePayer.equals(sender);
|
|
113
101
|
const paddedCalls = padArrayEnd(calls, FunctionCall.empty(), FEE_MAX_CALLS);
|
|
@@ -115,36 +103,39 @@ export class EntrypointPayload {
|
|
|
115
103
|
return new FeeEntrypointPayload(encodedFunctionCalls, hashedArguments, GeneratorIndex.FEE_PAYLOAD, Fr.random(), isFeePayer);
|
|
116
104
|
}
|
|
117
105
|
}
|
|
118
|
-
/** Entrypoint payload for app phase execution. */
|
|
119
|
-
class AppEntrypointPayload extends EntrypointPayload {
|
|
106
|
+
/** Entrypoint payload for app phase execution. */ class AppEntrypointPayload extends EntrypointPayload {
|
|
120
107
|
toFields() {
|
|
121
|
-
return [
|
|
108
|
+
return [
|
|
109
|
+
...this.functionCallsToFields(),
|
|
110
|
+
this.nonce
|
|
111
|
+
];
|
|
122
112
|
}
|
|
123
113
|
}
|
|
124
|
-
/** Entrypoint payload for fee payment to be run during setup phase. */
|
|
125
|
-
|
|
126
|
-
constructor(functionCalls, hashedArguments, generatorIndex, nonce, isFeePayer)
|
|
114
|
+
/** Entrypoint payload for fee payment to be run during setup phase. */ class FeeEntrypointPayload extends EntrypointPayload {
|
|
115
|
+
#isFeePayer;
|
|
116
|
+
constructor(functionCalls, hashedArguments, generatorIndex, nonce, isFeePayer){
|
|
127
117
|
super(functionCalls, hashedArguments, generatorIndex, nonce);
|
|
128
|
-
|
|
129
|
-
__classPrivateFieldSet(this, _FeeEntrypointPayload_isFeePayer, isFeePayer, "f");
|
|
118
|
+
this.#isFeePayer = isFeePayer;
|
|
130
119
|
}
|
|
131
120
|
toFields() {
|
|
132
|
-
return [
|
|
121
|
+
return [
|
|
122
|
+
...this.functionCallsToFields(),
|
|
123
|
+
this.nonce,
|
|
124
|
+
new Fr(this.#isFeePayer)
|
|
125
|
+
];
|
|
133
126
|
}
|
|
134
|
-
/* eslint-disable camelcase */
|
|
135
|
-
|
|
136
|
-
get is_fee_payer() {
|
|
137
|
-
return __classPrivateFieldGet(this, _FeeEntrypointPayload_isFeePayer, "f");
|
|
127
|
+
/* eslint-disable camelcase */ /** Whether the sender should be appointed as fee payer. */ get is_fee_payer() {
|
|
128
|
+
return this.#isFeePayer;
|
|
138
129
|
}
|
|
139
130
|
}
|
|
140
|
-
_FeeEntrypointPayload_isFeePayer = new WeakMap();
|
|
141
131
|
/**
|
|
142
132
|
* Computes a hash of a combined payload.
|
|
143
133
|
* @param appPayload - An app payload.
|
|
144
134
|
* @param feePayload - A fee payload.
|
|
145
135
|
* @returns A hash of a combined payload.
|
|
146
|
-
*/
|
|
147
|
-
|
|
148
|
-
|
|
136
|
+
*/ export async function computeCombinedPayloadHash(appPayload, feePayload) {
|
|
137
|
+
return poseidon2HashWithSeparator([
|
|
138
|
+
await appPayload.hash(),
|
|
139
|
+
await feePayload.hash()
|
|
140
|
+
], GeneratorIndex.COMBINED_PAYLOAD);
|
|
149
141
|
}
|
|
150
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF5bG9hZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbnRyeXBvaW50L3BheWxvYWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xFLE9BQU8sRUFBcUIsRUFBRSxFQUFvQixjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM3RixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNELE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBOEJ0RSwwQ0FBMEM7QUFDMUMsdURBQXVEO0FBQ3ZELE1BQU0sYUFBYSxHQUFHLENBQUMsQ0FBQztBQUN4QiwyREFBMkQ7QUFDM0QsTUFBTSxhQUFhLEdBQUcsQ0FBQyxDQUFDO0FBZ0J4Qiw2QkFBNkI7QUFFN0Isc0NBQXNDO0FBQ3RDLE1BQU0sT0FBZ0IsaUJBQWlCO0lBQ3JDLFlBQ1UsYUFBb0MsRUFDcEMsZ0JBQWdDLEVBQ2hDLGNBQXNCLEVBQ3RCLE1BQVU7UUFIVixrQkFBYSxHQUFiLGFBQWEsQ0FBdUI7UUFDcEMscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFnQjtRQUNoQyxtQkFBYyxHQUFkLGNBQWMsQ0FBUTtRQUN0QixXQUFNLEdBQU4sTUFBTSxDQUFJO0lBQ2pCLENBQUM7SUFFTSxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxhQUE2QjtRQUN6RCxNQUFNLGVBQWUsR0FBbUIsRUFBRSxDQUFDO1FBQzNDLEtBQUssTUFBTSxJQUFJLElBQUksYUFBYSxFQUFFLENBQUM7WUFDakMsZUFBZSxDQUFDLElBQUksQ0FBQyxNQUFNLFlBQVksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDakUsQ0FBQztRQUVELDhCQUE4QjtRQUM5QixNQUFNLG9CQUFvQixHQUFHLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQy9ELFNBQVMsRUFBRSxlQUFlLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSTtZQUN0QyxpQkFBaUIsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRTtZQUMxQyxjQUFjLEVBQUUsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUU7WUFDakMsU0FBUyxFQUFFLElBQUksQ0FBQyxJQUFJLElBQUksWUFBWSxDQUFDLE1BQU07WUFDM0MsU0FBUyxFQUFFLElBQUksQ0FBQyxRQUFRO1NBQ3pCLENBQUMsQ0FBQyxDQUFDO1FBQ0osNkJBQTZCO1FBRTdCLE9BQU87WUFDTCxvQkFBb0I7WUFDcEIsZUFBZTtTQUNoQixDQUFDO0lBQ0osQ0FBQztJQUVELDhCQUE4QjtJQUM5Qjs7O09BR0c7SUFDSCxJQUFJLGNBQWM7UUFDaEIsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDO0lBQzVCLENBQUM7SUFDRCw2QkFBNkI7SUFFN0I7OztPQUdHO0lBQ0gsSUFBSSxLQUFLO1FBQ1AsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3JCLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksZUFBZTtRQUNqQixPQUFPLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQztJQUMvQixDQUFDO0lBUUQ7OztPQUdHO0lBQ0gsSUFBSTtRQUNGLE9BQU8sMEJBQTBCLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUMxRSxDQUFDO0lBRUQsMkRBQTJEO0lBQ2pELHFCQUFxQjtRQUM3QixPQUFPLElBQUksQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDeEMsSUFBSSxDQUFDLFNBQVM7WUFDZCxJQUFJLENBQUMsaUJBQWlCO1lBQ3RCLElBQUksQ0FBQyxjQUFjO1lBQ25CLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7WUFDdEIsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztTQUN2QixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxLQUFLLENBQUMsaUJBQWlCLENBQUMsYUFBNkI7UUFDMUQsTUFBTSxFQUFFLG9CQUFvQixFQUFFLGVBQWUsRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNuRixPQUFPLElBQUksb0JBQW9CLENBQUMsb0JBQW9CLEVBQUUsZUFBZSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUN6RixDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLGFBQXNELEVBQUUsS0FBSyxHQUFHLEVBQUUsQ0FBQyxNQUFNLEVBQUU7UUFDdkcsSUFBSSxhQUFhLENBQUMsTUFBTSxHQUFHLGFBQWEsRUFBRSxDQUFDO1lBQ3pDLE1BQU0sSUFBSSxLQUFLLENBQUMsb0JBQW9CLGFBQWEsd0JBQXdCLGFBQWEsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQ25HLENBQUM7UUFDRCxNQUFNLFdBQVcsR0FBRyxXQUFXLENBQUMsYUFBYSxFQUFFLFlBQVksQ0FBQyxLQUFLLEVBQUUsRUFBRSxhQUFhLENBQUMsQ0FBQztRQUNwRixNQUFNLEVBQUUsb0JBQW9CLEVBQUUsZUFBZSxFQUFFLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ2pGLE9BQU8sSUFBSSxvQkFBb0IsQ0FBQyxvQkFBb0IsRUFBRSxlQUFlLEVBQUUsY0FBYyxDQUFDLGlCQUFpQixFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQ2xILENBQUM7SUFFRDs7Ozs7T0FLRztJQUNILE1BQU0sQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLE1BQW9CLEVBQUUsT0FBb0I7UUFDcEUsTUFBTSxLQUFLLEdBQUcsQ0FBQyxNQUFNLE9BQU8sRUFBRSxhQUFhLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxFQUFFLFdBQVcsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQzFGLE1BQU0sUUFBUSxHQUFHLE1BQU0sT0FBTyxFQUFFLGFBQWEsQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBQ2hGLE1BQU0sVUFBVSxHQUFHLENBQUMsQ0FBQyxRQUFRLElBQUksUUFBUSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN6RCxNQUFNLFdBQVcsR0FBRyxXQUFXLENBQUMsS0FBSyxFQUFFLFlBQVksQ0FBQyxLQUFLLEVBQUUsRUFBRSxhQUFhLENBQUMsQ0FBQztRQUM1RSxNQUFNLEVBQUUsb0JBQW9CLEVBQUUsZUFBZSxFQUFFLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ2pGLE9BQU8sSUFBSSxvQkFBb0IsQ0FDN0Isb0JBQW9CLEVBQ3BCLGVBQWUsRUFDZixjQUFjLENBQUMsV0FBVyxFQUMxQixFQUFFLENBQUMsTUFBTSxFQUFFLEVBQ1gsVUFBVSxDQUNYLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUFFRCxrREFBa0Q7QUFDbEQsTUFBTSxvQkFBcUIsU0FBUSxpQkFBaUI7SUFDekMsUUFBUTtRQUNmLE9BQU8sQ0FBQyxHQUFHLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUN2RCxDQUFDO0NBQ0Y7QUFFRCx1RUFBdUU7QUFDdkUsTUFBTSxvQkFBcUIsU0FBUSxpQkFBaUI7SUFHbEQsWUFDRSxhQUFvQyxFQUNwQyxlQUErQixFQUMvQixjQUFzQixFQUN0QixLQUFTLEVBQ1QsVUFBbUI7UUFFbkIsS0FBSyxDQUFDLGFBQWEsRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBVC9ELG1EQUFxQjtRQVVuQix1QkFBQSxJQUFJLG9DQUFlLFVBQVUsTUFBQSxDQUFDO0lBQ2hDLENBQUM7SUFFUSxRQUFRO1FBQ2YsT0FBTyxDQUFDLEdBQUcsSUFBSSxDQUFDLHFCQUFxQixFQUFFLEVBQUUsSUFBSSxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyx1QkFBQSxJQUFJLHdDQUFZLENBQUMsQ0FBQyxDQUFDO0lBQ2pGLENBQUM7SUFFRCw4QkFBOEI7SUFDOUIsMkRBQTJEO0lBQzNELElBQUksWUFBWTtRQUNkLE9BQU8sdUJBQUEsSUFBSSx3Q0FBWSxDQUFDO0lBQzFCLENBQUM7Q0FFRjs7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsMEJBQTBCLENBQzlDLFVBQWdDLEVBQ2hDLFVBQWdDO0lBRWhDLE9BQU8sMEJBQTBCLENBQy9CLENBQUMsTUFBTSxVQUFVLENBQUMsSUFBSSxFQUFFLEVBQUUsTUFBTSxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUMsRUFDbEQsY0FBYyxDQUFDLGdCQUFnQixDQUNoQyxDQUFDO0FBQ0osQ0FBQyJ9
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
2
2
|
/**
|
|
3
3
|
* Pay fee directly in the Fee Juice.
|
|
4
|
-
*/
|
|
5
|
-
|
|
6
|
-
constructor(sender)
|
|
4
|
+
*/ export class FeeJuicePaymentMethod {
|
|
5
|
+
sender;
|
|
6
|
+
constructor(sender){
|
|
7
7
|
this.sender = sender;
|
|
8
8
|
}
|
|
9
9
|
getAsset() {
|
|
@@ -16,4 +16,3 @@ export class FeeJuicePaymentMethod {
|
|
|
16
16
|
return Promise.resolve(this.sender);
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2p1aWNlX3BheW1lbnRfbWV0aG9kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZlZS9mZWVfanVpY2VfcGF5bWVudF9tZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFJcEU7O0dBRUc7QUFDSCxNQUFNLE9BQU8scUJBQXFCO0lBQ2hDLFlBQXNCLE1BQW9CO1FBQXBCLFdBQU0sR0FBTixNQUFNLENBQWM7SUFBRyxDQUFDO0lBRTlDLFFBQVE7UUFDTixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsdUJBQXVCLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDM0QsQ0FBQztJQUVELGdCQUFnQjtRQUNkLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUM3QixDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDdEMsQ0FBQztDQUNGIn0=
|
|
@@ -5,19 +5,17 @@ import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
|
|
|
5
5
|
import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
|
|
6
6
|
/**
|
|
7
7
|
* Pay fee directly with Fee Juice claimed on the same tx.
|
|
8
|
-
*/
|
|
9
|
-
|
|
10
|
-
constructor(sender, claim)
|
|
11
|
-
super(sender);
|
|
12
|
-
this.claim = claim;
|
|
8
|
+
*/ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
|
|
9
|
+
claim;
|
|
10
|
+
constructor(sender, claim){
|
|
11
|
+
super(sender), this.claim = claim;
|
|
13
12
|
}
|
|
14
13
|
/**
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
async getFunctionCalls() {
|
|
14
|
+
* Creates a function call to pay the fee in Fee Juice.
|
|
15
|
+
* @returns A function call
|
|
16
|
+
*/ async getFunctionCalls() {
|
|
19
17
|
const canonicalFeeJuice = await getCanonicalFeeJuice();
|
|
20
|
-
const selector = await FunctionSelector.fromNameAndParameters(canonicalFeeJuice.artifact.functions.find(f
|
|
18
|
+
const selector = await FunctionSelector.fromNameAndParameters(canonicalFeeJuice.artifact.functions.find((f)=>f.name === 'claim'));
|
|
21
19
|
return Promise.resolve([
|
|
22
20
|
{
|
|
23
21
|
to: ProtocolContractAddress.FeeJuice,
|
|
@@ -28,12 +26,11 @@ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
|
|
|
28
26
|
this.sender.toField(),
|
|
29
27
|
...new U128(this.claim.claimAmount).toFields(),
|
|
30
28
|
this.claim.claimSecret,
|
|
31
|
-
new Fr(this.claim.messageLeafIndex)
|
|
29
|
+
new Fr(this.claim.messageLeafIndex)
|
|
32
30
|
],
|
|
33
31
|
returnTypes: [],
|
|
34
|
-
type: FunctionType.PRIVATE
|
|
35
|
-
}
|
|
32
|
+
type: FunctionType.PRIVATE
|
|
33
|
+
}
|
|
36
34
|
]);
|
|
37
35
|
}
|
|
38
36
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2p1aWNlX3BheW1lbnRfbWV0aG9kX3dpdGhfY2xhaW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmVlL2ZlZV9qdWljZV9wYXltZW50X21ldGhvZF93aXRoX2NsYWltLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBcUIsRUFBRSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDN0UsT0FBTyxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUczRSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUV0RTs7R0FFRztBQUNILE1BQU0sT0FBTyw4QkFBK0IsU0FBUSxxQkFBcUI7SUFDdkUsWUFDRSxNQUFvQixFQUNaLEtBQThFO1FBRXRGLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUZOLFVBQUssR0FBTCxLQUFLLENBQXlFO0lBR3hGLENBQUM7SUFFRDs7O09BR0c7SUFDTSxLQUFLLENBQUMsZ0JBQWdCO1FBQzdCLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxvQkFBb0IsRUFBRSxDQUFDO1FBQ3ZELE1BQU0sUUFBUSxHQUFHLE1BQU0sZ0JBQWdCLENBQUMscUJBQXFCLENBQzNELGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxPQUFPLENBQUUsQ0FDcEUsQ0FBQztRQUVGLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQztZQUNyQjtnQkFDRSxFQUFFLEVBQUUsdUJBQXVCLENBQUMsUUFBUTtnQkFDcEMsSUFBSSxFQUFFLE9BQU87Z0JBQ2IsUUFBUTtnQkFDUixRQUFRLEVBQUUsS0FBSztnQkFDZixJQUFJLEVBQUU7b0JBQ0osSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7b0JBQ3JCLEdBQUcsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQyxRQUFRLEVBQUU7b0JBQzlDLElBQUksQ0FBQyxLQUFLLENBQUMsV0FBVztvQkFDdEIsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQztpQkFDcEM7Z0JBQ0QsV0FBVyxFQUFFLEVBQUU7Z0JBQ2YsSUFBSSxFQUFFLFlBQVksQ0FBQyxPQUFPO2FBQzNCO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIn0=
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Holds information about how the fee for a transaction is to be paid.
|
|
3
|
+
*/ export { };
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { AztecAddress } from '@aztec/circuits.js';
|
|
2
2
|
/**
|
|
3
3
|
* Does not pay fees. Will work until we enforce fee payment for all txs.
|
|
4
|
-
*/
|
|
5
|
-
|
|
6
|
-
constructor() { }
|
|
4
|
+
*/ export class NoFeePaymentMethod {
|
|
5
|
+
constructor(){}
|
|
7
6
|
getAsset() {
|
|
8
7
|
return Promise.resolve(AztecAddress.ZERO);
|
|
9
8
|
}
|
|
@@ -14,4 +13,3 @@ export class NoFeePaymentMethod {
|
|
|
14
13
|
return Promise.resolve(AztecAddress.ZERO);
|
|
15
14
|
}
|
|
16
15
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9fZmVlX3BheW1lbnRfbWV0aG9kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZlZS9ub19mZWVfcGF5bWVudF9tZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSWxEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQUM3QixnQkFBZSxDQUFDO0lBRWhCLFFBQVE7UUFDTixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzVDLENBQUM7SUFFRCxnQkFBZ0I7UUFDZCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUVELFdBQVc7UUFDVCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzVDLENBQUM7Q0FDRiJ9
|
|
@@ -4,32 +4,28 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
|
|
|
4
4
|
import { SignerlessWallet } from '../wallet/signerless_wallet.js';
|
|
5
5
|
/**
|
|
6
6
|
* Holds information about how the fee for a transaction is to be paid.
|
|
7
|
-
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
*/ export class PrivateFeePaymentMethod {
|
|
8
|
+
paymentContract;
|
|
9
|
+
wallet;
|
|
10
|
+
setMaxFeeToOne;
|
|
11
|
+
assetPromise;
|
|
12
|
+
constructor(/**
|
|
11
13
|
* Address which will hold the fee payment.
|
|
12
|
-
*/
|
|
13
|
-
paymentContract,
|
|
14
|
-
/**
|
|
14
|
+
*/ paymentContract, /**
|
|
15
15
|
* An auth witness provider to authorize fee payments
|
|
16
|
-
*/
|
|
17
|
-
wallet,
|
|
18
|
-
/**
|
|
16
|
+
*/ wallet, /**
|
|
19
17
|
* If true, the max fee will be set to 1.
|
|
20
18
|
* TODO(#7694): Remove this param once the lacking feature in TXE is implemented.
|
|
21
|
-
*/
|
|
22
|
-
setMaxFeeToOne = false) {
|
|
19
|
+
*/ setMaxFeeToOne = false){
|
|
23
20
|
this.paymentContract = paymentContract;
|
|
24
21
|
this.wallet = wallet;
|
|
25
22
|
this.setMaxFeeToOne = setMaxFeeToOne;
|
|
26
23
|
this.assetPromise = null;
|
|
27
24
|
}
|
|
28
25
|
/**
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
getAsset() {
|
|
26
|
+
* The asset used to pay the fee.
|
|
27
|
+
* @returns The asset used to pay the fee.
|
|
28
|
+
*/ getAsset() {
|
|
33
29
|
if (!this.assetPromise) {
|
|
34
30
|
// We use signer-less wallet because this function could be triggered before the associated account is deployed.
|
|
35
31
|
const signerlessWallet = new SignerlessWallet(this.wallet);
|
|
@@ -47,14 +43,14 @@ export class PrivateFeePaymentMethod {
|
|
|
47
43
|
{
|
|
48
44
|
name: 'inner',
|
|
49
45
|
type: {
|
|
50
|
-
kind: 'field'
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
]
|
|
54
|
-
}
|
|
46
|
+
kind: 'field'
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
]
|
|
50
|
+
}
|
|
55
51
|
],
|
|
56
52
|
errorTypes: {},
|
|
57
|
-
isInitializer: false
|
|
53
|
+
isInitializer: false
|
|
58
54
|
}, []);
|
|
59
55
|
this.assetPromise = interaction.simulate();
|
|
60
56
|
}
|
|
@@ -64,11 +60,10 @@ export class PrivateFeePaymentMethod {
|
|
|
64
60
|
return Promise.resolve(this.paymentContract);
|
|
65
61
|
}
|
|
66
62
|
/**
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
async getFunctionCalls(gasSettings) {
|
|
63
|
+
* Creates a function call to pay the fee in the given asset.
|
|
64
|
+
* @param gasSettings - The gas settings.
|
|
65
|
+
* @returns The function call to pay the fee.
|
|
66
|
+
*/ async getFunctionCalls(gasSettings) {
|
|
72
67
|
// We assume 1:1 exchange rate between fee juice and token. But in reality you would need to convert feeLimit
|
|
73
68
|
// (maxFee) to be in token denomination.
|
|
74
69
|
const maxFee = new U128(this.setMaxFeeToOne ? 1n : gasSettings.getFeeLimit().toBigInt());
|
|
@@ -77,13 +72,18 @@ export class PrivateFeePaymentMethod {
|
|
|
77
72
|
caller: this.paymentContract,
|
|
78
73
|
action: {
|
|
79
74
|
name: 'transfer_to_public',
|
|
80
|
-
args: [
|
|
75
|
+
args: [
|
|
76
|
+
this.wallet.getAddress().toField(),
|
|
77
|
+
this.paymentContract.toField(),
|
|
78
|
+
...maxFee.toFields(),
|
|
79
|
+
nonce
|
|
80
|
+
],
|
|
81
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(),
|
|
85
|
-
returnTypes: []
|
|
86
|
-
}
|
|
85
|
+
returnTypes: []
|
|
86
|
+
}
|
|
87
87
|
});
|
|
88
88
|
return [
|
|
89
89
|
{
|
|
@@ -92,10 +92,12 @@ export class PrivateFeePaymentMethod {
|
|
|
92
92
|
selector: await FunctionSelector.fromSignature('fee_entrypoint_private((Field,Field),Field)'),
|
|
93
93
|
type: FunctionType.PRIVATE,
|
|
94
94
|
isStatic: false,
|
|
95
|
-
args: [
|
|
96
|
-
|
|
97
|
-
|
|
95
|
+
args: [
|
|
96
|
+
...maxFee.toFields(),
|
|
97
|
+
nonce
|
|
98
|
+
],
|
|
99
|
+
returnTypes: []
|
|
100
|
+
}
|
|
98
101
|
];
|
|
99
102
|
}
|
|
100
103
|
}
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9mZWVfcGF5bWVudF9tZXRob2QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmVlL3ByaXZhdGVfZmVlX3BheW1lbnRfbWV0aG9kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFN0UsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRzlDLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQzNGLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBR2xFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHVCQUF1QjtJQUdsQztJQUNFOztPQUVHO0lBQ0ssZUFBNkI7SUFFckM7O09BRUc7SUFDSyxNQUFjO0lBRXRCOzs7T0FHRztJQUNLLGlCQUFpQixLQUFLO1FBWHRCLG9CQUFlLEdBQWYsZUFBZSxDQUFjO1FBSzdCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFNZCxtQkFBYyxHQUFkLGNBQWMsQ0FBUTtRQWpCeEIsaUJBQVksR0FBaUMsSUFBSSxDQUFDO0lBa0J2RCxDQUFDO0lBRUo7OztPQUdHO0lBQ0gsUUFBUTtRQUNOLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7WUFDdkIsZ0hBQWdIO1lBQ2hILE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7WUFFM0QsTUFBTSxXQUFXLEdBQUcsSUFBSSwyQkFBMkIsQ0FDakQsZ0JBQWdCLEVBQ2hCLElBQUksQ0FBQyxlQUFlLEVBQ3BCO2dCQUNFLElBQUksRUFBRSxvQkFBb0I7Z0JBQzFCLFlBQVksRUFBRSxZQUFZLENBQUMsT0FBTztnQkFDbEMsVUFBVSxFQUFFLEtBQUs7Z0JBQ2pCLFFBQVEsRUFBRSxLQUFLO2dCQUNmLFVBQVUsRUFBRSxFQUFFO2dCQUNkLFdBQVcsRUFBRTtvQkFDWDt3QkFDRSxJQUFJLEVBQUUsUUFBUTt3QkFDZCxJQUFJLEVBQUUsc0VBQXNFO3dCQUM1RSxNQUFNLEVBQUU7NEJBQ047Z0NBQ0UsSUFBSSxFQUFFLE9BQU87Z0NBQ2IsSUFBSSxFQUFFO29DQUNKLElBQUksRUFBRSxPQUFPO2lDQUNkOzZCQUNGO3lCQUNGO3FCQUNGO2lCQUNGO2dCQUNELFVBQVUsRUFBRSxFQUFFO2dCQUNkLGFBQWEsRUFBRSxLQUFLO2FBQ3JCLEVBQ0QsRUFBRSxDQUNILENBQUM7WUFFRixJQUFJLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUM3QyxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUMsWUFBYSxDQUFDO0lBQzVCLENBQUM7SUFFRCxXQUFXO1FBQ1QsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUMvQyxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxXQUF3QjtRQUM3Qyw2R0FBNkc7UUFDN0csd0NBQXdDO1FBQ3hDLE1BQU0sTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLFdBQVcsRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDekYsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBRTFCLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUM7WUFDOUIsTUFBTSxFQUFFLElBQUksQ0FBQyxlQUFlO1lBQzVCLE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsb0JBQW9CO2dCQUMxQixJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsT0FBTyxFQUFFLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsS0FBSyxDQUFDO2dCQUN2RyxRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMseURBQXlELENBQUM7Z0JBQ3pHLElBQUksRUFBRSxZQUFZLENBQUMsT0FBTztnQkFDMUIsUUFBUSxFQUFFLEtBQUs7Z0JBQ2YsRUFBRSxFQUFFLE1BQU0sSUFBSSxDQUFDLFFBQVEsRUFBRTtnQkFDekIsV0FBVyxFQUFFLEVBQUU7YUFDaEI7U0FDRixDQUFDLENBQUM7UUFFSCxPQUFPO1lBQ0w7Z0JBQ0UsSUFBSSxFQUFFLHdCQUF3QjtnQkFDOUIsRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlO2dCQUN4QixRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMsNkNBQTZDLENBQUM7Z0JBQzdGLElBQUksRUFBRSxZQUFZLENBQUMsT0FBTztnQkFDMUIsUUFBUSxFQUFFLEtBQUs7Z0JBQ2YsSUFBSSxFQUFFLENBQUMsR0FBRyxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsS0FBSyxDQUFDO2dCQUNuQyxXQUFXLEVBQUUsRUFBRTthQUNoQjtTQUNGLENBQUM7SUFDSixDQUFDO0NBQ0YifQ==
|
|
@@ -4,26 +4,23 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
|
|
|
4
4
|
import { SignerlessWallet } from '../wallet/signerless_wallet.js';
|
|
5
5
|
/**
|
|
6
6
|
* Holds information about how the fee for a transaction is to be paid.
|
|
7
|
-
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
*/ export class PublicFeePaymentMethod {
|
|
8
|
+
paymentContract;
|
|
9
|
+
wallet;
|
|
10
|
+
assetPromise;
|
|
11
|
+
constructor(/**
|
|
11
12
|
* Address which will hold the fee payment.
|
|
12
|
-
*/
|
|
13
|
-
paymentContract,
|
|
14
|
-
/**
|
|
13
|
+
*/ paymentContract, /**
|
|
15
14
|
* An auth witness provider to authorize fee payments
|
|
16
|
-
*/
|
|
17
|
-
wallet) {
|
|
15
|
+
*/ wallet){
|
|
18
16
|
this.paymentContract = paymentContract;
|
|
19
17
|
this.wallet = wallet;
|
|
20
18
|
this.assetPromise = null;
|
|
21
19
|
}
|
|
22
20
|
/**
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
getAsset() {
|
|
21
|
+
* The asset used to pay the fee.
|
|
22
|
+
* @returns The asset used to pay the fee.
|
|
23
|
+
*/ getAsset() {
|
|
27
24
|
if (!this.assetPromise) {
|
|
28
25
|
// We use signer-less wallet because this function could be triggered before the associated account is deployed.
|
|
29
26
|
const signerlessWallet = new SignerlessWallet(this.wallet);
|
|
@@ -41,14 +38,14 @@ export class PublicFeePaymentMethod {
|
|
|
41
38
|
{
|
|
42
39
|
name: 'inner',
|
|
43
40
|
type: {
|
|
44
|
-
kind: 'field'
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
]
|
|
48
|
-
}
|
|
41
|
+
kind: 'field'
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
]
|
|
45
|
+
}
|
|
49
46
|
],
|
|
50
47
|
errorTypes: {},
|
|
51
|
-
isInitializer: false
|
|
48
|
+
isInitializer: false
|
|
52
49
|
}, []);
|
|
53
50
|
this.assetPromise = interaction.simulate();
|
|
54
51
|
}
|
|
@@ -58,24 +55,28 @@ export class PublicFeePaymentMethod {
|
|
|
58
55
|
return Promise.resolve(this.paymentContract);
|
|
59
56
|
}
|
|
60
57
|
/**
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
async getFunctionCalls(gasSettings) {
|
|
58
|
+
* Creates a function call to pay the fee in the given asset.
|
|
59
|
+
* @param gasSettings - The gas settings.
|
|
60
|
+
* @returns The function call to pay the fee.
|
|
61
|
+
*/ async getFunctionCalls(gasSettings) {
|
|
66
62
|
const nonce = Fr.random();
|
|
67
63
|
const maxFee = new U128(gasSettings.getFeeLimit().toBigInt());
|
|
68
64
|
const setPublicAuthWitInteraction = await this.wallet.setPublicAuthWit({
|
|
69
65
|
caller: this.paymentContract,
|
|
70
66
|
action: {
|
|
71
67
|
name: 'transfer_in_public',
|
|
72
|
-
args: [
|
|
68
|
+
args: [
|
|
69
|
+
this.wallet.getAddress().toField(),
|
|
70
|
+
this.paymentContract.toField(),
|
|
71
|
+
...maxFee.toFields(),
|
|
72
|
+
nonce
|
|
73
|
+
],
|
|
73
74
|
selector: await FunctionSelector.fromSignature('transfer_in_public((Field),(Field),(Field,Field),Field)'),
|
|
74
75
|
type: FunctionType.PUBLIC,
|
|
75
76
|
isStatic: false,
|
|
76
77
|
to: await this.getAsset(),
|
|
77
|
-
returnTypes: []
|
|
78
|
-
}
|
|
78
|
+
returnTypes: []
|
|
79
|
+
}
|
|
79
80
|
}, true);
|
|
80
81
|
return [
|
|
81
82
|
await setPublicAuthWitInteraction.request(),
|
|
@@ -85,10 +86,12 @@ export class PublicFeePaymentMethod {
|
|
|
85
86
|
selector: await FunctionSelector.fromSignature('fee_entrypoint_public((Field,Field),Field)'),
|
|
86
87
|
type: FunctionType.PRIVATE,
|
|
87
88
|
isStatic: false,
|
|
88
|
-
args: [
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
args: [
|
|
90
|
+
...maxFee.toFields(),
|
|
91
|
+
nonce
|
|
92
|
+
],
|
|
93
|
+
returnTypes: []
|
|
94
|
+
}
|
|
91
95
|
];
|
|
92
96
|
}
|
|
93
97
|
}
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2ZlZV9wYXltZW50X21ldGhvZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mZWUvcHVibGljX2ZlZV9wYXltZW50X21ldGhvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTdFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU5QyxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUUzRixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdsRTs7R0FFRztBQUNILE1BQU0sT0FBTyxzQkFBc0I7SUFHakM7SUFDRTs7T0FFRztJQUNPLGVBQTZCO0lBQ3ZDOztPQUVHO0lBQ08sTUFBcUI7UUFKckIsb0JBQWUsR0FBZixlQUFlLENBQWM7UUFJN0IsV0FBTSxHQUFOLE1BQU0sQ0FBZTtRQVZ6QixpQkFBWSxHQUFpQyxJQUFJLENBQUM7SUFXdkQsQ0FBQztJQUVKOzs7T0FHRztJQUNILFFBQVE7UUFDTixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1lBQ3ZCLGdIQUFnSDtZQUNoSCxNQUFNLGdCQUFnQixHQUFHLElBQUksZ0JBQWdCLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBRTNELE1BQU0sV0FBVyxHQUFHLElBQUksMkJBQTJCLENBQ2pELGdCQUFnQixFQUNoQixJQUFJLENBQUMsZUFBZSxFQUNwQjtnQkFDRSxJQUFJLEVBQUUsb0JBQW9CO2dCQUMxQixZQUFZLEVBQUUsWUFBWSxDQUFDLE9BQU87Z0JBQ2xDLFVBQVUsRUFBRSxLQUFLO2dCQUNqQixRQUFRLEVBQUUsS0FBSztnQkFDZixVQUFVLEVBQUUsRUFBRTtnQkFDZCxXQUFXLEVBQUU7b0JBQ1g7d0JBQ0UsSUFBSSxFQUFFLFFBQVE7d0JBQ2QsSUFBSSxFQUFFLHNFQUFzRTt3QkFDNUUsTUFBTSxFQUFFOzRCQUNOO2dDQUNFLElBQUksRUFBRSxPQUFPO2dDQUNiLElBQUksRUFBRTtvQ0FDSixJQUFJLEVBQUUsT0FBTztpQ0FDZDs2QkFDRjt5QkFDRjtxQkFDRjtpQkFDRjtnQkFDRCxVQUFVLEVBQUUsRUFBRTtnQkFDZCxhQUFhLEVBQUUsS0FBSzthQUNyQixFQUNELEVBQUUsQ0FDSCxDQUFDO1lBRUYsSUFBSSxDQUFDLFlBQVksR0FBRyxXQUFXLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDN0MsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDLFlBQWEsQ0FBQztJQUM1QixDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsZ0JBQWdCLENBQUMsV0FBd0I7UUFDN0MsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQzFCLE1BQU0sTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBRTlELE1BQU0sMkJBQTJCLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUNwRTtZQUNFLE1BQU0sRUFBRSxJQUFJLENBQUMsZUFBZTtZQUM1QixNQUFNLEVBQUU7Z0JBQ04sSUFBSSxFQUFFLG9CQUFvQjtnQkFDMUIsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxJQUFJLENBQUMsZUFBZSxDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFLEtBQUssQ0FBQztnQkFDdkcsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUMsYUFBYSxDQUFDLHlEQUF5RCxDQUFDO2dCQUN6RyxJQUFJLEVBQUUsWUFBWSxDQUFDLE1BQU07Z0JBQ3pCLFFBQVEsRUFBRSxLQUFLO2dCQUNmLEVBQUUsRUFBRSxNQUFNLElBQUksQ0FBQyxRQUFRLEVBQUU7Z0JBQ3pCLFdBQVcsRUFBRSxFQUFFO2FBQ2hCO1NBQ0YsRUFDRCxJQUFJLENBQ0wsQ0FBQztRQUVGLE9BQU87WUFDTCxNQUFNLDJCQUEyQixDQUFDLE9BQU8sRUFBRTtZQUMzQztnQkFDRSxJQUFJLEVBQUUsdUJBQXVCO2dCQUM3QixFQUFFLEVBQUUsSUFBSSxDQUFDLGVBQWU7Z0JBQ3hCLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyw0Q0FBNEMsQ0FBQztnQkFDNUYsSUFBSSxFQUFFLFlBQVksQ0FBQyxPQUFPO2dCQUMxQixRQUFRLEVBQUUsS0FBSztnQkFDZixJQUFJLEVBQUUsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxLQUFLLENBQUM7Z0JBQ25DLFdBQVcsRUFBRSxFQUFFO2FBQ2hCO1NBQ0YsQ0FBQztJQUNKLENBQUM7Q0FDRiJ9
|
package/dest/index.js
CHANGED
|
@@ -18,20 +18,18 @@
|
|
|
18
18
|
* ```
|
|
19
19
|
*
|
|
20
20
|
* TODO: Ultimately reimplement this mega exporter by mega exporting a granular api (then deprecate it).
|
|
21
|
-
*/
|
|
22
|
-
export { ContractDeployer } from './deployment/index.js';
|
|
23
|
-
export { AnvilTestWatcher, CheatCodes, L1FeeJuicePortalManager, L1ToL2TokenPortalManager, L1TokenManager, L1TokenPortalManager, computeAuthWitMessageHash, computeInnerAuthWitHash, computeInnerAuthWitHashFromAction, generateClaimSecret, generatePublicKey, readFieldCompressedString, waitForPXE, waitForNode, } from './utils/index.js';
|
|
21
|
+
*/ export { ContractDeployer } from './deployment/index.js';
|
|
24
22
|
export { NoteSelector } from '@aztec/foundation/abi';
|
|
25
23
|
export { createCompatibleClient, createPXEClient } from './rpc_clients/index.js';
|
|
26
24
|
export { AccountManager } from './account_manager/index.js';
|
|
27
25
|
export { AccountWallet, AccountWalletWithSecretKey, SignerlessWallet } from './wallet/index.js';
|
|
28
26
|
// // TODO https://github.com/AztecProtocol/aztec-packages/issues/2632 --> FunctionSelector might not need to be exposed
|
|
29
27
|
// // here once the issue is resolved.
|
|
30
|
-
export { EthAddress, Fq, Fr, GlobalVariables, GrumpkinScalar, INITIAL_L2_BLOCK_NUM, Point, PublicKeys, getContractClassFromArtifact, getContractInstanceFromDeployParams
|
|
28
|
+
export { EthAddress, Fq, Fr, GlobalVariables, GrumpkinScalar, INITIAL_L2_BLOCK_NUM, Point, PublicKeys, getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
|
|
31
29
|
export { computeSecretHash } from '@aztec/circuits.js/hash';
|
|
32
|
-
export { computeAppNullifierSecretKey, deriveKeys, deriveMasterIncomingViewingSecretKey, deriveMasterNullifierSecretKey
|
|
30
|
+
export { computeAppNullifierSecretKey, deriveKeys, deriveMasterIncomingViewingSecretKey, deriveMasterNullifierSecretKey } from '@aztec/circuits.js/keys';
|
|
33
31
|
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, UnencryptedL2Log, UniqueNote,
|
|
32
|
+
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, getTimestampRangeForEpoch, merkleTreeIds, mockEpochProofQuote, mockTx } from '@aztec/circuit-types';
|
|
35
33
|
// TODO: These kinds of things have no place on our public api.
|
|
36
34
|
// External devs will almost certainly have their own methods of doing these things.
|
|
37
35
|
// If we want to use them in our own "aztec.js consuming code", import them from foundation as needed.
|
|
@@ -39,7 +37,6 @@ export { decodeFromAbi, encodeArguments } from '@aztec/foundation/abi';
|
|
|
39
37
|
export { toBigIntBE } from '@aztec/foundation/bigint-buffer';
|
|
40
38
|
export { sha256 } from '@aztec/foundation/crypto';
|
|
41
39
|
export { makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
42
|
-
export { createLogger } from '@aztec/foundation/log';
|
|
43
40
|
export { retry, retryUntil } from '@aztec/foundation/retry';
|
|
44
41
|
export { to2Fields, toBigInt } from '@aztec/foundation/serialize';
|
|
45
42
|
export { sleep } from '@aztec/foundation/sleep';
|
|
@@ -49,9 +46,11 @@ export { fileURLToPath } from '@aztec/foundation/url';
|
|
|
49
46
|
// Here you *can* do `export *` as the granular api defacto exports things explicitly.
|
|
50
47
|
// This entire index file will be deprecated at some point after we're satisfied.
|
|
51
48
|
export * from './api/abi.js';
|
|
49
|
+
export * from './api/cheat_codes.js';
|
|
52
50
|
export * from './api/fee.js';
|
|
53
51
|
export * from './api/addresses.js';
|
|
54
|
-
export * from './api/ethereum.js';
|
|
52
|
+
export * from './api/ethereum/index.js';
|
|
53
|
+
export * from './api/log.js';
|
|
55
54
|
// Granular export, even if not in the api folder
|
|
56
55
|
export * from './contract/index.js';
|
|
57
|
-
|
|
56
|
+
export * from './utils/index.js';
|
|
@@ -1,3 +1,2 @@
|
|
|
1
1
|
export * from './pxe_client.js';
|
|
2
2
|
export * from './node/index.js';
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcnBjX2NsaWVudHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGlCQUFpQixDQUFDIn0=
|