@aztec/aztec.js 0.76.4 → 0.77.0-testnet-ignition.21
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 +9 -5
- package/dest/account/contract.d.ts.map +1 -1
- package/dest/account/contract.js +15 -2
- package/dest/account/index.d.ts +2 -2
- package/dest/account/index.d.ts.map +1 -1
- package/dest/account/index.js +8 -1
- package/dest/account/interface.d.ts +5 -4
- package/dest/account/interface.d.ts.map +1 -1
- package/dest/account/interface.js +4 -3
- package/dest/account/wallet.d.ts +4 -3
- package/dest/account/wallet.d.ts.map +1 -1
- package/dest/account/wallet.js +3 -2
- package/dest/account_manager/deploy_account_method.d.ts +5 -5
- package/dest/account_manager/deploy_account_method.d.ts.map +1 -1
- package/dest/account_manager/deploy_account_method.js +22 -25
- package/dest/account_manager/deploy_account_sent_tx.d.ts +4 -3
- package/dest/account_manager/deploy_account_sent_tx.d.ts.map +1 -1
- package/dest/account_manager/deploy_account_sent_tx.js +16 -17
- package/dest/account_manager/index.d.ts +20 -11
- package/dest/account_manager/index.d.ts.map +1 -1
- package/dest/account_manager/index.js +89 -87
- package/dest/api/abi.d.ts +2 -3
- package/dest/api/abi.d.ts.map +1 -1
- package/dest/api/abi.js +1 -3
- package/dest/api/account.d.ts +1 -2
- package/dest/api/account.d.ts.map +1 -1
- package/dest/api/account.js +1 -2
- package/dest/api/addresses.d.ts +2 -2
- package/dest/api/addresses.d.ts.map +1 -1
- package/dest/api/addresses.js +2 -3
- package/dest/api/cheat_codes.d.ts +4 -4
- package/dest/api/cheat_codes.d.ts.map +1 -1
- package/dest/api/cheat_codes.js +10 -15
- 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.d.ts +10 -6
- package/dest/api/ethereum/anvil_test_watcher.d.ts.map +1 -1
- package/dest/api/ethereum/anvil_test_watcher.js +43 -18
- package/dest/api/ethereum/chain_monitor.d.ts +6 -2
- package/dest/api/ethereum/chain_monitor.d.ts.map +1 -1
- package/dest/api/ethereum/chain_monitor.js +24 -8
- package/dest/api/ethereum/cheat_codes.d.ts +14 -3
- package/dest/api/ethereum/cheat_codes.d.ts.map +1 -1
- package/dest/api/ethereum/cheat_codes.js +106 -53
- package/dest/api/ethereum/index.d.ts +1 -1
- package/dest/api/ethereum/index.d.ts.map +1 -1
- package/dest/api/ethereum/index.js +1 -2
- package/dest/api/ethereum/l1_contracts.d.ts +1 -1
- package/dest/api/ethereum/l1_contracts.d.ts.map +1 -1
- package/dest/api/ethereum/l1_contracts.js +4 -6
- package/dest/api/ethereum/portal_manager.d.ts +16 -12
- package/dest/api/ethereum/portal_manager.d.ts.map +1 -1
- package/dest/api/ethereum/portal_manager.js +134 -115
- package/dest/api/fee.d.ts +0 -1
- package/dest/api/fee.d.ts.map +1 -1
- package/dest/api/fee.js +0 -2
- package/dest/api/fields.js +0 -1
- package/dest/api/interfaces/pxe.d.ts +1 -1
- package/dest/api/interfaces/pxe.d.ts.map +1 -1
- package/dest/api/interfaces/pxe.js +1 -2
- package/dest/api/log.js +0 -1
- package/dest/api/log_id.d.ts +1 -1
- package/dest/api/log_id.d.ts.map +1 -1
- package/dest/api/log_id.js +1 -2
- package/dest/api/tx_hash.d.ts +1 -1
- package/dest/api/tx_hash.d.ts.map +1 -1
- package/dest/api/tx_hash.js +1 -2
- package/dest/api/wallet.d.ts +1 -1
- package/dest/api/wallet.d.ts.map +1 -1
- package/dest/api/wallet.js +1 -2
- package/dest/contract/base_contract_interaction.d.ts +21 -5
- package/dest/contract/base_contract_interaction.d.ts.map +1 -1
- package/dest/contract/base_contract_interaction.js +97 -55
- package/dest/contract/batch_call.d.ts +3 -2
- package/dest/contract/batch_call.d.ts.map +1 -1
- package/dest/contract/batch_call.js +64 -40
- package/dest/contract/checker.d.ts +1 -1
- package/dest/contract/checker.d.ts.map +1 -1
- package/dest/contract/checker.js +29 -20
- package/dest/contract/contract.d.ts +4 -4
- package/dest/contract/contract.d.ts.map +1 -1
- package/dest/contract/contract.js +30 -28
- package/dest/contract/contract_base.d.ts +5 -5
- package/dest/contract/contract_base.d.ts.map +1 -1
- package/dest/contract/contract_base.js +22 -31
- package/dest/contract/contract_function_interaction.d.ts +9 -8
- package/dest/contract/contract_function_interaction.d.ts.map +1 -1
- package/dest/contract/contract_function_interaction.js +63 -51
- package/dest/contract/deploy_method.d.ts +14 -11
- package/dest/contract/deploy_method.d.ts.map +1 -1
- package/dest/contract/deploy_method.js +115 -87
- package/dest/contract/deploy_proven_tx.d.ts +6 -4
- package/dest/contract/deploy_proven_tx.d.ts.map +1 -1
- package/dest/contract/deploy_proven_tx.js +8 -11
- package/dest/contract/deploy_sent_tx.d.ts +8 -6
- package/dest/contract/deploy_sent_tx.d.ts.map +1 -1
- package/dest/contract/deploy_sent_tx.js +19 -22
- package/dest/contract/get_gas_limits.d.ts +2 -2
- package/dest/contract/get_gas_limits.d.ts.map +1 -1
- package/dest/contract/get_gas_limits.js +2 -4
- package/dest/contract/index.js +2 -4
- package/dest/{deployment → contract}/protocol_contracts.d.ts +4 -2
- package/dest/contract/protocol_contracts.d.ts.map +1 -0
- package/dest/contract/protocol_contracts.js +26 -0
- package/dest/contract/proven_tx.d.ts +3 -2
- package/dest/contract/proven_tx.d.ts.map +1 -1
- package/dest/contract/proven_tx.js +8 -11
- package/dest/contract/sent_tx.d.ts +3 -2
- package/dest/contract/sent_tx.d.ts.map +1 -1
- package/dest/contract/sent_tx.js +33 -35
- package/dest/contract/unsafe_contract.d.ts +3 -3
- package/dest/contract/unsafe_contract.d.ts.map +1 -1
- package/dest/contract/unsafe_contract.js +2 -10
- package/dest/deployment/broadcast_function.d.ts +3 -3
- package/dest/deployment/broadcast_function.d.ts.map +1 -1
- package/dest/deployment/broadcast_function.js +39 -32
- package/dest/deployment/contract_deployer.d.ts +3 -3
- package/dest/deployment/contract_deployer.d.ts.map +1 -1
- package/dest/deployment/contract_deployer.js +16 -15
- package/dest/deployment/deploy_instance.d.ts +3 -3
- package/dest/deployment/deploy_instance.d.ts.map +1 -1
- package/dest/deployment/deploy_instance.js +3 -5
- package/dest/deployment/index.js +0 -1
- package/dest/deployment/register_class.d.ts +3 -3
- package/dest/deployment/register_class.d.ts.map +1 -1
- package/dest/deployment/register_class.js +19 -14
- package/dest/entrypoint/default_entrypoint.d.ts +2 -2
- package/dest/entrypoint/default_entrypoint.d.ts.map +1 -1
- package/dest/entrypoint/default_entrypoint.js +11 -9
- package/dest/entrypoint/default_multi_call_entrypoint.d.ts +2 -2
- package/dest/entrypoint/default_multi_call_entrypoint.d.ts.map +1 -1
- package/dest/entrypoint/default_multi_call_entrypoint.js +68 -25
- package/dest/entrypoint/entrypoint.d.ts +7 -3
- package/dest/entrypoint/entrypoint.d.ts.map +1 -1
- package/dest/entrypoint/entrypoint.js +0 -1
- package/dest/entrypoint/payload.d.ts +8 -5
- package/dest/entrypoint/payload.d.ts.map +1 -1
- package/dest/entrypoint/payload.js +78 -85
- package/dest/fee/fee_juice_payment_method.d.ts +3 -3
- package/dest/fee/fee_juice_payment_method.d.ts.map +1 -1
- package/dest/fee/fee_juice_payment_method.js +5 -4
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts +5 -4
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts.map +1 -1
- package/dest/fee/fee_juice_payment_method_with_claim.js +18 -20
- package/dest/fee/fee_payment_method.d.ts +3 -3
- package/dest/fee/fee_payment_method.d.ts.map +1 -1
- package/dest/fee/fee_payment_method.js +3 -2
- package/dest/fee/private_fee_payment_method.d.ts +5 -5
- package/dest/fee/private_fee_payment_method.d.ts.map +1 -1
- package/dest/fee/private_fee_payment_method.js +40 -38
- package/dest/fee/public_fee_payment_method.d.ts +5 -5
- package/dest/fee/public_fee_payment_method.d.ts.map +1 -1
- package/dest/fee/public_fee_payment_method.js +38 -35
- package/dest/index.d.ts +25 -12
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +24 -14
- package/dest/rpc_clients/index.js +0 -1
- package/dest/rpc_clients/node/index.d.ts +2 -1
- package/dest/rpc_clients/node/index.d.ts.map +1 -1
- package/dest/rpc_clients/node/index.js +35 -18
- package/dest/rpc_clients/pxe_client.d.ts +2 -2
- package/dest/rpc_clients/pxe_client.d.ts.map +1 -1
- package/dest/rpc_clients/pxe_client.js +9 -7
- package/dest/utils/abi_types.d.ts +4 -1
- package/dest/utils/abi_types.d.ts.map +1 -1
- package/dest/utils/abi_types.js +1 -2
- package/dest/utils/authwit.d.ts +3 -2
- package/dest/utils/authwit.d.ts.map +1 -1
- package/dest/utils/authwit.js +18 -17
- package/dest/utils/aztec_cheatcodes.d.ts +4 -2
- package/dest/utils/aztec_cheatcodes.d.ts.map +1 -1
- package/dest/utils/aztec_cheatcodes.js +32 -41
- package/dest/utils/field_compressed_string.js +3 -5
- package/dest/utils/index.d.ts +1 -1
- package/dest/utils/index.d.ts.map +1 -1
- package/dest/utils/index.js +1 -2
- package/dest/utils/node.d.ts +3 -3
- package/dest/utils/node.d.ts.map +1 -1
- package/dest/utils/node.js +4 -6
- package/dest/utils/pub_key.d.ts +2 -1
- package/dest/utils/pub_key.d.ts.map +1 -1
- package/dest/utils/pub_key.js +2 -4
- package/dest/utils/pxe.d.ts +2 -2
- package/dest/utils/pxe.d.ts.map +1 -1
- package/dest/utils/pxe.js +3 -5
- package/dest/wallet/account_wallet.d.ts +8 -5
- package/dest/wallet/account_wallet.d.ts.map +1 -1
- package/dest/wallet/account_wallet.js +120 -83
- package/dest/wallet/account_wallet_with_private_key.d.ts +5 -5
- package/dest/wallet/account_wallet_with_private_key.d.ts.map +1 -1
- package/dest/wallet/account_wallet_with_private_key.js +10 -16
- package/dest/wallet/base_wallet.d.ts +19 -10
- package/dest/wallet/base_wallet.d.ts.map +1 -1
- package/dest/wallet/base_wallet.js +12 -13
- package/dest/wallet/index.d.ts +3 -3
- package/dest/wallet/index.d.ts.map +1 -1
- package/dest/wallet/index.js +2 -4
- package/dest/wallet/signerless_wallet.d.ts +7 -4
- package/dest/wallet/signerless_wallet.d.ts.map +1 -1
- package/dest/wallet/signerless_wallet.js +4 -6
- package/package.json +10 -14
- package/src/account/contract.ts +22 -5
- package/src/account/index.ts +2 -2
- package/src/account/interface.ts +5 -4
- package/src/account/wallet.ts +4 -3
- package/src/account_manager/deploy_account_method.ts +5 -5
- package/src/account_manager/deploy_account_sent_tx.ts +4 -3
- package/src/account_manager/index.ts +51 -24
- package/src/api/abi.ts +10 -3
- package/src/api/account.ts +8 -3
- package/src/api/addresses.ts +2 -2
- package/src/api/cheat_codes.ts +6 -6
- package/src/api/ethereum/anvil_test_watcher.ts +31 -7
- package/src/api/ethereum/chain_monitor.ts +9 -2
- package/src/api/ethereum/cheat_codes.ts +65 -24
- package/src/api/ethereum/index.ts +5 -1
- package/src/api/ethereum/l1_contracts.ts +1 -1
- package/src/api/ethereum/portal_manager.ts +27 -32
- package/src/api/fee.ts +0 -1
- package/src/api/interfaces/pxe.ts +1 -1
- package/src/api/log_id.ts +1 -1
- package/src/api/tx_hash.ts +1 -1
- package/src/api/wallet.ts +1 -1
- package/src/contract/base_contract_interaction.ts +35 -9
- package/src/contract/batch_call.ts +9 -7
- package/src/contract/checker.ts +1 -1
- package/src/contract/contract.ts +11 -4
- package/src/contract/contract_base.ts +3 -3
- package/src/contract/contract_function_interaction.ts +24 -13
- package/src/contract/deploy_method.ts +27 -18
- package/src/contract/deploy_proven_tx.ts +6 -4
- package/src/contract/deploy_sent_tx.ts +8 -6
- package/src/contract/get_gas_limits.ts +2 -2
- package/src/contract/protocol_contracts.ts +35 -0
- package/src/contract/proven_tx.ts +3 -2
- package/src/contract/sent_tx.ts +3 -2
- package/src/contract/unsafe_contract.ts +3 -3
- package/src/deployment/broadcast_function.ts +47 -40
- package/src/deployment/contract_deployer.ts +4 -3
- package/src/deployment/deploy_instance.ts +5 -5
- package/src/deployment/register_class.ts +25 -18
- package/src/entrypoint/default_entrypoint.ts +5 -5
- package/src/entrypoint/default_multi_call_entrypoint.ts +5 -4
- package/src/entrypoint/entrypoint.ts +7 -3
- package/src/entrypoint/payload.ts +11 -6
- package/src/fee/fee_juice_payment_method.ts +5 -3
- package/src/fee/fee_juice_payment_method_with_claim.ts +11 -10
- package/src/fee/fee_payment_method.ts +3 -3
- package/src/fee/private_fee_payment_method.ts +10 -11
- package/src/fee/public_fee_payment_method.ts +11 -11
- package/src/index.ts +35 -58
- package/src/rpc_clients/node/index.ts +2 -1
- package/src/rpc_clients/pxe_client.ts +2 -2
- package/src/utils/abi_types.ts +4 -7
- package/src/utils/authwit.ts +5 -2
- package/src/utils/aztec_cheatcodes.ts +5 -3
- package/src/utils/field_compressed_string.ts +1 -1
- package/src/utils/index.ts +1 -1
- package/src/utils/node.ts +3 -3
- package/src/utils/pub_key.ts +3 -2
- package/src/utils/pxe.ts +2 -2
- package/src/wallet/account_wallet.ts +8 -5
- package/src/wallet/account_wallet_with_private_key.ts +5 -4
- package/src/wallet/base_wallet.ts +37 -46
- package/src/wallet/index.ts +3 -3
- package/src/wallet/signerless_wallet.ts +7 -4
- package/dest/deployment/protocol_contracts.d.ts.map +0 -1
- package/dest/deployment/protocol_contracts.js +0 -14
- 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/no_fee_payment_method.js +0 -17
- package/src/deployment/protocol_contracts.ts +0 -17
- package/src/fee/no_fee_payment_method.ts +0 -23
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private_fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/private_fee_payment_method.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"private_fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/private_fee_payment_method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,mBAAmB,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;GAEG;AACH,qBAAa,uBAAwB,YAAW,gBAAgB;IAI5D;;OAEG;IACH,OAAO,CAAC,eAAe;IAEvB;;OAEG;IACH,OAAO,CAAC,MAAM;IAEd;;;OAGG;IACH,OAAO,CAAC,cAAc;IAjBxB,OAAO,CAAC,YAAY,CAAsC;;IAGxD;;OAEG;IACK,eAAe,EAAE,YAAY;IAErC;;OAEG;IACK,MAAM,EAAE,MAAM;IAEtB;;;OAGG;IACK,cAAc,UAAQ;IAGhC;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAuCjC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;IAIpC;;;;OAIG;IACG,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CA+B1E"}
|
|
@@ -1,35 +1,31 @@
|
|
|
1
|
-
import { FunctionSelector, FunctionType, U128 } from '@aztec/foundation/abi';
|
|
2
1
|
import { Fr } from '@aztec/foundation/fields';
|
|
2
|
+
import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
|
|
3
3
|
import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
|
|
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,38 +60,44 @@ 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
|
-
const maxFee =
|
|
69
|
+
const maxFee = this.setMaxFeeToOne ? Fr.ONE : gasSettings.getFeeLimit();
|
|
75
70
|
const nonce = Fr.random();
|
|
76
71
|
await this.wallet.createAuthWit({
|
|
77
72
|
caller: this.paymentContract,
|
|
78
73
|
action: {
|
|
79
74
|
name: 'transfer_to_public',
|
|
80
|
-
args: [
|
|
81
|
-
|
|
75
|
+
args: [
|
|
76
|
+
this.wallet.getAddress().toField(),
|
|
77
|
+
this.paymentContract.toField(),
|
|
78
|
+
maxFee,
|
|
79
|
+
nonce
|
|
80
|
+
],
|
|
81
|
+
selector: await FunctionSelector.fromSignature('transfer_to_public((Field),(Field),u128,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
|
{
|
|
90
90
|
name: 'fee_entrypoint_private',
|
|
91
91
|
to: this.paymentContract,
|
|
92
|
-
selector: await FunctionSelector.fromSignature('fee_entrypoint_private(
|
|
92
|
+
selector: await FunctionSelector.fromSignature('fee_entrypoint_private(u128,Field)'),
|
|
93
93
|
type: FunctionType.PRIVATE,
|
|
94
94
|
isStatic: false,
|
|
95
|
-
args: [
|
|
96
|
-
|
|
97
|
-
|
|
95
|
+
args: [
|
|
96
|
+
maxFee,
|
|
97
|
+
nonce
|
|
98
|
+
],
|
|
99
|
+
returnTypes: []
|
|
100
|
+
}
|
|
98
101
|
];
|
|
99
102
|
}
|
|
100
103
|
}
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9mZWVfcGF5bWVudF9tZXRob2QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmVlL3ByaXZhdGVfZmVlX3BheW1lbnRfbWV0aG9kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFN0UsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRzlDLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQzNGLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBR2xFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHVCQUF1QjtJQUdsQztJQUNFOztPQUVHO0lBQ0ssZUFBNkI7SUFFckM7O09BRUc7SUFDSyxNQUFjO0lBRXRCOzs7T0FHRztJQUNLLGlCQUFpQixLQUFLO1FBWHRCLG9CQUFlLEdBQWYsZUFBZSxDQUFjO1FBSzdCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFNZCxtQkFBYyxHQUFkLGNBQWMsQ0FBUTtRQWpCeEIsaUJBQVksR0FBaUMsSUFBSSxDQUFDO0lBa0J2RCxDQUFDO0lBRUo7OztPQUdHO0lBQ0gsUUFBUTtRQUNOLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7WUFDdkIsZ0hBQWdIO1lBQ2hILE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7WUFFM0QsTUFBTSxXQUFXLEdBQUcsSUFBSSwyQkFBMkIsQ0FDakQsZ0JBQWdCLEVBQ2hCLElBQUksQ0FBQyxlQUFlLEVBQ3BCO2dCQUNFLElBQUksRUFBRSxvQkFBb0I7Z0JBQzFCLFlBQVksRUFBRSxZQUFZLENBQUMsT0FBTztnQkFDbEMsVUFBVSxFQUFFLEtBQUs7Z0JBQ2pCLFFBQVEsRUFBRSxLQUFLO2dCQUNmLFVBQVUsRUFBRSxFQUFFO2dCQUNkLFdBQVcsRUFBRTtvQkFDWDt3QkFDRSxJQUFJLEVBQUUsUUFBUTt3QkFDZCxJQUFJLEVBQUUsc0VBQXNFO3dCQUM1RSxNQUFNLEVBQUU7NEJBQ047Z0NBQ0UsSUFBSSxFQUFFLE9BQU87Z0NBQ2IsSUFBSSxFQUFFO29DQUNKLElBQUksRUFBRSxPQUFPO2lDQUNkOzZCQUNGO3lCQUNGO3FCQUNGO2lCQUNGO2dCQUNELFVBQVUsRUFBRSxFQUFFO2dCQUNkLGFBQWEsRUFBRSxLQUFLO2FBQ3JCLEVBQ0QsRUFBRSxDQUNILENBQUM7WUFFRixJQUFJLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUM3QyxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUMsWUFBYSxDQUFDO0lBQzVCLENBQUM7SUFFRCxXQUFXO1FBQ1QsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUMvQyxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxXQUF3QjtRQUM3Qyw2R0FBNkc7UUFDN0csd0NBQXdDO1FBQ3hDLE1BQU0sTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLFdBQVcsRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDekYsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBRTFCLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUM7WUFDOUIsTUFBTSxFQUFFLElBQUksQ0FBQyxlQUFlO1lBQzVCLE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsb0JBQW9CO2dCQUMxQixJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsT0FBTyxFQUFFLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsS0FBSyxDQUFDO2dCQUN2RyxRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMseURBQXlELENBQUM7Z0JBQ3pHLElBQUksRUFBRSxZQUFZLENBQUMsT0FBTztnQkFDMUIsUUFBUSxFQUFFLEtBQUs7Z0JBQ2YsRUFBRSxFQUFFLE1BQU0sSUFBSSxDQUFDLFFBQVEsRUFBRTtnQkFDekIsV0FBVyxFQUFFLEVBQUU7YUFDaEI7U0FDRixDQUFDLENBQUM7UUFFSCxPQUFPO1lBQ0w7Z0JBQ0UsSUFBSSxFQUFFLHdCQUF3QjtnQkFDOUIsRUFBRSxFQUFFLElBQUksQ0FBQyxlQUFlO2dCQUN4QixRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMsNkNBQTZDLENBQUM7Z0JBQzdGLElBQUksRUFBRSxZQUFZLENBQUMsT0FBTztnQkFDMUIsUUFBUSxFQUFFLEtBQUs7Z0JBQ2YsSUFBSSxFQUFFLENBQUMsR0FBRyxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsS0FBSyxDQUFDO2dCQUNuQyxXQUFXLEVBQUUsRUFBRTthQUNoQjtTQUNGLENBQUM7SUFDSixDQUFDO0NBQ0YifQ==
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
1
|
+
import type { FunctionCall } from '@aztec/stdlib/abi';
|
|
2
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
3
|
+
import type { GasSettings } from '@aztec/stdlib/gas';
|
|
4
|
+
import type { AccountWallet } from '../wallet/account_wallet.js';
|
|
5
|
+
import type { FeePaymentMethod } from './fee_payment_method.js';
|
|
6
6
|
/**
|
|
7
7
|
* Holds information about how the fee for a transaction is to be paid.
|
|
8
8
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public_fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/public_fee_payment_method.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"public_fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/public_fee_payment_method.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;GAEG;AACH,qBAAa,sBAAuB,YAAW,gBAAgB;IAI3D;;OAEG;IACH,SAAS,CAAC,eAAe,EAAE,YAAY;IACvC;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,aAAa;IAVjC,OAAO,CAAC,YAAY,CAAsC;;IAGxD;;OAEG;IACO,eAAe,EAAE,YAAY;IACvC;;OAEG;IACO,MAAM,EAAE,aAAa;IAGjC;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAuCjC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;IAIpC;;;;OAIG;IACG,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAiC1E"}
|
|
@@ -1,29 +1,26 @@
|
|
|
1
|
-
import { FunctionSelector, FunctionType, U128 } from '@aztec/foundation/abi';
|
|
2
1
|
import { Fr } from '@aztec/foundation/fields';
|
|
2
|
+
import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
|
|
3
3
|
import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
|
|
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,37 +55,43 @@ 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
|
-
const maxFee =
|
|
63
|
+
const maxFee = gasSettings.getFeeLimit();
|
|
68
64
|
const setPublicAuthWitInteraction = await this.wallet.setPublicAuthWit({
|
|
69
65
|
caller: this.paymentContract,
|
|
70
66
|
action: {
|
|
71
67
|
name: 'transfer_in_public',
|
|
72
|
-
args: [
|
|
73
|
-
|
|
68
|
+
args: [
|
|
69
|
+
this.wallet.getAddress().toField(),
|
|
70
|
+
this.paymentContract.toField(),
|
|
71
|
+
maxFee,
|
|
72
|
+
nonce
|
|
73
|
+
],
|
|
74
|
+
selector: await FunctionSelector.fromSignature('transfer_in_public((Field),(Field),u128,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(),
|
|
82
83
|
{
|
|
83
84
|
name: 'fee_entrypoint_public',
|
|
84
85
|
to: this.paymentContract,
|
|
85
|
-
selector: await FunctionSelector.fromSignature('fee_entrypoint_public(
|
|
86
|
+
selector: await FunctionSelector.fromSignature('fee_entrypoint_public(u128,Field)'),
|
|
86
87
|
type: FunctionType.PRIVATE,
|
|
87
88
|
isStatic: false,
|
|
88
|
-
args: [
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
args: [
|
|
90
|
+
maxFee,
|
|
91
|
+
nonce
|
|
92
|
+
],
|
|
93
|
+
returnTypes: []
|
|
94
|
+
}
|
|
91
95
|
];
|
|
92
96
|
}
|
|
93
97
|
}
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2ZlZV9wYXltZW50X21ldGhvZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mZWUvcHVibGljX2ZlZV9wYXltZW50X21ldGhvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTdFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU5QyxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUUzRixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdsRTs7R0FFRztBQUNILE1BQU0sT0FBTyxzQkFBc0I7SUFHakM7SUFDRTs7T0FFRztJQUNPLGVBQTZCO0lBQ3ZDOztPQUVHO0lBQ08sTUFBcUI7UUFKckIsb0JBQWUsR0FBZixlQUFlLENBQWM7UUFJN0IsV0FBTSxHQUFOLE1BQU0sQ0FBZTtRQVZ6QixpQkFBWSxHQUFpQyxJQUFJLENBQUM7SUFXdkQsQ0FBQztJQUVKOzs7T0FHRztJQUNILFFBQVE7UUFDTixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1lBQ3ZCLGdIQUFnSDtZQUNoSCxNQUFNLGdCQUFnQixHQUFHLElBQUksZ0JBQWdCLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBRTNELE1BQU0sV0FBVyxHQUFHLElBQUksMkJBQTJCLENBQ2pELGdCQUFnQixFQUNoQixJQUFJLENBQUMsZUFBZSxFQUNwQjtnQkFDRSxJQUFJLEVBQUUsb0JBQW9CO2dCQUMxQixZQUFZLEVBQUUsWUFBWSxDQUFDLE9BQU87Z0JBQ2xDLFVBQVUsRUFBRSxLQUFLO2dCQUNqQixRQUFRLEVBQUUsS0FBSztnQkFDZixVQUFVLEVBQUUsRUFBRTtnQkFDZCxXQUFXLEVBQUU7b0JBQ1g7d0JBQ0UsSUFBSSxFQUFFLFFBQVE7d0JBQ2QsSUFBSSxFQUFFLHNFQUFzRTt3QkFDNUUsTUFBTSxFQUFFOzRCQUNOO2dDQUNFLElBQUksRUFBRSxPQUFPO2dDQUNiLElBQUksRUFBRTtvQ0FDSixJQUFJLEVBQUUsT0FBTztpQ0FDZDs2QkFDRjt5QkFDRjtxQkFDRjtpQkFDRjtnQkFDRCxVQUFVLEVBQUUsRUFBRTtnQkFDZCxhQUFhLEVBQUUsS0FBSzthQUNyQixFQUNELEVBQUUsQ0FDSCxDQUFDO1lBRUYsSUFBSSxDQUFDLFlBQVksR0FBRyxXQUFXLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDN0MsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDLFlBQWEsQ0FBQztJQUM1QixDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsZ0JBQWdCLENBQUMsV0FBd0I7UUFDN0MsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQzFCLE1BQU0sTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBRTlELE1BQU0sMkJBQTJCLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUNwRTtZQUNFLE1BQU0sRUFBRSxJQUFJLENBQUMsZUFBZTtZQUM1QixNQUFNLEVBQUU7Z0JBQ04sSUFBSSxFQUFFLG9CQUFvQjtnQkFDMUIsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxJQUFJLENBQUMsZUFBZSxDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFLEtBQUssQ0FBQztnQkFDdkcsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUMsYUFBYSxDQUFDLHlEQUF5RCxDQUFDO2dCQUN6RyxJQUFJLEVBQUUsWUFBWSxDQUFDLE1BQU07Z0JBQ3pCLFFBQVEsRUFBRSxLQUFLO2dCQUNmLEVBQUUsRUFBRSxNQUFNLElBQUksQ0FBQyxRQUFRLEVBQUU7Z0JBQ3pCLFdBQVcsRUFBRSxFQUFFO2FBQ2hCO1NBQ0YsRUFDRCxJQUFJLENBQ0wsQ0FBQztRQUVGLE9BQU87WUFDTCxNQUFNLDJCQUEyQixDQUFDLE9BQU8sRUFBRTtZQUMzQztnQkFDRSxJQUFJLEVBQUUsdUJBQXVCO2dCQUM3QixFQUFFLEVBQUUsSUFBSSxDQUFDLGVBQWU7Z0JBQ3hCLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyw0Q0FBNEMsQ0FBQztnQkFDNUYsSUFBSSxFQUFFLFlBQVksQ0FBQyxPQUFPO2dCQUMxQixRQUFRLEVBQUUsS0FBSztnQkFDZixJQUFJLEVBQUUsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxLQUFLLENBQUM7Z0JBQ25DLFdBQVcsRUFBRSxFQUFFO2FBQ2hCO1NBQ0YsQ0FBQztJQUNKLENBQUM7Q0FDRiJ9
|
package/dest/index.d.ts
CHANGED
|
@@ -20,20 +20,32 @@
|
|
|
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 { NoteSelector } from '@aztec/
|
|
23
|
+
export { NoteSelector } from '@aztec/stdlib/abi';
|
|
24
24
|
export { createCompatibleClient, createPXEClient } from './rpc_clients/index.js';
|
|
25
|
-
export { type
|
|
26
|
-
export {
|
|
27
|
-
export {
|
|
28
|
-
export {
|
|
29
|
-
export {
|
|
30
|
-
export {
|
|
31
|
-
export {
|
|
32
|
-
export {
|
|
33
|
-
export {
|
|
34
|
-
export {
|
|
25
|
+
export { type DeployAccountOptions } from './account_manager/index.js';
|
|
26
|
+
export { AccountWallet, AccountWalletWithSecretKey, SignerlessWallet } from './wallet/index.js';
|
|
27
|
+
export { EthAddress } from '@aztec/foundation/eth-address';
|
|
28
|
+
export { Fq, Fr, Point, GrumpkinScalar } from '@aztec/foundation/fields';
|
|
29
|
+
export { SiblingPath } from '@aztec/foundation/trees';
|
|
30
|
+
export { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
31
|
+
export { type PartialAddress, type ContractClassWithId, type ContractInstanceWithAddress, getContractClassFromArtifact, getContractInstanceFromDeployParams, type NodeInfo, } from '@aztec/stdlib/contract';
|
|
32
|
+
export { MerkleTreeId, merkleTreeIds } from '@aztec/stdlib/trees';
|
|
33
|
+
export { type PublicKey, PublicKeys } from '@aztec/stdlib/keys';
|
|
34
|
+
export { computeSecretHash } from '@aztec/stdlib/hash';
|
|
35
|
+
export { computeAppNullifierSecretKey, deriveKeys, deriveMasterIncomingViewingSecretKey, deriveMasterNullifierSecretKey, } from '@aztec/stdlib/keys';
|
|
36
|
+
export { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
37
|
+
export { getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
|
|
38
|
+
export { FunctionCall } from '@aztec/stdlib/abi';
|
|
39
|
+
export { Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, Capsule, HashedValues, GlobalVariables, } from '@aztec/stdlib/tx';
|
|
40
|
+
export { Body, L2Block } from '@aztec/stdlib/block';
|
|
41
|
+
export { L1NotePayload, LogId, type LogFilter, EncryptedLogPayload } from '@aztec/stdlib/logs';
|
|
42
|
+
export { L1EventPayload, EventMetadata } from '@aztec/stdlib/event';
|
|
43
|
+
export { L1ToL2Message, L2Actor, L1Actor } from '@aztec/stdlib/messaging';
|
|
44
|
+
export { UniqueNote, ExtendedNote, Comparator, Note } from '@aztec/stdlib/note';
|
|
45
|
+
export { type PXE, EventType } from '@aztec/stdlib/interfaces/client';
|
|
46
|
+
export { decodeFromAbi, encodeArguments, type AbiType } from '@aztec/stdlib/abi';
|
|
35
47
|
export { toBigIntBE } from '@aztec/foundation/bigint-buffer';
|
|
36
|
-
export { sha256 } from '@aztec/foundation/crypto';
|
|
48
|
+
export { sha256, Grumpkin, Schnorr } from '@aztec/foundation/crypto';
|
|
37
49
|
export { makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
38
50
|
export { retry, retryUntil } from '@aztec/foundation/retry';
|
|
39
51
|
export { to2Fields, toBigInt } from '@aztec/foundation/serialize';
|
|
@@ -42,6 +54,7 @@ export { elapsed } from '@aztec/foundation/timer';
|
|
|
42
54
|
export { type FieldsOf } from '@aztec/foundation/types';
|
|
43
55
|
export { fileURLToPath } from '@aztec/foundation/url';
|
|
44
56
|
export * from './api/abi.js';
|
|
57
|
+
export * from './api/account.js';
|
|
45
58
|
export * from './api/addresses.js';
|
|
46
59
|
export * from './api/cheat_codes.js';
|
|
47
60
|
export * from './api/ethereum/index.js';
|
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,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dest/index.js
CHANGED
|
@@ -18,25 +18,35 @@
|
|
|
18
18
|
* ```
|
|
19
19
|
*
|
|
20
20
|
* TODO: Ultimately reimplement this mega exporter by mega exporting a granular api (then deprecate it).
|
|
21
|
-
*/
|
|
22
|
-
export {
|
|
23
|
-
export { NoteSelector } from '@aztec/foundation/abi';
|
|
21
|
+
*/ export { ContractDeployer } from './deployment/index.js';
|
|
22
|
+
export { NoteSelector } from '@aztec/stdlib/abi';
|
|
24
23
|
export { createCompatibleClient, createPXEClient } from './rpc_clients/index.js';
|
|
25
|
-
export { AccountManager } from './account_manager/index.js';
|
|
26
24
|
export { AccountWallet, AccountWalletWithSecretKey, SignerlessWallet } from './wallet/index.js';
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
export {
|
|
30
|
-
export {
|
|
31
|
-
export {
|
|
32
|
-
export {
|
|
33
|
-
export {
|
|
25
|
+
export { EthAddress } from '@aztec/foundation/eth-address';
|
|
26
|
+
export { Fq, Fr, Point, GrumpkinScalar } from '@aztec/foundation/fields';
|
|
27
|
+
export { SiblingPath } from '@aztec/foundation/trees';
|
|
28
|
+
export { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
29
|
+
export { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
|
|
30
|
+
export { MerkleTreeId, merkleTreeIds } from '@aztec/stdlib/trees';
|
|
31
|
+
export { PublicKeys } from '@aztec/stdlib/keys';
|
|
32
|
+
export { computeSecretHash } from '@aztec/stdlib/hash';
|
|
33
|
+
export { computeAppNullifierSecretKey, deriveKeys, deriveMasterIncomingViewingSecretKey, deriveMasterNullifierSecretKey } from '@aztec/stdlib/keys';
|
|
34
|
+
export { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
35
|
+
export { getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
|
|
36
|
+
export { FunctionCall } from '@aztec/stdlib/abi';
|
|
37
|
+
export { Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, Capsule, HashedValues, GlobalVariables } from '@aztec/stdlib/tx';
|
|
38
|
+
export { Body, L2Block } from '@aztec/stdlib/block';
|
|
39
|
+
export { L1NotePayload, LogId, EncryptedLogPayload } from '@aztec/stdlib/logs';
|
|
40
|
+
export { L1EventPayload, EventMetadata } from '@aztec/stdlib/event';
|
|
41
|
+
export { L1ToL2Message, L2Actor, L1Actor } from '@aztec/stdlib/messaging';
|
|
42
|
+
export { UniqueNote, ExtendedNote, Comparator, Note } from '@aztec/stdlib/note';
|
|
43
|
+
export { EventType } from '@aztec/stdlib/interfaces/client';
|
|
34
44
|
// TODO: These kinds of things have no place on our public api.
|
|
35
45
|
// External devs will almost certainly have their own methods of doing these things.
|
|
36
46
|
// If we want to use them in our own "aztec.js consuming code", import them from foundation as needed.
|
|
37
|
-
export { decodeFromAbi, encodeArguments } from '@aztec/
|
|
47
|
+
export { decodeFromAbi, encodeArguments } from '@aztec/stdlib/abi';
|
|
38
48
|
export { toBigIntBE } from '@aztec/foundation/bigint-buffer';
|
|
39
|
-
export { sha256 } from '@aztec/foundation/crypto';
|
|
49
|
+
export { sha256, Grumpkin, Schnorr } from '@aztec/foundation/crypto';
|
|
40
50
|
export { makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
41
51
|
export { retry, retryUntil } from '@aztec/foundation/retry';
|
|
42
52
|
export { to2Fields, toBigInt } from '@aztec/foundation/serialize';
|
|
@@ -47,6 +57,7 @@ export { fileURLToPath } from '@aztec/foundation/url';
|
|
|
47
57
|
// Here you *can* do `export *` as the granular api defacto exports things explicitly.
|
|
48
58
|
// This entire index file will be deprecated at some point after we're satisfied.
|
|
49
59
|
export * from './api/abi.js';
|
|
60
|
+
export * from './api/account.js';
|
|
50
61
|
export * from './api/addresses.js';
|
|
51
62
|
export * from './api/cheat_codes.js';
|
|
52
63
|
export * from './api/ethereum/index.js';
|
|
@@ -55,4 +66,3 @@ export * from './api/log.js';
|
|
|
55
66
|
// Granular export, even if not in the api folder
|
|
56
67
|
export * from './contract/index.js';
|
|
57
68
|
export * from './utils/index.js';
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JHO0FBRUgsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFekQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXJELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUtqRixPQUFPLEVBQUUsY0FBYyxFQUE2QixNQUFNLDRCQUE0QixDQUFDO0FBRXZGLE9BQU8sRUFBRSxhQUFhLEVBQUUsMEJBQTBCLEVBQUUsZ0JBQWdCLEVBQWUsTUFBTSxtQkFBbUIsQ0FBQztBQUU3Ryx3SEFBd0g7QUFDeEgsc0NBQXNDO0FBQ3RDLE9BQU8sRUFHTCxVQUFVLEVBQ1YsRUFBRSxFQUNGLEVBQUUsRUFDRiw0QkFBNEIsRUFDNUIsbUNBQW1DLEVBQ25DLGVBQWUsRUFDZixjQUFjLEVBQ2Qsb0JBQW9CLEVBRXBCLEtBQUssRUFDTCxVQUFVLEdBQ1gsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUU1RCxPQUFPLEVBQ0wsNEJBQTRCLEVBQzVCLFVBQVUsRUFDVixvQ0FBb0MsRUFDcEMsOEJBQThCLEdBQy9CLE1BQU0seUJBQXlCLENBQUM7QUFFakMsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVwRSxPQUFPLEVBQ0wsV0FBVyxFQUNYLElBQUksRUFDSixVQUFVLEVBQ1YseUJBQXlCLEVBQ3pCLG1CQUFtQixFQUNuQixhQUFhLEVBQ2IsU0FBUyxFQUNULFlBQVksRUFDWixZQUFZLEVBQ1oseUJBQXlCLEVBQ3pCLFlBQVksRUFDWixPQUFPLEVBQ1AsY0FBYyxFQUNkLGFBQWEsRUFDYixhQUFhLEVBQ2IsT0FBTyxFQUNQLE9BQU8sRUFDUCxLQUFLLEVBQ0wsWUFBWSxFQUNaLGFBQWEsRUFDYixNQUFNLEVBQ04sSUFBSSxFQUNKLFdBQVcsRUFDWCxFQUFFLEVBQ0Ysa0JBQWtCLEVBQ2xCLE1BQU0sRUFDTixTQUFTLEVBQ1QsUUFBUSxFQUNSLGdCQUFnQixFQUNoQixVQUFVLEdBS1gsTUFBTSxzQkFBc0IsQ0FBQztBQUU5QiwrREFBK0Q7QUFDL0Qsb0ZBQW9GO0FBQ3BGLHNHQUFzRztBQUN0RyxPQUFPLEVBQUUsYUFBYSxFQUFFLGVBQWUsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDbEUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2hELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVsRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFdEQsNkRBQTZEO0FBQzdELHNGQUFzRjtBQUN0RixpRkFBaUY7QUFDakYsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxjQUFjLENBQUM7QUFDN0IsaURBQWlEO0FBQ2pELGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxrQkFBa0IsQ0FBQyJ9
|
|
@@ -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=
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { type ComponentsVersions, type PXE } from '@aztec/circuit-types';
|
|
2
1
|
import { type Logger } from '@aztec/foundation/log';
|
|
2
|
+
import type { PXE } from '@aztec/stdlib/interfaces/client';
|
|
3
|
+
import type { ComponentsVersions } from '@aztec/stdlib/versioning';
|
|
3
4
|
/**
|
|
4
5
|
* Creates a PXE client with a given set of retries on non-server errors.
|
|
5
6
|
* Checks that PXE matches the expected version, and warns if not.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rpc_clients/node/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rpc_clients/node/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AA+CnE;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAA2C,EACnD,QAAQ,GAAE,OAAO,CAAC,kBAAkB,CAAM,GACzC,OAAO,CAAC,GAAG,CAAC,CAcd"}
|
|
@@ -11,15 +11,29 @@ import { createPXEClient } from '../pxe_client.js';
|
|
|
11
11
|
* @param body - The body of the request.
|
|
12
12
|
* @param useApiEndpoints - Whether to use the API endpoints or inject the method in the body.
|
|
13
13
|
* @returns The response data.
|
|
14
|
-
*/
|
|
15
|
-
async function axiosFetch(host, rpcMethod, body, useApiEndpoints) {
|
|
14
|
+
*/ async function axiosFetch(host, rpcMethod, body, useApiEndpoints) {
|
|
16
15
|
const request = new Axios({
|
|
17
|
-
headers: {
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
headers: {
|
|
17
|
+
'content-type': 'application/json'
|
|
18
|
+
},
|
|
19
|
+
transformRequest: [
|
|
20
|
+
(data)=>jsonStringify(data)
|
|
21
|
+
],
|
|
22
|
+
transformResponse: [
|
|
23
|
+
(data)=>JSON.parse(data)
|
|
24
|
+
]
|
|
20
25
|
});
|
|
21
|
-
const [url, content] = useApiEndpoints ? [
|
|
22
|
-
|
|
26
|
+
const [url, content] = useApiEndpoints ? [
|
|
27
|
+
`${host}/${rpcMethod}`,
|
|
28
|
+
body
|
|
29
|
+
] : [
|
|
30
|
+
host,
|
|
31
|
+
{
|
|
32
|
+
...body,
|
|
33
|
+
method: rpcMethod
|
|
34
|
+
}
|
|
35
|
+
];
|
|
36
|
+
const resp = await request.post(url, content).catch((error)=>{
|
|
23
37
|
if (error.response) {
|
|
24
38
|
return error.response;
|
|
25
39
|
}
|
|
@@ -29,16 +43,17 @@ async function axiosFetch(host, rpcMethod, body, useApiEndpoints) {
|
|
|
29
43
|
const isOK = resp.status >= 200 && resp.status < 300;
|
|
30
44
|
if (isOK) {
|
|
31
45
|
const headers = {
|
|
32
|
-
get: (header)
|
|
46
|
+
get: (header)=>typeof resp.headers.get === 'function' ? resp.headers.get(header)?.toString() : undefined
|
|
33
47
|
};
|
|
34
|
-
return {
|
|
35
|
-
|
|
36
|
-
|
|
48
|
+
return {
|
|
49
|
+
response: resp.data,
|
|
50
|
+
headers
|
|
51
|
+
};
|
|
52
|
+
} else {
|
|
37
53
|
const errorMessage = `Error ${resp.status} from json-rpc server ${host} on ${rpcMethod}: ${resp.data.error.message}`;
|
|
38
54
|
if (resp.status >= 400 && resp.status < 500) {
|
|
39
55
|
throw new NoRetryError(errorMessage);
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
56
|
+
} else {
|
|
42
57
|
throw new Error(errorMessage);
|
|
43
58
|
}
|
|
44
59
|
}
|
|
@@ -49,13 +64,15 @@ async function axiosFetch(host, rpcMethod, body, useApiEndpoints) {
|
|
|
49
64
|
* @param rpcUrl - URL of the RPC server wrapping the PXE.
|
|
50
65
|
* @param _logger - Debug logger to warn version incompatibilities.
|
|
51
66
|
* @returns A PXE client.
|
|
52
|
-
*/
|
|
53
|
-
export function createCompatibleClient(rpcUrl, logger = createLogger('aztecjs:pxe_client'), versions = {}) {
|
|
67
|
+
*/ export function createCompatibleClient(rpcUrl, logger = createLogger('aztecjs:pxe_client'), versions = {}) {
|
|
54
68
|
// Use axios due to timeout issues with fetch when proving TXs.
|
|
55
|
-
const fetch = async (host, rpcMethod, body, useApiEndpoints)
|
|
56
|
-
return await retry(()
|
|
69
|
+
const fetch = async (host, rpcMethod, body, useApiEndpoints)=>{
|
|
70
|
+
return await retry(()=>axiosFetch(host, rpcMethod, body, useApiEndpoints), `JsonRpcClient request ${rpcMethod} to ${host}`, makeBackoff([
|
|
71
|
+
1,
|
|
72
|
+
2,
|
|
73
|
+
3
|
|
74
|
+
]), logger, false);
|
|
57
75
|
};
|
|
58
76
|
const pxe = createPXEClient(rpcUrl, versions, fetch);
|
|
59
77
|
return Promise.resolve(pxe);
|
|
60
78
|
}
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcnBjX2NsaWVudHMvbm9kZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDM0QsT0FBTyxFQUFlLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTNFLE9BQU8sRUFBRSxLQUFLLEVBQW1CLE1BQU0sT0FBTyxDQUFDO0FBQy9DLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFL0IsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5EOzs7Ozs7O0dBT0c7QUFDSCxLQUFLLFVBQVUsVUFBVSxDQUFDLElBQVksRUFBRSxTQUFpQixFQUFFLElBQVMsRUFBRSxlQUF3QjtJQUM1RixNQUFNLE9BQU8sR0FBRyxJQUFJLEtBQUssQ0FBQztRQUN4QixPQUFPLEVBQUUsRUFBRSxjQUFjLEVBQUUsa0JBQWtCLEVBQUU7UUFDL0MsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDLElBQVMsRUFBRSxFQUFFLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RELGlCQUFpQixFQUFFLENBQUMsQ0FBQyxJQUFTLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7S0FDckQsQ0FBQyxDQUFDO0lBQ0gsTUFBTSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsR0FBRyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLElBQUksU0FBUyxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsR0FBRyxJQUFJLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDakgsTUFBTSxJQUFJLEdBQUcsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFpQixFQUFFLEVBQUU7UUFDeEUsSUFBSSxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDbkIsT0FBTyxLQUFLLENBQUMsUUFBUSxDQUFDO1FBQ3hCLENBQUM7UUFDRCxNQUFNLFlBQVksR0FBRyw0QkFBNEIsSUFBSSxnQkFBZ0IsU0FBUyxLQUFLLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ3BHLE1BQU0sSUFBSSxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDaEMsQ0FBQyxDQUFDLENBQUM7SUFFSCxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsTUFBTSxJQUFJLEdBQUcsSUFBSSxJQUFJLENBQUMsTUFBTSxHQUFHLEdBQUcsQ0FBQztJQUNyRCxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ1QsTUFBTSxPQUFPLEdBQUc7WUFDZCxHQUFHLEVBQUUsQ0FBQyxNQUFjLEVBQUUsRUFBRSxDQUN0QixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVM7U0FDNUYsQ0FBQztRQUNGLE9BQU8sRUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsQ0FBQztJQUMxQyxDQUFDO1NBQU0sQ0FBQztRQUNOLE1BQU0sWUFBWSxHQUFHLFNBQVMsSUFBSSxDQUFDLE1BQU0seUJBQXlCLElBQUksT0FBTyxTQUFTLEtBQUssSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDckgsSUFBSSxJQUFJLENBQUMsTUFBTSxJQUFJLEdBQUcsSUFBSSxJQUFJLENBQUMsTUFBTSxHQUFHLEdBQUcsRUFBRSxDQUFDO1lBQzVDLE1BQU0sSUFBSSxZQUFZLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDdkMsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLElBQUksS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ2hDLENBQUM7SUFDSCxDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7Ozs7R0FNRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FDcEMsTUFBYyxFQUNkLFNBQWlCLFlBQVksQ0FBQyxvQkFBb0IsQ0FBQyxFQUNuRCxXQUF3QyxFQUFFO0lBRTFDLCtEQUErRDtJQUMvRCxNQUFNLEtBQUssR0FBRyxLQUFLLEVBQUUsSUFBWSxFQUFFLFNBQWlCLEVBQUUsSUFBUyxFQUFFLGVBQXdCLEVBQUUsRUFBRTtRQUMzRixPQUFPLE1BQU0sS0FBSyxDQUNoQixHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsZUFBZSxDQUFDLEVBQ3hELHlCQUF5QixTQUFTLE9BQU8sSUFBSSxFQUFFLEVBQy9DLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFDdEIsTUFBTSxFQUNOLEtBQUssQ0FDTixDQUFDO0lBQ0osQ0FBQyxDQUFDO0lBQ0YsTUFBTSxHQUFHLEdBQUcsZUFBZSxDQUFDLE1BQU0sRUFBRSxRQUFRLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFFckQsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQzlCLENBQUMifQ==
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
import { type
|
|
1
|
+
import { type PXE } from '@aztec/stdlib/interfaces/client';
|
|
2
|
+
import { type ComponentsVersions } from '@aztec/stdlib/versioning';
|
|
3
3
|
/**
|
|
4
4
|
* Creates a JSON-RPC client to remotely talk to PXE.
|
|
5
5
|
* @param url - The URL of the PXE.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pxe_client.d.ts","sourceRoot":"","sources":["../../src/rpc_clients/pxe_client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pxe_client.d.ts","sourceRoot":"","sources":["../../src/rpc_clients/pxe_client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,KAAK,kBAAkB,EAAgC,MAAM,0BAA0B,CAAC;AAEjG;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,OAAO,CAAC,kBAAkB,CAAM,EAC1C,KAAK,kEAA8B,GAClC,GAAG,CASL"}
|
|
@@ -1,21 +1,23 @@
|
|
|
1
|
-
import { getVersioningResponseHandler } from '@aztec/circuit-types';
|
|
2
|
-
import { PXESchema } from '@aztec/circuit-types/interfaces';
|
|
3
1
|
import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
4
2
|
import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
|
|
3
|
+
import { PXESchema } from '@aztec/stdlib/interfaces/client';
|
|
4
|
+
import { getVersioningResponseHandler } from '@aztec/stdlib/versioning';
|
|
5
5
|
/**
|
|
6
6
|
* Creates a JSON-RPC client to remotely talk to PXE.
|
|
7
7
|
* @param url - The URL of the PXE.
|
|
8
8
|
* @param fetch - The fetch implementation to use.
|
|
9
9
|
* @returns A JSON-RPC client of PXE.
|
|
10
|
-
*/
|
|
11
|
-
|
|
10
|
+
*/ export function createPXEClient(url, versions = {}, fetch = makeFetch([
|
|
11
|
+
1,
|
|
12
|
+
2,
|
|
13
|
+
3
|
|
14
|
+
], false)) {
|
|
12
15
|
return createSafeJsonRpcClient(url, PXESchema, {
|
|
13
16
|
namespaceMethods: 'pxe',
|
|
14
17
|
fetch,
|
|
15
18
|
onResponse: getVersioningResponseHandler({
|
|
16
19
|
l2ProtocolContractsTreeRoot: protocolContractTreeRoot.toString(),
|
|
17
|
-
...versions
|
|
18
|
-
})
|
|
20
|
+
...versions
|
|
21
|
+
})
|
|
19
22
|
});
|
|
20
23
|
}
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHhlX2NsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ycGNfY2xpZW50cy9weGVfY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBMkIsNEJBQTRCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RixPQUFPLEVBQVksU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUFFLHVCQUF1QixFQUFFLFNBQVMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3ZGLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXJFOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLGVBQWUsQ0FDN0IsR0FBVyxFQUNYLFdBQXdDLEVBQUUsRUFDMUMsS0FBSyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDO0lBRW5DLE9BQU8sdUJBQXVCLENBQU0sR0FBRyxFQUFFLFNBQVMsRUFBRTtRQUNsRCxnQkFBZ0IsRUFBRSxLQUFLO1FBQ3ZCLEtBQUs7UUFDTCxVQUFVLEVBQUUsNEJBQTRCLENBQUM7WUFDdkMsMkJBQTJCLEVBQUUsd0JBQXdCLENBQUMsUUFBUSxFQUFFO1lBQ2hFLEdBQUcsUUFBUTtTQUNaLENBQUM7S0FDSCxDQUFDLENBQUM7QUFDTCxDQUFDIn0=
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
/// <reference types="node" resolution-mode="require"/>
|
|
3
|
-
import
|
|
3
|
+
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
|
+
import type { Fr } from '@aztec/foundation/fields';
|
|
5
|
+
import type { EventSelector, FunctionSelector } from '@aztec/stdlib/abi';
|
|
6
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
4
7
|
/** Any type that can be converted into a field for a contract call. */
|
|
5
8
|
export type FieldLike = Fr | Buffer | bigint | number | {
|
|
6
9
|
toField: () => Fr;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abi_types.d.ts","sourceRoot":"","sources":["../../src/utils/abi_types.ts"],"names":[],"mappings":";;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"abi_types.d.ts","sourceRoot":"","sources":["../../src/utils/abi_types.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,uEAAuE;AACvE,MAAM,MAAM,SAAS,GAAG,EAAE,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG;IAA2B,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEvG,yEAAyE;AACzE,MAAM,MAAM,cAAc,GAAG;IAAyB,OAAO,EAAE,SAAS,CAAA;CAAE,GAAG,UAAU,CAAC;AAExF,2EAA2E;AAC3E,MAAM,MAAM,gBAAgB,GAAG;IAAyB,OAAO,EAAE,SAAS,CAAA;CAAE,GAAG,YAAY,CAAC;AAE5F,8EAA8E;AAC9E,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,gBAAgB,CAAC;AAEhE,4EAA4E;AAC5E,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,aAAa,CAAC;AAE1D,kDAAkD;AAClD,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;AAEvC,gFAAgF;AAChF,MAAM,MAAM,gBAAgB,GAAG;IAAuB,KAAK,EAAE,SAAS,CAAA;CAAE,GAAG,SAAS,CAAC"}
|
package/dest/utils/abi_types.js
CHANGED
|
@@ -1,2 +1 @@
|
|
|
1
|
-
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWJpX3R5cGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2FiaV90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
|
|
1
|
+
/** Any type that can be converted into a struct with a single `inner` field. */ export { };
|