@aztec/aztec.js 0.0.1-commit.24de95ac → 0.0.1-commit.3469e52
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/account.d.ts +26 -42
- package/dest/account/account.d.ts.map +1 -1
- package/dest/account/account.js +19 -47
- package/dest/account/account_contract.d.ts +9 -10
- package/dest/account/account_contract.d.ts.map +1 -1
- package/dest/account/account_with_secret_key.d.ts +20 -9
- package/dest/account/account_with_secret_key.d.ts.map +1 -1
- package/dest/account/account_with_secret_key.js +21 -4
- package/dest/account/index.d.ts +4 -3
- package/dest/account/index.d.ts.map +1 -1
- package/dest/account/index.js +2 -0
- package/dest/account/signerless_account.d.ts +7 -9
- package/dest/account/signerless_account.d.ts.map +1 -1
- package/dest/account/signerless_account.js +8 -11
- package/dest/api/abi.d.ts +1 -1
- package/dest/api/account.d.ts +3 -4
- package/dest/api/account.d.ts.map +1 -1
- package/dest/api/account.js +2 -3
- package/dest/api/addresses.d.ts +1 -1
- package/dest/api/authorization.d.ts +2 -2
- package/dest/api/authorization.d.ts.map +1 -1
- package/dest/api/authorization.js +1 -1
- package/dest/api/block.d.ts +2 -2
- package/dest/api/block.d.ts.map +1 -1
- package/dest/api/block.js +1 -1
- package/dest/api/contract.d.ts +3 -3
- package/dest/api/contract.d.ts.map +1 -1
- package/dest/api/contract.js +1 -1
- package/dest/api/crypto.d.ts +1 -1
- package/dest/api/deployment.d.ts +1 -1
- package/dest/api/eth_address.d.ts +1 -1
- package/dest/api/ethereum.d.ts +1 -1
- package/dest/api/events.d.ts +1 -1
- package/dest/api/fee.d.ts +1 -1
- package/dest/api/fee_testing.d.ts +1 -1
- package/dest/api/fields.d.ts +3 -2
- package/dest/api/fields.d.ts.map +1 -1
- package/dest/api/fields.js +2 -1
- package/dest/api/keys.d.ts +1 -1
- package/dest/api/log.d.ts +1 -1
- package/dest/api/messaging.d.ts +1 -1
- package/dest/api/node.d.ts +1 -1
- package/dest/api/note.d.ts +2 -2
- package/dest/api/note.d.ts.map +1 -1
- package/dest/api/note.js +1 -1
- package/dest/api/protocol.d.ts +7 -1
- package/dest/api/protocol.d.ts.map +1 -1
- package/dest/api/protocol.js +6 -0
- package/dest/api/trees.d.ts +1 -1
- package/dest/api/tx.d.ts +2 -2
- package/dest/api/tx.d.ts.map +1 -1
- package/dest/api/tx.js +1 -1
- package/dest/api/utils.d.ts +1 -1
- package/dest/api/wallet.d.ts +2 -3
- package/dest/api/wallet.d.ts.map +1 -1
- package/dest/api/wallet.js +1 -2
- package/dest/authorization/call_authorization_request.d.ts +2 -2
- package/dest/authorization/call_authorization_request.d.ts.map +1 -1
- package/dest/contract/base_contract_interaction.d.ts +2 -3
- package/dest/contract/base_contract_interaction.d.ts.map +1 -1
- package/dest/contract/base_contract_interaction.js +1 -1
- package/dest/contract/batch_call.d.ts +8 -9
- package/dest/contract/batch_call.d.ts.map +1 -1
- package/dest/contract/batch_call.js +54 -34
- package/dest/contract/checker.d.ts +1 -1
- package/dest/contract/contract.d.ts +2 -2
- package/dest/contract/contract.d.ts.map +1 -1
- package/dest/contract/contract.js +4 -5
- package/dest/contract/contract_base.d.ts +6 -10
- package/dest/contract/contract_base.d.ts.map +1 -1
- package/dest/contract/contract_base.js +5 -12
- package/dest/contract/contract_function_interaction.d.ts +3 -3
- package/dest/contract/contract_function_interaction.d.ts.map +1 -1
- package/dest/contract/contract_function_interaction.js +9 -6
- package/dest/contract/deploy_method.d.ts +9 -8
- package/dest/contract/deploy_method.d.ts.map +1 -1
- package/dest/contract/deploy_method.js +14 -11
- package/dest/contract/deploy_sent_tx.d.ts +12 -7
- package/dest/contract/deploy_sent_tx.d.ts.map +1 -1
- package/dest/contract/deploy_sent_tx.js +10 -4
- package/dest/contract/get_gas_limits.d.ts +1 -1
- package/dest/contract/interaction_options.d.ts +4 -4
- package/dest/contract/interaction_options.d.ts.map +1 -1
- package/dest/contract/interaction_options.js +4 -10
- package/dest/contract/protocol_contracts/auth-registry.d.ts +36 -0
- package/dest/contract/protocol_contracts/auth-registry.d.ts.map +1 -0
- package/dest/contract/protocol_contracts/auth-registry.js +976 -0
- package/dest/contract/protocol_contracts/contract-class-registry.d.ts +35 -0
- package/dest/contract/protocol_contracts/contract-class-registry.d.ts.map +1 -0
- package/dest/contract/protocol_contracts/contract-class-registry.js +797 -0
- package/dest/contract/protocol_contracts/contract-instance-registry.d.ts +31 -0
- package/dest/contract/protocol_contracts/contract-instance-registry.d.ts.map +1 -0
- package/dest/contract/protocol_contracts/contract-instance-registry.js +871 -0
- package/dest/contract/protocol_contracts/fee-juice.d.ts +30 -0
- package/dest/contract/protocol_contracts/fee-juice.d.ts.map +1 -0
- package/dest/contract/protocol_contracts/fee-juice.js +840 -0
- package/dest/contract/protocol_contracts/multi-call-entrypoint.d.ts +34 -0
- package/dest/contract/protocol_contracts/multi-call-entrypoint.d.ts.map +1 -0
- package/dest/contract/protocol_contracts/multi-call-entrypoint.js +576 -0
- package/dest/contract/protocol_contracts/public-checks.d.ts +26 -0
- package/dest/contract/protocol_contracts/public-checks.d.ts.map +1 -0
- package/dest/contract/protocol_contracts/public-checks.js +592 -0
- package/dest/contract/sent_tx.d.ts +2 -3
- package/dest/contract/sent_tx.d.ts.map +1 -1
- package/dest/contract/sent_tx.js +1 -1
- package/dest/contract/wait_for_proven.d.ts +2 -2
- package/dest/contract/wait_for_proven.d.ts.map +1 -1
- package/dest/deployment/broadcast_function.d.ts +1 -1
- package/dest/deployment/broadcast_function.js +4 -4
- package/dest/deployment/contract_deployer.d.ts +1 -1
- package/dest/deployment/contract_deployer.d.ts.map +1 -1
- package/dest/deployment/contract_deployer.js +1 -1
- package/dest/deployment/publish_class.d.ts +1 -1
- package/dest/deployment/publish_class.js +3 -3
- package/dest/deployment/publish_instance.d.ts +2 -2
- package/dest/deployment/publish_instance.d.ts.map +1 -1
- package/dest/deployment/publish_instance.js +3 -3
- package/dest/ethereum/portal_manager.d.ts +7 -6
- package/dest/ethereum/portal_manager.d.ts.map +1 -1
- package/dest/ethereum/portal_manager.js +48 -22
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts +2 -2
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts.map +1 -1
- package/dest/fee/fee_juice_payment_method_with_claim.js +3 -3
- package/dest/fee/fee_payment_method.d.ts +2 -2
- package/dest/fee/fee_payment_method.d.ts.map +1 -1
- package/dest/fee/private_fee_payment_method.d.ts +2 -2
- package/dest/fee/private_fee_payment_method.d.ts.map +1 -1
- package/dest/fee/private_fee_payment_method.js +4 -4
- package/dest/fee/public_fee_payment_method.d.ts +2 -2
- package/dest/fee/public_fee_payment_method.d.ts.map +1 -1
- package/dest/fee/public_fee_payment_method.js +4 -4
- package/dest/fee/sponsored_fee_payment.d.ts +2 -2
- package/dest/fee/sponsored_fee_payment.d.ts.map +1 -1
- package/dest/fee/sponsored_fee_payment.js +2 -2
- package/dest/scripts/generate_protocol_contract_types.d.ts +2 -0
- package/dest/scripts/generate_protocol_contract_types.d.ts.map +1 -0
- package/dest/scripts/generate_protocol_contract_types.js +120 -0
- package/dest/utils/abi_types.d.ts +2 -2
- package/dest/utils/abi_types.d.ts.map +1 -1
- package/dest/utils/authwit.d.ts +9 -7
- package/dest/utils/authwit.d.ts.map +1 -1
- package/dest/utils/authwit.js +25 -14
- package/dest/utils/cross_chain.d.ts +2 -2
- package/dest/utils/cross_chain.d.ts.map +1 -1
- package/dest/utils/fee_juice.d.ts +2 -2
- package/dest/utils/fee_juice.js +2 -2
- package/dest/utils/field_compressed_string.d.ts +1 -1
- package/dest/utils/field_compressed_string.d.ts.map +1 -1
- package/dest/utils/field_compressed_string.js +1 -1
- package/dest/utils/node.d.ts +2 -2
- package/dest/utils/node.d.ts.map +1 -1
- package/dest/utils/pub_key.d.ts +2 -2
- package/dest/utils/pub_key.d.ts.map +1 -1
- package/dest/utils/pub_key.js +1 -1
- package/dest/wallet/account_entrypoint_meta_payment_method.d.ts +6 -9
- package/dest/wallet/account_entrypoint_meta_payment_method.d.ts.map +1 -1
- package/dest/wallet/account_entrypoint_meta_payment_method.js +29 -44
- package/dest/wallet/account_manager.d.ts +3 -9
- package/dest/wallet/account_manager.d.ts.map +1 -1
- package/dest/wallet/account_manager.js +6 -12
- package/dest/wallet/deploy_account_method.d.ts +20 -6
- package/dest/wallet/deploy_account_method.d.ts.map +1 -1
- package/dest/wallet/deploy_account_method.js +9 -7
- package/dest/wallet/index.d.ts +1 -2
- package/dest/wallet/index.d.ts.map +1 -1
- package/dest/wallet/index.js +0 -1
- package/dest/wallet/wallet.d.ts +273 -1499
- package/dest/wallet/wallet.d.ts.map +1 -1
- package/dest/wallet/wallet.js +71 -114
- package/package.json +16 -13
- package/src/account/account.ts +35 -60
- package/src/account/account_contract.ts +7 -8
- package/src/account/account_with_secret_key.ts +34 -9
- package/src/account/index.ts +3 -2
- package/src/account/signerless_account.ts +15 -15
- package/src/api/account.ts +10 -3
- package/src/api/authorization.ts +1 -0
- package/src/api/block.ts +1 -1
- package/src/api/contract.ts +2 -1
- package/src/api/fields.ts +2 -1
- package/src/api/note.ts +1 -1
- package/src/api/protocol.ts +7 -0
- package/src/api/tx.ts +2 -0
- package/src/api/wallet.ts +5 -9
- package/src/authorization/call_authorization_request.ts +1 -1
- package/src/contract/base_contract_interaction.ts +2 -3
- package/src/contract/batch_call.ts +67 -48
- package/src/contract/contract.ts +7 -5
- package/src/contract/contract_base.ts +5 -15
- package/src/contract/contract_function_interaction.ts +10 -11
- package/src/contract/deploy_method.ts +20 -18
- package/src/contract/deploy_sent_tx.ts +17 -10
- package/src/contract/interaction_options.ts +4 -10
- package/src/contract/protocol_contracts/auth-registry.ts +554 -0
- package/src/contract/protocol_contracts/contract-class-registry.ts +442 -0
- package/src/contract/protocol_contracts/contract-instance-registry.ts +502 -0
- package/src/contract/protocol_contracts/fee-juice.ts +466 -0
- package/src/contract/protocol_contracts/multi-call-entrypoint.ts +338 -0
- package/src/contract/protocol_contracts/public-checks.ts +324 -0
- package/src/contract/sent_tx.ts +2 -3
- package/src/deployment/broadcast_function.ts +4 -4
- package/src/deployment/contract_deployer.ts +3 -2
- package/src/deployment/publish_class.ts +3 -3
- package/src/deployment/publish_instance.ts +3 -6
- package/src/ethereum/portal_manager.ts +65 -34
- package/src/fee/fee_juice_payment_method_with_claim.ts +4 -2
- package/src/fee/fee_payment_method.ts +1 -1
- package/src/fee/private_fee_payment_method.ts +5 -3
- package/src/fee/public_fee_payment_method.ts +5 -3
- package/src/fee/sponsored_fee_payment.ts +3 -1
- package/src/scripts/generate_protocol_contract_types.ts +150 -0
- package/src/utils/abi_types.ts +1 -1
- package/src/utils/authwit.ts +24 -18
- package/src/utils/cross_chain.ts +1 -1
- package/src/utils/fee_juice.ts +2 -2
- package/src/utils/field_compressed_string.ts +1 -1
- package/src/utils/pub_key.ts +2 -2
- package/src/wallet/account_entrypoint_meta_payment_method.ts +29 -60
- package/src/wallet/account_manager.ts +7 -15
- package/src/wallet/deploy_account_method.ts +23 -13
- package/src/wallet/index.ts +0 -1
- package/src/wallet/wallet.ts +177 -142
- package/dest/account/interface.d.ts +0 -19
- package/dest/account/interface.d.ts.map +0 -1
- package/dest/account/interface.js +0 -5
- package/dest/contract/protocol_contracts.d.ts +0 -9
- package/dest/contract/protocol_contracts.d.ts.map +0 -1
- package/dest/contract/protocol_contracts.js +0 -26
- package/dest/contract/unsafe_contract.d.ts +0 -15
- package/dest/contract/unsafe_contract.d.ts.map +0 -1
- package/dest/contract/unsafe_contract.js +0 -6
- package/dest/wallet/base_wallet.d.ts +0 -91
- package/dest/wallet/base_wallet.d.ts.map +0 -1
- package/dest/wallet/base_wallet.js +0 -238
- package/src/account/interface.ts +0 -25
- package/src/contract/protocol_contracts.ts +0 -35
- package/src/contract/unsafe_contract.ts +0 -19
- package/src/wallet/base_wallet.ts +0 -350
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Generates type-safe contract wrappers for protocol contracts.
|
|
3
|
+
* These wrappers use a minimal artifact (without bytecode) since PXE already has the full artifacts registered.
|
|
4
|
+
*/ import { generateTypescriptContractInterface } from '@aztec/builder/codegen';
|
|
5
|
+
import { FunctionType, getAllFunctionAbis, loadContractArtifact } from '@aztec/stdlib/abi';
|
|
6
|
+
import { promises as fs } from 'fs';
|
|
7
|
+
import path from 'path';
|
|
8
|
+
const log = console.log;
|
|
9
|
+
const noirContractsRoot = path.join(import.meta.dirname, '../../../../noir-projects/noir-contracts');
|
|
10
|
+
const srcPath = path.join(noirContractsRoot, 'target');
|
|
11
|
+
const outputDir = path.join(import.meta.dirname, '../contract/protocol_contracts');
|
|
12
|
+
function toKebabCase(str) {
|
|
13
|
+
return str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
|
|
14
|
+
}
|
|
15
|
+
function functionTypeToEnum(type) {
|
|
16
|
+
switch(type){
|
|
17
|
+
case FunctionType.PRIVATE:
|
|
18
|
+
return 'FunctionType.PRIVATE';
|
|
19
|
+
case FunctionType.PUBLIC:
|
|
20
|
+
return 'FunctionType.PUBLIC';
|
|
21
|
+
case FunctionType.UTILITY:
|
|
22
|
+
return 'FunctionType.UTILITY';
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function generateFunctionAbiJson(abi) {
|
|
26
|
+
const baseObj = {
|
|
27
|
+
name: abi.name,
|
|
28
|
+
isOnlySelf: abi.isOnlySelf,
|
|
29
|
+
isStatic: abi.isStatic,
|
|
30
|
+
isInitializer: abi.isInitializer,
|
|
31
|
+
parameters: abi.parameters,
|
|
32
|
+
returnTypes: abi.returnTypes,
|
|
33
|
+
errorTypes: abi.errorTypes
|
|
34
|
+
};
|
|
35
|
+
const jsonStr = JSON.stringify(baseObj);
|
|
36
|
+
return jsonStr.replace('{', `{ functionType: ${functionTypeToEnum(abi.functionType)},`);
|
|
37
|
+
}
|
|
38
|
+
function generateProtocolContractArtifact(input) {
|
|
39
|
+
const allAbis = getAllFunctionAbis(input);
|
|
40
|
+
const functionAbis = input.functions.map((f)=>allAbis.find((abi)=>abi.name === f.name));
|
|
41
|
+
const nonDispatchAbis = input.nonDispatchPublicFunctions;
|
|
42
|
+
const functionsArray = functionAbis.map((abi)=>`{ ...${generateFunctionAbiJson(abi)}, bytecode: Buffer.from([]), debugSymbols: '' }`).join(',\n ');
|
|
43
|
+
const nonDispatchArray = nonDispatchAbis.map((abi)=>generateFunctionAbiJson(abi)).join(',\n ');
|
|
44
|
+
return `{
|
|
45
|
+
name: '${input.name}',
|
|
46
|
+
functions: [
|
|
47
|
+
${functionsArray}
|
|
48
|
+
],
|
|
49
|
+
nonDispatchPublicFunctions: [
|
|
50
|
+
${nonDispatchArray}
|
|
51
|
+
],
|
|
52
|
+
outputs: { structs: {}, globals: {} },
|
|
53
|
+
storageLayout: {},
|
|
54
|
+
fileMap: {},
|
|
55
|
+
}`;
|
|
56
|
+
}
|
|
57
|
+
async function generateProtocolContractInterface(input, protocolContractName) {
|
|
58
|
+
const baseInterface = await generateTypescriptContractInterface(input);
|
|
59
|
+
// Match everything between "public declare methods: {" and the closing "};"
|
|
60
|
+
const methodsMatch = baseInterface.match(/public declare methods: \{([\s\S]*?)\n \};/);
|
|
61
|
+
if (!methodsMatch) {
|
|
62
|
+
throw new Error('Could not extract methods from generated interface');
|
|
63
|
+
}
|
|
64
|
+
const artifactCode = generateProtocolContractArtifact(input);
|
|
65
|
+
const contractName = `${input.name}Contract`;
|
|
66
|
+
return `
|
|
67
|
+
/* Autogenerated file, do not edit! */
|
|
68
|
+
|
|
69
|
+
/* eslint-disable */
|
|
70
|
+
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
71
|
+
import { FunctionType } from '@aztec/stdlib/abi';
|
|
72
|
+
|
|
73
|
+
import type { ContractArtifact } from '../../api/abi.js';
|
|
74
|
+
import { PublicKeys } from '../../api/keys.js';
|
|
75
|
+
import type { AztecAddressLike, EthAddressLike, FieldLike, FunctionSelectorLike, WrappedFieldLike } from '../../utils/abi_types.js';
|
|
76
|
+
import { ContractBase, type ContractMethod } from '../contract_base.js';
|
|
77
|
+
import { ContractFunctionInteraction } from '../contract_function_interaction.js';
|
|
78
|
+
import type { Wallet } from '../../wallet/wallet.js';
|
|
79
|
+
|
|
80
|
+
const ${contractName}Artifact: ContractArtifact = ${artifactCode};
|
|
81
|
+
|
|
82
|
+
export class ${contractName} extends ContractBase {
|
|
83
|
+
private constructor(wallet: Wallet) {
|
|
84
|
+
super(ProtocolContractAddress.${protocolContractName}, ${contractName}Artifact, wallet);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
public static at(wallet: Wallet): ${contractName} {
|
|
88
|
+
return new ${contractName}(wallet);
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
public declare methods: {${methodsMatch[1]}
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
`;
|
|
95
|
+
}
|
|
96
|
+
async function main() {
|
|
97
|
+
await fs.rm(outputDir, {
|
|
98
|
+
recursive: true,
|
|
99
|
+
force: true
|
|
100
|
+
});
|
|
101
|
+
await fs.mkdir(outputDir, {
|
|
102
|
+
recursive: true
|
|
103
|
+
});
|
|
104
|
+
const srcNames = JSON.parse(await fs.readFile(path.join(noirContractsRoot, 'protocol_contracts.json'), 'utf8'));
|
|
105
|
+
for (const srcName of srcNames){
|
|
106
|
+
// srcName is like "auth_registry_contract-AuthRegistry", split to get the contract name
|
|
107
|
+
const name = srcName.split('-')[1];
|
|
108
|
+
const artifactPath = path.join(srcPath, `${srcName}.json`);
|
|
109
|
+
const json = JSON.parse(await fs.readFile(artifactPath, 'utf8'));
|
|
110
|
+
const contractArtifact = loadContractArtifact(json);
|
|
111
|
+
const content = await generateProtocolContractInterface(contractArtifact, name);
|
|
112
|
+
const fileName = `${toKebabCase(name)}.ts`;
|
|
113
|
+
await fs.writeFile(path.join(outputDir, fileName), content);
|
|
114
|
+
log(`Generated ${fileName}`);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
main().catch((err)=>{
|
|
118
|
+
console.error('Error generating protocol contract types:', err);
|
|
119
|
+
process.exit(1);
|
|
120
|
+
});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
1
2
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
|
-
import type { Fr } from '@aztec/foundation/fields';
|
|
3
3
|
import type { EventSelector, FunctionSelector } from '@aztec/stdlib/abi';
|
|
4
4
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
5
5
|
/** Any type that can be converted into a field for a contract call. */
|
|
@@ -24,4 +24,4 @@ export type U128Like = bigint | number;
|
|
|
24
24
|
export type WrappedFieldLike = {
|
|
25
25
|
inner: FieldLike;
|
|
26
26
|
} | FieldLike;
|
|
27
|
-
//# sourceMappingURL=
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWJpX3R5cGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvYWJpX3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLHVFQUF1RTtBQUN2RSxNQUFNLE1BQU0sU0FBUyxHQUFHLEVBQUUsR0FBRyxNQUFNLEdBQUcsTUFBTSxHQUFHLE1BQU0sR0FBRztJQUEyQixPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUE7Q0FBRSxDQUFDO0FBRXZHLHlFQUF5RTtBQUN6RSxNQUFNLE1BQU0sY0FBYyxHQUFHO0lBQXlCLE9BQU8sRUFBRSxTQUFTLENBQUE7Q0FBRSxHQUFHLFVBQVUsQ0FBQztBQUV4RiwyRUFBMkU7QUFDM0UsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQXlCLE9BQU8sRUFBRSxTQUFTLENBQUE7Q0FBRSxHQUFHLFlBQVksQ0FBQztBQUU1Riw4RUFBOEU7QUFDOUUsTUFBTSxNQUFNLG9CQUFvQixHQUFHLFNBQVMsR0FBRyxnQkFBZ0IsQ0FBQztBQUVoRSw0RUFBNEU7QUFDNUUsTUFBTSxNQUFNLGlCQUFpQixHQUFHLFNBQVMsR0FBRyxhQUFhLENBQUM7QUFFMUQsa0RBQWtEO0FBQ2xELE1BQU0sTUFBTSxRQUFRLEdBQUcsTUFBTSxHQUFHLE1BQU0sQ0FBQztBQUV2QyxnRkFBZ0Y7QUFDaEYsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQXVCLEtBQUssRUFBRSxTQUFTLENBQUE7Q0FBRSxHQUFHLFNBQVMsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abi_types.d.ts","sourceRoot":"","sources":["../../src/utils/abi_types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"abi_types.d.ts","sourceRoot":"","sources":["../../src/utils/abi_types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,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/authwit.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ChainInfo } from '@aztec/entrypoints/interfaces';
|
|
2
|
-
import { Fr } from '@aztec/foundation/
|
|
2
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import { type FunctionCall } from '@aztec/stdlib/abi';
|
|
4
4
|
import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
5
5
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
@@ -13,7 +13,7 @@ export type IntentInnerHash = {
|
|
|
13
13
|
/** The consumer */
|
|
14
14
|
consumer: AztecAddress;
|
|
15
15
|
/** The action to approve */
|
|
16
|
-
innerHash:
|
|
16
|
+
innerHash: Fr;
|
|
17
17
|
};
|
|
18
18
|
/** Intent with a call */
|
|
19
19
|
export type CallIntent = {
|
|
@@ -29,6 +29,8 @@ export type ContractFunctionInteractionCallIntent = {
|
|
|
29
29
|
/** The action to approve */
|
|
30
30
|
action: ContractFunctionInteraction;
|
|
31
31
|
};
|
|
32
|
+
/** Identifies ContractFunctionInteractionCallIntents */
|
|
33
|
+
export declare function isContractFunctionInteractionCallIntent(messageHashOrIntent: Fr | IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent): messageHashOrIntent is ContractFunctionInteractionCallIntent;
|
|
32
34
|
/**
|
|
33
35
|
* Compute an authentication witness message hash from an intent and metadata
|
|
34
36
|
*
|
|
@@ -50,7 +52,7 @@ export type ContractFunctionInteractionCallIntent = {
|
|
|
50
52
|
* @param metadata - The metadata for the intent (chainId, version)
|
|
51
53
|
* @returns The message hash for the action
|
|
52
54
|
*/
|
|
53
|
-
export declare const computeAuthWitMessageHash: (intent:
|
|
55
|
+
export declare const computeAuthWitMessageHash: (intent: CallIntent | ContractFunctionInteractionCallIntent | IntentInnerHash, metadata: ChainInfo) => Promise<Fr>;
|
|
54
56
|
/**
|
|
55
57
|
* Compute an authentication witness message hash from an intent and metadata. This is just
|
|
56
58
|
* a wrapper around computeAuthwitMessageHash that allows receiving an already computed messageHash as input
|
|
@@ -58,7 +60,7 @@ export declare const computeAuthWitMessageHash: (intent: IntentInnerHash | CallI
|
|
|
58
60
|
* @param metadata - The metadata for the intent (chainId, version)
|
|
59
61
|
* @returns The message hash for the intent
|
|
60
62
|
*/
|
|
61
|
-
export declare function getMessageHashFromIntent(messageHashOrIntent: Fr |
|
|
63
|
+
export declare function getMessageHashFromIntent(messageHashOrIntent: Fr | IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent, chainInfo: ChainInfo): Promise<Fr>;
|
|
62
64
|
/**
|
|
63
65
|
* Computes the inner authwitness hash for either a function call or an action, for it to later be combined with the metadata
|
|
64
66
|
* required for the outer hash and eventually the full AuthWitness.
|
|
@@ -66,7 +68,7 @@ export declare function getMessageHashFromIntent(messageHashOrIntent: Fr | Buffe
|
|
|
66
68
|
* @param action - The action to compute the inner hash from
|
|
67
69
|
* @returns The inner hash for the action
|
|
68
70
|
**/
|
|
69
|
-
export declare const computeInnerAuthWitHashFromAction: (caller: AztecAddress, action:
|
|
71
|
+
export declare const computeInnerAuthWitHashFromAction: (caller: AztecAddress, action: ContractFunctionInteraction | FunctionCall) => Promise<Fr>;
|
|
70
72
|
/**
|
|
71
73
|
* Lookup the validity of an authwit in private and public contexts.
|
|
72
74
|
*
|
|
@@ -90,7 +92,7 @@ export declare function lookupValidity(wallet: Wallet, onBehalfOf: AztecAddress,
|
|
|
90
92
|
export declare class SetPublicAuthwitContractInteraction extends ContractFunctionInteraction {
|
|
91
93
|
private from;
|
|
92
94
|
private constructor();
|
|
93
|
-
static create(wallet: Wallet, from: AztecAddress, messageHashOrIntent: Fr |
|
|
95
|
+
static create(wallet: Wallet, from: AztecAddress, messageHashOrIntent: Fr | IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent, authorized: boolean): Promise<SetPublicAuthwitContractInteraction>;
|
|
94
96
|
/**
|
|
95
97
|
* Overrides the simulate method, adding the sender of the authwit (authorizer) as from
|
|
96
98
|
* and preventing misuse
|
|
@@ -114,4 +116,4 @@ export declare class SetPublicAuthwitContractInteraction extends ContractFunctio
|
|
|
114
116
|
send(options?: Omit<SendInteractionOptions, 'from'>): SentTx;
|
|
115
117
|
private static getSetAuthorizedAbi;
|
|
116
118
|
}
|
|
117
|
-
//# sourceMappingURL=
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aHdpdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2F1dGh3aXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDL0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBaUQsS0FBSyxZQUFZLEVBQWdCLE1BQU0sbUJBQW1CLENBQUM7QUFDbkgsT0FBTyxFQUFFLFdBQVcsRUFBb0QsTUFBTSw0QkFBNEIsQ0FBQztBQUMzRyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV4RCxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUMzRixPQUFPLEtBQUssRUFDVix5QkFBeUIsRUFDekIsc0JBQXNCLEVBQ3RCLDBCQUEwQixFQUMxQixnQkFBZ0IsRUFDakIsTUFBTSxvQ0FBb0MsQ0FBQztBQUM1QyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVqRCxnQ0FBZ0M7QUFDaEMsTUFBTSxNQUFNLGVBQWUsR0FBRztJQUM1QixxQkFBcUI7SUFDckIsUUFBUSxFQUFFLFlBQVksQ0FBQztJQUN2Qiw0QkFBNEI7SUFDNUIsU0FBUyxFQUFFLEVBQUUsQ0FBQztDQUNmLENBQUM7QUFFRix5QkFBeUI7QUFDekIsTUFBTSxNQUFNLFVBQVUsR0FBRztJQUN2Qiw2QkFBNkI7SUFDN0IsTUFBTSxFQUFFLFlBQVksQ0FBQztJQUNyQiwwQkFBMEI7SUFDMUIsSUFBSSxFQUFFLFlBQVksQ0FBQztDQUNwQixDQUFDO0FBRUYsZ0RBQWdEO0FBQ2hELE1BQU0sTUFBTSxxQ0FBcUMsR0FBRztJQUNsRCw2QkFBNkI7SUFDN0IsTUFBTSxFQUFFLFlBQVksQ0FBQztJQUNyQiw0QkFBNEI7SUFDNUIsTUFBTSxFQUFFLDJCQUEyQixDQUFDO0NBQ3JDLENBQUM7QUFFRix3REFBd0Q7QUFDeEQsd0JBQWdCLHVDQUF1QyxDQUNyRCxtQkFBbUIsRUFBRSxFQUFFLEdBQUcsZUFBZSxHQUFHLFVBQVUsR0FBRyxxQ0FBcUMsR0FDN0YsbUJBQW1CLElBQUkscUNBQXFDLENBTTlEO0FBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JHO0FBQ0gsZUFBTyxNQUFNLHlCQUF5QixvSEFtQnJDLENBQUM7QUFFRjs7Ozs7O0dBTUc7QUFDSCx3QkFBc0Isd0JBQXdCLENBQzVDLG1CQUFtQixFQUFFLEVBQUUsR0FBRyxlQUFlLEdBQUcsVUFBVSxHQUFHLHFDQUFxQyxFQUM5RixTQUFTLEVBQUUsU0FBUyxlQVVyQjtBQUVEOzs7Ozs7SUFNSTtBQUNKLGVBQU8sTUFBTSxpQ0FBaUMsMkZBTTdDLENBQUM7QUFFRjs7Ozs7Ozs7OztHQVVHO0FBQ0gsd0JBQXNCLGNBQWMsQ0FDbEMsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsWUFBWSxFQUN4QixNQUFNLEVBQUUsZUFBZSxHQUFHLFVBQVUsR0FBRyxxQ0FBcUMsRUFDNUUsT0FBTyxFQUFFLFdBQVcsR0FDbkIsT0FBTyxDQUFDO0lBQ1QseUVBQXlFO0lBQ3pFLGdCQUFnQixFQUFFLE9BQU8sQ0FBQztJQUMxQix3RUFBd0U7SUFDeEUsZUFBZSxFQUFFLE9BQU8sQ0FBQztDQUMxQixDQUFDLENBMEVEO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSxtQ0FBb0MsU0FBUSwyQkFBMkI7SUFHaEYsT0FBTyxDQUFDLElBQUk7SUFGZCxPQUFPLGVBVU47SUFFRCxPQUFhLE1BQU0sQ0FDakIsTUFBTSxFQUFFLE1BQU0sRUFDZCxJQUFJLEVBQUUsWUFBWSxFQUNsQixtQkFBbUIsRUFBRSxFQUFFLEdBQUcsZUFBZSxHQUFHLFVBQVUsR0FBRyxxQ0FBcUMsRUFDOUYsVUFBVSxFQUFFLE9BQU8sZ0RBS3BCO0lBRUQ7Ozs7O09BS0c7SUFDYSxRQUFRLENBQUMsQ0FBQyxTQUFTLDBCQUEwQixFQUMzRCxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsR0FDdkIsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQVFuRDs7Ozs7T0FLRztJQUNhLE9BQU8sQ0FDckIsT0FBTyxHQUFFLElBQUksQ0FBQyx5QkFBeUIsRUFBRSxNQUFNLENBQTRCLEdBQzFFLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFMUI7SUFFRDs7Ozs7T0FLRztJQUNhLElBQUksQ0FBQyxPQUFPLEdBQUUsSUFBSSxDQUFDLHNCQUFzQixFQUFFLE1BQU0sQ0FBTSxHQUFHLE1BQU0sQ0FFL0U7SUFFRCxPQUFPLENBQUMsTUFBTSxDQUFDLG1CQUFtQjtDQXVCbkMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authwit.d.ts","sourceRoot":"","sources":["../../src/utils/authwit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"authwit.d.ts","sourceRoot":"","sources":["../../src/utils/authwit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAiD,KAAK,YAAY,EAAgB,MAAM,mBAAmB,CAAC;AACnH,OAAO,EAAE,WAAW,EAAoD,MAAM,4BAA4B,CAAC;AAC3G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,KAAK,EACV,yBAAyB,EACzB,sBAAsB,EACtB,0BAA0B,EAC1B,gBAAgB,EACjB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,gCAAgC;AAChC,MAAM,MAAM,eAAe,GAAG;IAC5B,qBAAqB;IACrB,QAAQ,EAAE,YAAY,CAAC;IACvB,4BAA4B;IAC5B,SAAS,EAAE,EAAE,CAAC;CACf,CAAC;AAEF,yBAAyB;AACzB,MAAM,MAAM,UAAU,GAAG;IACvB,6BAA6B;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,0BAA0B;IAC1B,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,gDAAgD;AAChD,MAAM,MAAM,qCAAqC,GAAG;IAClD,6BAA6B;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,4BAA4B;IAC5B,MAAM,EAAE,2BAA2B,CAAC;CACrC,CAAC;AAEF,wDAAwD;AACxD,wBAAgB,uCAAuC,CACrD,mBAAmB,EAAE,EAAE,GAAG,eAAe,GAAG,UAAU,GAAG,qCAAqC,GAC7F,mBAAmB,IAAI,qCAAqC,CAM9D;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,yBAAyB,oHAmBrC,CAAC;AAEF;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAC5C,mBAAmB,EAAE,EAAE,GAAG,eAAe,GAAG,UAAU,GAAG,qCAAqC,EAC9F,SAAS,EAAE,SAAS,eAUrB;AAED;;;;;;IAMI;AACJ,eAAO,MAAM,iCAAiC,2FAM7C,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,YAAY,EACxB,MAAM,EAAE,eAAe,GAAG,UAAU,GAAG,qCAAqC,EAC5E,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC;IACT,yEAAyE;IACzE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,wEAAwE;IACxE,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC,CA0ED;AAED;;GAEG;AACH,qBAAa,mCAAoC,SAAQ,2BAA2B;IAGhF,OAAO,CAAC,IAAI;IAFd,OAAO,eAUN;IAED,OAAa,MAAM,CACjB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,YAAY,EAClB,mBAAmB,EAAE,EAAE,GAAG,eAAe,GAAG,UAAU,GAAG,qCAAqC,EAC9F,UAAU,EAAE,OAAO,gDAKpB;IAED;;;;;OAKG;IACa,QAAQ,CAAC,CAAC,SAAS,0BAA0B,EAC3D,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAQnD;;;;;OAKG;IACa,OAAO,CACrB,OAAO,GAAE,IAAI,CAAC,yBAAyB,EAAE,MAAM,CAA4B,GAC1E,OAAO,CAAC,eAAe,CAAC,CAE1B;IAED;;;;;OAKG;IACa,IAAI,CAAC,OAAO,GAAE,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAM,GAAG,MAAM,CAE/E;IAED,OAAO,CAAC,MAAM,CAAC,mBAAmB;CAuBnC"}
|
package/dest/utils/authwit.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Fr } from '@aztec/foundation/
|
|
1
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
2
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
3
3
|
import { FunctionType } from '@aztec/stdlib/abi';
|
|
4
4
|
import { computeInnerAuthWitHash, computeOuterAuthWitHash } from '@aztec/stdlib/auth-witness';
|
|
5
5
|
import { computeVarArgsHash } from '@aztec/stdlib/hash';
|
|
6
6
|
import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
|
|
7
|
-
/** Identifies ContractFunctionInteractionCallIntents */ function
|
|
7
|
+
/** Identifies ContractFunctionInteractionCallIntents */ export function isContractFunctionInteractionCallIntent(messageHashOrIntent) {
|
|
8
8
|
return 'caller' in messageHashOrIntent && 'action' in messageHashOrIntent && messageHashOrIntent.action instanceof ContractFunctionInteraction;
|
|
9
9
|
}
|
|
10
10
|
/**
|
|
@@ -31,7 +31,7 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
|
|
|
31
31
|
const chainId = metadata.chainId;
|
|
32
32
|
const version = metadata.version;
|
|
33
33
|
if ('caller' in intent) {
|
|
34
|
-
const call =
|
|
34
|
+
const call = isContractFunctionInteractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
|
|
35
35
|
return computeOuterAuthWitHash(call.to, chainId, version, await computeInnerAuthWitHashFromAction(intent.caller, call));
|
|
36
36
|
} else {
|
|
37
37
|
const inner = Buffer.isBuffer(intent.innerHash) ? Fr.fromBuffer(intent.innerHash) : intent.innerHash;
|
|
@@ -47,9 +47,7 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
|
|
|
47
47
|
*/ export async function getMessageHashFromIntent(messageHashOrIntent, chainInfo) {
|
|
48
48
|
let messageHash;
|
|
49
49
|
const { chainId, version } = chainInfo;
|
|
50
|
-
if (
|
|
51
|
-
messageHash = Fr.fromBuffer(messageHashOrIntent);
|
|
52
|
-
} else if (messageHashOrIntent instanceof Fr) {
|
|
50
|
+
if (messageHashOrIntent instanceof Fr) {
|
|
53
51
|
messageHash = messageHashOrIntent;
|
|
54
52
|
} else {
|
|
55
53
|
messageHash = await computeAuthWitMessageHash(messageHashOrIntent, {
|
|
@@ -86,12 +84,9 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
|
|
|
86
84
|
*/ export async function lookupValidity(wallet, onBehalfOf, intent, witness) {
|
|
87
85
|
let innerHash, consumer;
|
|
88
86
|
if ('caller' in intent) {
|
|
89
|
-
const call =
|
|
87
|
+
const call = isContractFunctionInteractionCallIntent(intent) ? await intent.action.getFunctionCall() : intent.call;
|
|
90
88
|
innerHash = await computeInnerAuthWitHashFromAction(intent.caller, call);
|
|
91
89
|
consumer = call.to;
|
|
92
|
-
} else if (Buffer.isBuffer(intent.innerHash)) {
|
|
93
|
-
innerHash = Fr.fromBuffer(intent.innerHash);
|
|
94
|
-
consumer = intent.consumer;
|
|
95
90
|
} else {
|
|
96
91
|
({ innerHash, consumer } = intent);
|
|
97
92
|
}
|
|
@@ -106,11 +101,27 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
|
|
|
106
101
|
name: 'lookup_validity',
|
|
107
102
|
isInitializer: false,
|
|
108
103
|
functionType: FunctionType.UTILITY,
|
|
109
|
-
|
|
104
|
+
isOnlySelf: false,
|
|
110
105
|
isStatic: false,
|
|
111
106
|
parameters: [
|
|
112
107
|
{
|
|
113
|
-
name: '
|
|
108
|
+
name: 'consumer',
|
|
109
|
+
type: {
|
|
110
|
+
fields: [
|
|
111
|
+
{
|
|
112
|
+
name: 'inner',
|
|
113
|
+
type: {
|
|
114
|
+
kind: 'field'
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
],
|
|
118
|
+
kind: 'struct',
|
|
119
|
+
path: 'aztec::protocol_types::address::aztec_address::AztecAddress'
|
|
120
|
+
},
|
|
121
|
+
visibility: 'private'
|
|
122
|
+
},
|
|
123
|
+
{
|
|
124
|
+
name: 'inner_hash',
|
|
114
125
|
type: {
|
|
115
126
|
kind: 'field'
|
|
116
127
|
},
|
|
@@ -142,7 +153,7 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
|
|
|
142
153
|
name: 'utility_is_consumable',
|
|
143
154
|
isInitializer: false,
|
|
144
155
|
functionType: FunctionType.UTILITY,
|
|
145
|
-
|
|
156
|
+
isOnlySelf: false,
|
|
146
157
|
isStatic: false,
|
|
147
158
|
parameters: [
|
|
148
159
|
{
|
|
@@ -235,7 +246,7 @@ import { ContractFunctionInteraction } from '../contract/contract_function_inter
|
|
|
235
246
|
name: 'set_authorized',
|
|
236
247
|
isInitializer: false,
|
|
237
248
|
functionType: FunctionType.PUBLIC,
|
|
238
|
-
|
|
249
|
+
isOnlySelf: true,
|
|
239
250
|
isStatic: false,
|
|
240
251
|
parameters: [
|
|
241
252
|
{
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Fr } from '@aztec/foundation/
|
|
1
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
2
|
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
3
3
|
/**
|
|
4
4
|
* Waits for the L1 to L2 message to be ready to be consumed.
|
|
@@ -21,4 +21,4 @@ export declare function isL1ToL2MessageReady(node: Pick<AztecNode, 'getBlockNumb
|
|
|
21
21
|
/** True if the message is meant to be consumed from a public function */ forPublicConsumption: boolean;
|
|
22
22
|
/** Cached synced block number for the message (will be fetched from PXE otherwise) */ messageBlockNumber?: number;
|
|
23
23
|
}): Promise<boolean>;
|
|
24
|
-
//# sourceMappingURL=
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW4uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jcm9zc19jaGFpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHdCQUFzQix5QkFBeUIsQ0FDN0MsSUFBSSxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsZ0JBQWdCLEdBQUcsdUJBQXVCLENBQUMsRUFDakUsaUJBQWlCLEVBQUUsRUFBRSxFQUNyQixJQUFJLEVBQUU7SUFDSiwyQ0FBMkMsQ0FBQyxjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ25FLHlFQUF5RSxDQUFDLG9CQUFvQixFQUFFLE9BQU8sQ0FBQztDQUN6RyxvQkFTRjtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFzQixvQkFBb0IsQ0FDeEMsSUFBSSxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsZ0JBQWdCLEdBQUcsdUJBQXVCLENBQUMsRUFDakUsaUJBQWlCLEVBQUUsRUFBRSxFQUNyQixJQUFJLEVBQUU7SUFDSix5RUFBeUUsQ0FBQyxvQkFBb0IsRUFBRSxPQUFPLENBQUM7SUFDeEcsc0ZBQXNGLENBQUMsa0JBQWtCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDcEgsR0FDQSxPQUFPLENBQUMsT0FBTyxDQUFDLENBV2xCIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cross_chain.d.ts","sourceRoot":"","sources":["../../src/utils/cross_chain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"cross_chain.d.ts","sourceRoot":"","sources":["../../src/utils/cross_chain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,uBAAuB,CAAC,EACjE,iBAAiB,EAAE,EAAE,EACrB,IAAI,EAAE;IACJ,2CAA2C,CAAC,cAAc,EAAE,MAAM,CAAC;IACnE,yEAAyE,CAAC,oBAAoB,EAAE,OAAO,CAAC;CACzG,oBASF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,uBAAuB,CAAC,EACjE,iBAAiB,EAAE,EAAE,EACrB,IAAI,EAAE;IACJ,yEAAyE,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACxG,sFAAsF,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACpH,GACA,OAAO,CAAC,OAAO,CAAC,CAWlB"}
|
|
@@ -2,7 +2,7 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
|
2
2
|
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
3
3
|
/**
|
|
4
4
|
* Returns the owner's fee juice balance.
|
|
5
|
-
* Note: This is used only
|
|
5
|
+
* Note: This is used only e2e_local_network_example test. TODO: Consider nuking.
|
|
6
6
|
*/
|
|
7
7
|
export declare function getFeeJuiceBalance(owner: AztecAddress, node: AztecNode): Promise<bigint>;
|
|
8
|
-
//# sourceMappingURL=
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2p1aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZmVlX2p1aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRWpFOzs7R0FHRztBQUNILHdCQUFzQixrQkFBa0IsQ0FBQyxLQUFLLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUc5RiJ9
|
package/dest/utils/fee_juice.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Fr } from '@aztec/foundation/
|
|
1
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
2
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
3
3
|
import { deriveStorageSlotInMap } from '@aztec/stdlib/hash';
|
|
4
4
|
/**
|
|
5
5
|
* Returns the owner's fee juice balance.
|
|
6
|
-
* Note: This is used only
|
|
6
|
+
* Note: This is used only e2e_local_network_example test. TODO: Consider nuking.
|
|
7
7
|
*/ export async function getFeeJuiceBalance(owner, node) {
|
|
8
8
|
const slot = await deriveStorageSlotInMap(new Fr(1), owner);
|
|
9
9
|
return (await node.getPublicStorageAt('latest', ProtocolContractAddress.FeeJuice, slot)).toBigInt();
|
|
@@ -14,4 +14,4 @@ interface NoirFieldCompressedString {
|
|
|
14
14
|
*/
|
|
15
15
|
export declare const readFieldCompressedString: (field: NoirFieldCompressedString) => string;
|
|
16
16
|
export {};
|
|
17
|
-
//# sourceMappingURL=
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmllbGRfY29tcHJlc3NlZF9zdHJpbmcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9maWVsZF9jb21wcmVzc2VkX3N0cmluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQTs7R0FFRztBQUNILFVBQVUseUJBQXlCO0lBQ2pDOztPQUVHO0lBQ0gsS0FBSyxFQUFFLE1BQU0sQ0FBQztDQUNmO0FBQ0Q7Ozs7R0FJRztBQUNILGVBQU8sTUFBTSx5QkFBeUIsOENBVXJDLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field_compressed_string.d.ts","sourceRoot":"","sources":["../../src/utils/field_compressed_string.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,UAAU,yBAAyB;IACjC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AACD;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"field_compressed_string.d.ts","sourceRoot":"","sources":["../../src/utils/field_compressed_string.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,UAAU,yBAAyB;IACjC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AACD;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,8CAUrC,CAAC"}
|
package/dest/utils/node.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Logger } from '@aztec/foundation/log';
|
|
2
2
|
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
3
|
-
export declare const waitForNode: (node: AztecNode, logger?: Logger) => Promise<void>;
|
|
3
|
+
export declare const waitForNode: (node: AztecNode, logger?: Logger | undefined) => Promise<void>;
|
|
4
4
|
export { createAztecNodeClient, type AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
5
|
-
//# sourceMappingURL=
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFakUsZUFBTyxNQUFNLFdBQVcsaUVBWXZCLENBQUM7QUFFRixPQUFPLEVBQUUscUJBQXFCLEVBQUUsS0FBSyxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQyJ9
|
package/dest/utils/node.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/utils/node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/utils/node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,eAAO,MAAM,WAAW,iEAYvB,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,KAAK,SAAS,EAAE,MAAM,iCAAiC,CAAC"}
|
package/dest/utils/pub_key.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { GrumpkinScalar } from '@aztec/foundation/
|
|
1
|
+
import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
|
|
2
2
|
import type { PublicKey } from '@aztec/stdlib/keys';
|
|
3
3
|
/**
|
|
4
4
|
* Method for generating a public grumpkin key from a private key.
|
|
@@ -6,4 +6,4 @@ import type { PublicKey } from '@aztec/stdlib/keys';
|
|
|
6
6
|
* @returns The generated public key.
|
|
7
7
|
*/
|
|
8
8
|
export declare function generatePublicKey(privateKey: GrumpkinScalar): Promise<PublicKey>;
|
|
9
|
-
//# sourceMappingURL=
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHViX2tleS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3B1Yl9rZXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEQ7Ozs7R0FJRztBQUNILHdCQUFnQixpQkFBaUIsQ0FBQyxVQUFVLEVBQUUsY0FBYyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FFaEYifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pub_key.d.ts","sourceRoot":"","sources":["../../src/utils/pub_key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"pub_key.d.ts","sourceRoot":"","sources":["../../src/utils/pub_key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CAEhF"}
|
package/dest/utils/pub_key.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { ExecutionPayload } from '@aztec/entrypoints/payload';
|
|
2
|
-
import { type ContractArtifact, type FunctionArtifact } from '@aztec/stdlib/abi';
|
|
3
1
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
4
2
|
import type { GasSettings } from '@aztec/stdlib/gas';
|
|
3
|
+
import { ExecutionPayload } from '@aztec/stdlib/tx';
|
|
4
|
+
import type { Account } from '../account/account.js';
|
|
5
5
|
import type { FeePaymentMethod } from '../fee/fee_payment_method.js';
|
|
6
|
-
import type { Wallet } from './index.js';
|
|
7
6
|
/**
|
|
8
7
|
* Fee payment method that allows an account contract to pay for its own deployment
|
|
9
8
|
* It works by rerouting the provided fee payment method through the account's entrypoint,
|
|
@@ -20,15 +19,13 @@ import type { Wallet } from './index.js';
|
|
|
20
19
|
* This class can be seen in action in DeployAccountMethod.ts#getSelfPaymentMethod
|
|
21
20
|
*/
|
|
22
21
|
export declare class AccountEntrypointMetaPaymentMethod implements FeePaymentMethod {
|
|
23
|
-
private
|
|
24
|
-
private artifact;
|
|
25
|
-
private feePaymentNameOrArtifact;
|
|
26
|
-
private accountAddress;
|
|
22
|
+
private account;
|
|
27
23
|
private paymentMethod?;
|
|
28
|
-
|
|
24
|
+
private feeEntrypointOptions?;
|
|
25
|
+
constructor(account: Account, paymentMethod?: FeePaymentMethod | undefined, feeEntrypointOptions?: any);
|
|
29
26
|
getAsset(): Promise<AztecAddress>;
|
|
30
27
|
getExecutionPayload(): Promise<ExecutionPayload>;
|
|
31
28
|
getFeePayer(): Promise<AztecAddress>;
|
|
32
29
|
getGasSettings(): GasSettings | undefined;
|
|
33
30
|
}
|
|
34
|
-
//# sourceMappingURL=
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9lbnRyeXBvaW50X21ldGFfcGF5bWVudF9tZXRob2QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93YWxsZXQvYWNjb3VudF9lbnRyeXBvaW50X21ldGFfcGF5bWVudF9tZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFFckU7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxxQkFBYSxrQ0FBbUMsWUFBVyxnQkFBZ0I7SUFFdkUsT0FBTyxDQUFDLE9BQU87SUFDZixPQUFPLENBQUMsYUFBYSxDQUFDO0lBQ3RCLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQztJQUgvQixZQUNVLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLGFBQWEsQ0FBQyw4QkFBa0IsRUFDaEMsb0JBQW9CLENBQUMsS0FBSyxFQUNoQztJQUVKLFFBQVEsSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLENBRWhDO0lBRUssbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBNkJyRDtJQUVELFdBQVcsSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLENBRW5DO0lBRUQsY0FBYyxJQUFJLFdBQVcsR0FBRyxTQUFTLENBRXhDO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account_entrypoint_meta_payment_method.d.ts","sourceRoot":"","sources":["../../src/wallet/account_entrypoint_meta_payment_method.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"account_entrypoint_meta_payment_method.d.ts","sourceRoot":"","sources":["../../src/wallet/account_entrypoint_meta_payment_method.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE;;;;;;;;;;;;;;GAcG;AACH,qBAAa,kCAAmC,YAAW,gBAAgB;IAEvE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,oBAAoB,CAAC;IAH/B,YACU,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,8BAAkB,EAChC,oBAAoB,CAAC,KAAK,EAChC;IAEJ,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,CAEhC;IAEK,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CA6BrD;IAED,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,CAEnC;IAED,cAAc,IAAI,WAAW,GAAG,SAAS,CAExC;CACF"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { AccountFeePaymentMethodOptions } from '@aztec/entrypoints/account';
|
|
2
|
-
import { EncodedAppEntrypointCalls } from '@aztec/entrypoints/encoding';
|
|
3
|
-
import { ExecutionPayload } from '@aztec/entrypoints/payload';
|
|
4
2
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
5
|
-
import {
|
|
3
|
+
import { ExecutionPayload } from '@aztec/stdlib/tx';
|
|
6
4
|
/**
|
|
7
5
|
* Fee payment method that allows an account contract to pay for its own deployment
|
|
8
6
|
* It works by rerouting the provided fee payment method through the account's entrypoint,
|
|
@@ -18,57 +16,44 @@ import { FunctionCall, FunctionSelector, encodeArguments, getFunctionArtifactByN
|
|
|
18
16
|
*
|
|
19
17
|
* This class can be seen in action in DeployAccountMethod.ts#getSelfPaymentMethod
|
|
20
18
|
*/ export class AccountEntrypointMetaPaymentMethod {
|
|
21
|
-
|
|
22
|
-
artifact;
|
|
23
|
-
feePaymentNameOrArtifact;
|
|
24
|
-
accountAddress;
|
|
19
|
+
account;
|
|
25
20
|
paymentMethod;
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
this.
|
|
29
|
-
this.feePaymentNameOrArtifact = feePaymentNameOrArtifact;
|
|
30
|
-
this.accountAddress = accountAddress;
|
|
21
|
+
feeEntrypointOptions;
|
|
22
|
+
constructor(account, paymentMethod, feeEntrypointOptions){
|
|
23
|
+
this.account = account;
|
|
31
24
|
this.paymentMethod = paymentMethod;
|
|
25
|
+
this.feeEntrypointOptions = feeEntrypointOptions;
|
|
32
26
|
}
|
|
33
27
|
getAsset() {
|
|
34
28
|
return this.paymentMethod?.getAsset() ?? Promise.resolve(ProtocolContractAddress.FeeJuice);
|
|
35
29
|
}
|
|
36
30
|
async getExecutionPayload() {
|
|
37
|
-
// Get the execution payload for the fee
|
|
38
|
-
|
|
39
|
-
//
|
|
40
|
-
|
|
41
|
-
//
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
accountFeePaymentMethodOptions =
|
|
31
|
+
// Get the execution payload for the fee
|
|
32
|
+
const innerPayload = await this.paymentMethod?.getExecutionPayload() ?? ExecutionPayload.empty();
|
|
33
|
+
// If no fee entrypoint options were provided, compute them based on the wrapped payment method
|
|
34
|
+
// This mimics how the actual account contract works when invoked directly:
|
|
35
|
+
// - If we are the fee payer, are there calls in the inner payload? In that case, those calls can
|
|
36
|
+
// only be claiming fee juice, so we use FEE_JUICE_WITH_CLAIM
|
|
37
|
+
// - If we are the fee payer, but there are no calls, then we assume the account already has
|
|
38
|
+
// fee juice and can pay directly with PREEXISTING_FEE_JUICE
|
|
39
|
+
// - If we are not the fee payer, then EXTERNAL is used
|
|
40
|
+
let options = this.feeEntrypointOptions;
|
|
41
|
+
if (!options) {
|
|
42
|
+
const feePayer = await this.paymentMethod?.getFeePayer() ?? this.account.getAddress();
|
|
43
|
+
const isFeePayer = feePayer.equals(this.account.getAddress());
|
|
44
|
+
let accountFeePaymentMethodOptions = AccountFeePaymentMethodOptions.EXTERNAL;
|
|
45
|
+
if (isFeePayer) {
|
|
46
|
+
accountFeePaymentMethodOptions = innerPayload.calls.length === 0 ? AccountFeePaymentMethodOptions.PREEXISTING_FEE_JUICE : AccountFeePaymentMethodOptions.FEE_JUICE_WITH_CLAIM;
|
|
47
|
+
}
|
|
48
|
+
options = {
|
|
49
|
+
feePaymentMethodOptions: accountFeePaymentMethodOptions
|
|
50
|
+
};
|
|
51
51
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
const args = [
|
|
55
|
-
feeEncodedCalls,
|
|
56
|
-
accountFeePaymentMethodOptions,
|
|
57
|
-
false
|
|
58
|
-
];
|
|
59
|
-
const feePaymentArtifact = typeof this.feePaymentNameOrArtifact === 'string' ? getFunctionArtifactByName(this.artifact, this.feePaymentNameOrArtifact) : this.feePaymentNameOrArtifact;
|
|
60
|
-
const entrypointCall = new FunctionCall(feePaymentArtifact.name, this.accountAddress, await FunctionSelector.fromNameAndParameters(feePaymentArtifact.name, feePaymentArtifact.parameters), feePaymentArtifact.functionType, false, feePaymentArtifact.isStatic, encodeArguments(feePaymentArtifact, args), feePaymentArtifact.returnTypes);
|
|
61
|
-
// Compute the authwitness required to verify the combined payload
|
|
62
|
-
const payloadAuthWitness = await this.wallet.createAuthWit(this.accountAddress, await feeEncodedCalls.hash());
|
|
63
|
-
return new ExecutionPayload([
|
|
64
|
-
entrypointCall
|
|
65
|
-
], [
|
|
66
|
-
payloadAuthWitness,
|
|
67
|
-
...feeAuthwitnesses
|
|
68
|
-
], [], feeEncodedCalls.hashedArguments);
|
|
52
|
+
// Use the generic wrapping mechanism from the account interface
|
|
53
|
+
return this.account.wrapExecutionPayload(innerPayload, options);
|
|
69
54
|
}
|
|
70
55
|
getFeePayer() {
|
|
71
|
-
return this.paymentMethod?.getFeePayer() ?? Promise.resolve(this.
|
|
56
|
+
return this.paymentMethod?.getFeePayer() ?? Promise.resolve(this.account.getAddress());
|
|
72
57
|
}
|
|
73
58
|
getGasSettings() {
|
|
74
59
|
return this.paymentMethod?.getGasSettings();
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { Fr } from '@aztec/foundation/
|
|
1
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
2
|
import { CompleteAddress, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
|
|
3
3
|
import type { AccountContract } from '../account/account_contract.js';
|
|
4
4
|
import { AccountWithSecretKey } from '../account/account_with_secret_key.js';
|
|
5
5
|
import type { Salt } from '../account/index.js';
|
|
6
|
-
import type { AccountInterface } from '../account/interface.js';
|
|
7
6
|
import { DeployAccountMethod } from './deploy_account_method.js';
|
|
8
7
|
import type { Wallet } from './wallet.js';
|
|
9
8
|
/**
|
|
@@ -23,11 +22,6 @@ export declare class AccountManager {
|
|
|
23
22
|
static create(wallet: Wallet, secretKey: Fr, accountContract: AccountContract, salt?: Salt): Promise<AccountManager>;
|
|
24
23
|
protected getPublicKeys(): import("@aztec/stdlib/keys").PublicKeys;
|
|
25
24
|
protected getPublicKeysHash(): Fr | Promise<Fr>;
|
|
26
|
-
/**
|
|
27
|
-
* Returns the entrypoint for this account as defined by its account contract.
|
|
28
|
-
* @returns An entrypoint.
|
|
29
|
-
*/
|
|
30
|
-
getAccountInterface(): Promise<AccountInterface>;
|
|
31
25
|
/**
|
|
32
26
|
* Gets the calculated complete address associated with this account.
|
|
33
27
|
* Does not require the account to have been published for public execution.
|
|
@@ -38,7 +32,7 @@ export declare class AccountManager {
|
|
|
38
32
|
* Returns the secret key used to derive the rest of the privacy keys for this contract
|
|
39
33
|
*/
|
|
40
34
|
getSecretKey(): Fr;
|
|
41
|
-
get address(): import("
|
|
35
|
+
get address(): import("@aztec/stdlib/aztec-address").AztecAddress;
|
|
42
36
|
/**
|
|
43
37
|
* Returns the contract instance definition associated with this account.
|
|
44
38
|
* Does not require the account to have been published for public execution.
|
|
@@ -66,4 +60,4 @@ export declare class AccountManager {
|
|
|
66
60
|
*/
|
|
67
61
|
hasInitializer(): Promise<boolean>;
|
|
68
62
|
}
|
|
69
|
-
//# sourceMappingURL=
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9tYW5hZ2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2FjY291bnRfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUNMLGVBQWUsRUFDZixLQUFLLDJCQUEyQixFQUVqQyxNQUFNLHdCQUF3QixDQUFDO0FBR2hDLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRWhELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUUxQzs7O0dBR0c7QUFDSCxxQkFBYSxjQUFjO0lBRXZCLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLFNBQVM7SUFDakIsT0FBTyxDQUFDLGVBQWU7SUFDdkIsT0FBTyxDQUFDLFFBQVE7SUFDaEI7O09BRUc7YUFDYSxJQUFJLEVBQUUsSUFBSTtJQVI1QixPQUFPLGVBU0g7SUFFSixPQUFhLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsZUFBZSxFQUFFLGVBQWUsRUFBRSxJQUFJLENBQUMsRUFBRSxJQUFJLDJCQWtCL0Y7SUFFRCxTQUFTLENBQUMsYUFBYSw0Q0FFdEI7SUFFRCxTQUFTLENBQUMsaUJBQWlCLHFCQUUxQjtJQUVEOzs7O09BSUc7SUFDSSxrQkFBa0IsSUFBSSxPQUFPLENBQUMsZUFBZSxDQUFDLENBRXBEO0lBRUQ7O09BRUc7SUFDSSxZQUFZLE9BRWxCO0lBRUQsSUFBSSxPQUFPLHVEQUVWO0lBRUQ7Ozs7T0FJRztJQUNJLFdBQVcsSUFBSSwyQkFBMkIsQ0FFaEQ7SUFFRDs7OztPQUlHO0lBQ1UsVUFBVSxJQUFJLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUl2RDtJQUVEOzs7T0FHRztJQUNILGtCQUFrQixJQUFJLGVBQWUsQ0FFcEM7SUFFRDs7O09BR0c7SUFDVSxlQUFlLElBQUksT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBMEIzRDtJQUVEOztPQUVHO0lBQ1UsY0FBYyxxQkFFMUI7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account_manager.d.ts","sourceRoot":"","sources":["../../src/wallet/account_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"account_manager.d.ts","sourceRoot":"","sources":["../../src/wallet/account_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EACL,eAAe,EACf,KAAK,2BAA2B,EAEjC,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C;;;GAGG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,QAAQ;IAChB;;OAEG;aACa,IAAI,EAAE,IAAI;IAR5B,OAAO,eASH;IAEJ,OAAa,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,IAAI,2BAkB/F;IAED,SAAS,CAAC,aAAa,4CAEtB;IAED,SAAS,CAAC,iBAAiB,qBAE1B;IAED;;;;OAIG;IACI,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAEpD;IAED;;OAEG;IACI,YAAY,OAElB;IAED,IAAI,OAAO,uDAEV;IAED;;;;OAIG;IACI,WAAW,IAAI,2BAA2B,CAEhD;IAED;;;;OAIG;IACU,UAAU,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAIvD;IAED;;;OAGG;IACH,kBAAkB,IAAI,eAAe,CAEpC;IAED;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC,CA0B3D;IAED;;OAEG;IACU,cAAc,qBAE1B;CACF"}
|