@aztec/aztec.js 0.8.9 → 0.8.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/dest/account/contract/base_account_contract.d.ts +4 -4
- package/dest/account/contract/base_account_contract.d.ts.map +1 -1
- package/dest/account/contract/base_account_contract.js +5 -5
- package/dest/account/contract/ecdsa_account_contract.js +3 -3
- package/dest/account/contract/index.d.ts +4 -4
- package/dest/account/contract/index.d.ts.map +1 -1
- package/dest/account/contract/schnorr_account_contract.js +3 -3
- package/dest/account/contract/single_key_account_contract.js +3 -3
- package/dest/account/defaults/default_entrypoint.js +1 -1
- package/dest/account/manager/index.js +3 -3
- package/dest/{abis → artifacts}/ecdsa_account_contract.json +4 -3
- package/dest/{abis → artifacts}/schnorr_account_contract.json +4 -3
- package/dest/{abis → artifacts}/schnorr_single_key_account_contract.json +4 -3
- package/dest/contract/checker.d.ts +5 -5
- package/dest/contract/checker.d.ts.map +1 -1
- package/dest/contract/checker.js +9 -9
- package/dest/contract/contract.d.ts +7 -7
- package/dest/contract/contract.d.ts.map +1 -1
- package/dest/contract/contract.js +10 -10
- package/dest/contract/contract_base.d.ts +3 -3
- package/dest/contract/contract_base.d.ts.map +1 -1
- package/dest/contract/contract_base.js +5 -5
- 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 +1 -1
- package/dest/contract/index.d.ts +3 -3
- package/dest/contract/index.js +3 -3
- package/dest/contract/sent_tx.d.ts +7 -1
- package/dest/contract/sent_tx.d.ts.map +1 -1
- package/dest/contract/sent_tx.js +10 -1
- package/dest/contract_deployer/contract_deployer.d.ts +3 -3
- package/dest/contract_deployer/contract_deployer.d.ts.map +1 -1
- package/dest/contract_deployer/contract_deployer.js +4 -4
- package/dest/contract_deployer/deploy_method.d.ts +4 -4
- package/dest/contract_deployer/deploy_method.d.ts.map +1 -1
- package/dest/contract_deployer/deploy_method.js +12 -12
- package/dest/contract_deployer/deploy_sent_tx.d.ts +12 -4
- package/dest/contract_deployer/deploy_sent_tx.d.ts.map +1 -1
- package/dest/contract_deployer/deploy_sent_tx.js +9 -4
- package/dest/index.d.ts +2 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +4 -2
- package/dest/pxe_client.d.ts.map +1 -1
- package/dest/pxe_client.js +6 -3
- package/dest/sandbox/index.d.ts +1 -0
- package/dest/sandbox/index.d.ts.map +1 -1
- package/dest/sandbox/index.js +3 -3
- package/dest/utils/authwit.d.ts.map +1 -1
- package/dest/utils/authwit.js +3 -1
- package/dest/wallet/base_wallet.d.ts +2 -2
- package/dest/wallet/base_wallet.d.ts.map +1 -1
- package/dest/wallet/base_wallet.js +3 -3
- package/package.json +5 -5
- package/src/account/contract/base_account_contract.ts +4 -4
- package/src/account/contract/ecdsa_account_contract.ts +3 -3
- package/src/account/contract/index.ts +4 -4
- package/src/account/contract/schnorr_account_contract.ts +3 -3
- package/src/account/contract/single_key_account_contract.ts +3 -3
- package/src/account/defaults/default_entrypoint.ts +2 -2
- package/src/account/manager/index.ts +2 -2
- package/src/{abis → artifacts}/ecdsa_account_contract.json +4 -3
- package/src/{abis → artifacts}/schnorr_account_contract.json +4 -3
- package/src/{abis → artifacts}/schnorr_single_key_account_contract.json +4 -3
- package/src/contract/checker.ts +9 -9
- package/src/contract/contract.ts +10 -10
- package/src/contract/contract_base.ts +4 -4
- package/src/contract/contract_function_interaction.ts +2 -2
- package/src/contract/index.ts +3 -3
- package/src/contract/sent_tx.ts +11 -1
- package/src/contract_deployer/contract_deployer.ts +3 -3
- package/src/contract_deployer/deploy_method.ts +17 -12
- package/src/contract_deployer/deploy_sent_tx.ts +13 -4
- package/src/index.ts +4 -1
- package/src/pxe_client.ts +14 -1
- package/src/sandbox/index.ts +2 -2
- package/src/utils/authwit.ts +2 -0
- package/src/wallet/account_wallet.ts +2 -2
- package/src/wallet/base_wallet.ts +4 -3
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CompleteAddress } from '@aztec/circuits.js';
|
|
2
|
-
import {
|
|
2
|
+
import { ContractArtifact } from '@aztec/foundation/abi';
|
|
3
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import { PXE, PublicKey, Tx, TxExecutionRequest } from '@aztec/types';
|
|
@@ -27,13 +27,13 @@ export type DeployOptions = {
|
|
|
27
27
|
export declare class DeployMethod<TContract extends ContractBase = Contract> extends BaseContractInteraction {
|
|
28
28
|
private publicKey;
|
|
29
29
|
protected pxe: PXE;
|
|
30
|
-
private
|
|
30
|
+
private artifact;
|
|
31
31
|
private args;
|
|
32
32
|
/** The complete address of the contract. */
|
|
33
33
|
completeAddress?: CompleteAddress;
|
|
34
34
|
/** Constructor function to call. */
|
|
35
|
-
private
|
|
36
|
-
constructor(publicKey: PublicKey, pxe: PXE,
|
|
35
|
+
private constructorArtifact;
|
|
36
|
+
constructor(publicKey: PublicKey, pxe: PXE, artifact: ContractArtifact, args?: any[]);
|
|
37
37
|
/**
|
|
38
38
|
* Create a contract deployment transaction, given the deployment options.
|
|
39
39
|
* This function internally calls `request()` and `sign()` methods to prepare
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_method.d.ts","sourceRoot":"","sources":["../../src/contract_deployer/deploy_method.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAKhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"deploy_method.d.ts","sourceRoot":"","sources":["../../src/contract_deployer/deploy_method.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAKhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAqC,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAmB,SAAS,EAAE,EAAE,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B;;OAEG;IACH,mBAAmB,CAAC,EAAE,EAAE,CAAC;CAC1B,GAAG,iBAAiB,CAAC;AAEtB;;;GAGG;AACH,qBAAa,YAAY,CAAC,SAAS,SAAS,YAAY,GAAG,QAAQ,CAAE,SAAQ,uBAAuB;IAQhG,OAAO,CAAC,SAAS;IACjB,SAAS,CAAC,GAAG,EAAE,GAAG;IAClB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IAVd,4CAA4C;IACrC,eAAe,CAAC,EAAE,eAAe,CAAa;IAErD,oCAAoC;IACpC,OAAO,CAAC,mBAAmB,CAAmB;gBAGpC,SAAS,EAAE,SAAS,EAClB,GAAG,EAAE,GAAG,EACV,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,GAAG,EAAO;IAQ1B;;;;;;;;OAQG;IACU,MAAM,CAAC,OAAO,GAAE,aAAkB;IAoD/C;;;;;;;OAOG;IACI,IAAI,CAAC,OAAO,GAAE,aAAkB,GAAG,YAAY,CAAC,SAAS,CAAC;IAKjE;;;;OAIG;IACI,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,EAAE,CAAC;CAGrD"}
|
|
@@ -10,18 +10,18 @@ import { DeploySentTx } from './deploy_sent_tx.js';
|
|
|
10
10
|
* Extends the ContractFunctionInteraction class.
|
|
11
11
|
*/
|
|
12
12
|
export class DeployMethod extends BaseContractInteraction {
|
|
13
|
-
constructor(publicKey, pxe,
|
|
13
|
+
constructor(publicKey, pxe, artifact, args = []) {
|
|
14
14
|
super(pxe);
|
|
15
15
|
this.publicKey = publicKey;
|
|
16
16
|
this.pxe = pxe;
|
|
17
|
-
this.
|
|
17
|
+
this.artifact = artifact;
|
|
18
18
|
this.args = args;
|
|
19
19
|
/** The complete address of the contract. */
|
|
20
20
|
this.completeAddress = undefined;
|
|
21
|
-
const
|
|
22
|
-
if (!
|
|
23
|
-
throw new Error('Cannot find constructor in the
|
|
24
|
-
this.
|
|
21
|
+
const constructorArtifact = artifact.functions.find(f => f.name === 'constructor');
|
|
22
|
+
if (!constructorArtifact)
|
|
23
|
+
throw new Error('Cannot find constructor in the artifact.');
|
|
24
|
+
this.constructorArtifact = constructorArtifact;
|
|
25
25
|
}
|
|
26
26
|
/**
|
|
27
27
|
* Create a contract deployment transaction, given the deployment options.
|
|
@@ -36,11 +36,11 @@ export class DeployMethod extends BaseContractInteraction {
|
|
|
36
36
|
const portalContract = options.portalContract ?? EthAddress.ZERO;
|
|
37
37
|
const contractAddressSalt = options.contractAddressSalt ?? Fr.random();
|
|
38
38
|
const { chainId, protocolVersion } = await this.pxe.getNodeInfo();
|
|
39
|
-
const { completeAddress, constructorHash, functionTreeRoot } = await getContractDeploymentInfo(this.
|
|
39
|
+
const { completeAddress, constructorHash, functionTreeRoot } = await getContractDeploymentInfo(this.artifact, this.args, contractAddressSalt, this.publicKey);
|
|
40
40
|
const contractDeploymentData = new ContractDeploymentData(this.publicKey, constructorHash, functionTreeRoot, contractAddressSalt, portalContract);
|
|
41
41
|
const txContext = new TxContext(false, false, true, contractDeploymentData, new Fr(chainId), new Fr(protocolVersion));
|
|
42
|
-
const args = encodeArguments(this.
|
|
43
|
-
const functionData = FunctionData.fromAbi(this.
|
|
42
|
+
const args = encodeArguments(this.constructorArtifact, this.args);
|
|
43
|
+
const functionData = FunctionData.fromAbi(this.constructorArtifact);
|
|
44
44
|
const execution = { args, functionData, to: completeAddress.address };
|
|
45
45
|
const packedArguments = await PackedArguments.fromArgs(execution.args);
|
|
46
46
|
const txRequest = TxExecutionRequest.from({
|
|
@@ -54,7 +54,7 @@ export class DeployMethod extends BaseContractInteraction {
|
|
|
54
54
|
this.txRequest = txRequest;
|
|
55
55
|
this.completeAddress = completeAddress;
|
|
56
56
|
// TODO: Should we add the contracts to the DB here, or once the tx has been sent or mined?
|
|
57
|
-
await this.pxe.addContracts([{
|
|
57
|
+
await this.pxe.addContracts([{ artifact: this.artifact, completeAddress, portalContract }]);
|
|
58
58
|
return this.txRequest;
|
|
59
59
|
}
|
|
60
60
|
/**
|
|
@@ -67,7 +67,7 @@ export class DeployMethod extends BaseContractInteraction {
|
|
|
67
67
|
*/
|
|
68
68
|
send(options = {}) {
|
|
69
69
|
const txHashPromise = super.send(options).getTxHash();
|
|
70
|
-
return new DeploySentTx(this.
|
|
70
|
+
return new DeploySentTx(this.artifact, this.pxe, txHashPromise, this.completeAddress);
|
|
71
71
|
}
|
|
72
72
|
/**
|
|
73
73
|
* Simulate the request.
|
|
@@ -78,4 +78,4 @@ export class DeployMethod extends BaseContractInteraction {
|
|
|
78
78
|
return super.simulate(options);
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X21ldGhvZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdF9kZXBsb3llci9kZXBsb3lfbWV0aG9kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFFTCxzQkFBc0IsRUFDdEIsWUFBWSxFQUNaLFNBQVMsRUFDVCx5QkFBeUIsR0FDMUIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQXNDLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzVGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFPLGVBQWUsRUFBaUIsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFdkYsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFFbkYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBaUJuRDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sWUFBd0QsU0FBUSx1QkFBdUI7SUFPbEcsWUFDVSxTQUFvQixFQUNsQixHQUFRLEVBQ1YsUUFBMEIsRUFDMUIsT0FBYyxFQUFFO1FBRXhCLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUxILGNBQVMsR0FBVCxTQUFTLENBQVc7UUFDbEIsUUFBRyxHQUFILEdBQUcsQ0FBSztRQUNWLGFBQVEsR0FBUixRQUFRLENBQWtCO1FBQzFCLFNBQUksR0FBSixJQUFJLENBQVk7UUFWMUIsNENBQTRDO1FBQ3JDLG9CQUFlLEdBQXFCLFNBQVMsQ0FBQztRQVluRCxNQUFNLG1CQUFtQixHQUFHLFFBQVEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxhQUFhLENBQUMsQ0FBQztRQUNuRixJQUFJLENBQUMsbUJBQW1CO1lBQUUs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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { FieldsOf } from '@aztec/circuits.js';
|
|
2
|
-
import {
|
|
1
|
+
import { CompleteAddress, FieldsOf } from '@aztec/circuits.js';
|
|
2
|
+
import { ContractArtifact } from '@aztec/foundation/abi';
|
|
3
3
|
import { TxHash, TxReceipt } from '@aztec/types';
|
|
4
4
|
import { AztecAddress, Contract, ContractBase, PXE, SentTx, WaitOpts, Wallet } from '../index.js';
|
|
5
5
|
/** Options related to waiting for a deployment tx. */
|
|
@@ -16,8 +16,16 @@ export type DeployTxReceipt<TContract extends ContractBase = Contract> = FieldsO
|
|
|
16
16
|
* A contract deployment transaction sent to the network, extending SentTx with methods to create a contract instance.
|
|
17
17
|
*/
|
|
18
18
|
export declare class DeploySentTx<TContract extends Contract = Contract> extends SentTx {
|
|
19
|
-
private
|
|
20
|
-
|
|
19
|
+
private artifact;
|
|
20
|
+
/**
|
|
21
|
+
* The complete address of the deployed contract
|
|
22
|
+
*/
|
|
23
|
+
completeContractAddress?: CompleteAddress | undefined;
|
|
24
|
+
constructor(artifact: ContractArtifact, wallet: PXE | Wallet, txHashPromise: Promise<TxHash>,
|
|
25
|
+
/**
|
|
26
|
+
* The complete address of the deployed contract
|
|
27
|
+
*/
|
|
28
|
+
completeContractAddress?: CompleteAddress | undefined);
|
|
21
29
|
/**
|
|
22
30
|
* Awaits for the tx to be mined and returns the contract instance. Throws if tx is not mined.
|
|
23
31
|
* @param opts - Options for configuring the waiting for the tx to be mined.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_sent_tx.d.ts","sourceRoot":"","sources":["../../src/contract_deployer/deploy_sent_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy_sent_tx.d.ts","sourceRoot":"","sources":["../../src/contract_deployer/deploy_sent_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAElG,sDAAsD;AACtD,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IACxC,+GAA+G;IAC/G,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,0GAA0G;AAC1G,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,YAAY,GAAG,QAAQ,IAAI,QAAQ,CAAC,SAAS,CAAC,GAAG;IAC7F,+CAA+C;IAC/C,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAY,CAAC,SAAS,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,MAAM;IAE3E,OAAO,CAAC,QAAQ;IAIhB;;OAEG;IACI,uBAAuB,CAAC;gBAPvB,QAAQ,EAAE,gBAAgB,EAClC,MAAM,EAAE,GAAG,GAAG,MAAM,EACpB,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC;IAE9B;;OAEG;IACI,uBAAuB,CAAC,6BAAiB;IAKlD;;;;OAIG;IACU,QAAQ,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC;IAKlE;;;;OAIG;IACU,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IAM/E,SAAS,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;CAO3F"}
|
|
@@ -3,9 +3,14 @@ import { Contract, SentTx } from '../index.js';
|
|
|
3
3
|
* A contract deployment transaction sent to the network, extending SentTx with methods to create a contract instance.
|
|
4
4
|
*/
|
|
5
5
|
export class DeploySentTx extends SentTx {
|
|
6
|
-
constructor(
|
|
6
|
+
constructor(artifact, wallet, txHashPromise,
|
|
7
|
+
/**
|
|
8
|
+
* The complete address of the deployed contract
|
|
9
|
+
*/
|
|
10
|
+
completeContractAddress) {
|
|
7
11
|
super(wallet, txHashPromise);
|
|
8
|
-
this.
|
|
12
|
+
this.artifact = artifact;
|
|
13
|
+
this.completeContractAddress = completeContractAddress;
|
|
9
14
|
}
|
|
10
15
|
/**
|
|
11
16
|
* Awaits for the tx to be mined and returns the contract instance. Throws if tx is not mined.
|
|
@@ -33,7 +38,7 @@ export class DeploySentTx extends SentTx {
|
|
|
33
38
|
throw new Error(`A wallet is required for creating a contract instance`);
|
|
34
39
|
if (!address)
|
|
35
40
|
throw new Error(`Contract address is missing from transaction receipt`);
|
|
36
|
-
return Contract.at(address, this.
|
|
41
|
+
return Contract.at(address, this.artifact, contractWallet);
|
|
37
42
|
}
|
|
38
43
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X3NlbnRfdHguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RfZGVwbG95ZXIvZGVwbG95X3NlbnRfdHgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxFQUFnQixRQUFRLEVBQXFCLE1BQU0sRUFBb0IsTUFBTSxhQUFhLENBQUM7QUFjbEc7O0dBRUc7QUFDSCxNQUFNLE9BQU8sWUFBb0QsU0FBUSxNQUFNO0lBQzdFLFlBQ1UsUUFBMEIsRUFDbEMsTUFBb0IsRUFDcEIsYUFBOEI7SUFFOUI7O09BRUc7SUFDSSx1QkFBeUM7UUFFaEQsS0FBSyxDQUFDLE1BQU0sRUFBRSxhQUFhLENBQUMsQ0FBQztRQVRyQixhQUFRLEdBQVIsUUFBUSxDQUFrQjtRQU8zQiw0QkFBdUIsR0FBdkIsdUJBQXVCLENBQWtCO0lBR2xELENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUF1QjtRQUMzQyxNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdEMsT0FBTyxPQUFPLENBQUMsUUFBUSxDQUFDO0lBQzFCLENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksS0FBSyxDQUFDLElBQUksQ0FBQyxJQUF1QjtRQUN2QyxNQUFNLE9BQU8sR0FBRyxNQUFNLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdkMsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDdkYsT0FBTyxFQUFFLEdBQUcsT0FBTyxFQUFFLFFBQVEsRUFBRSxDQUFDO0lBQ2xDLENBQUM7SUFFUyxtQkFBbUIsQ0FBQyxNQUFlLEVBQUUsT0FBc0I7UUFDbkUsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFpQixFQUFpQixFQUFFLENBQUMsQ0FBQyxDQUFFLEdBQWMsQ0FBQyx3QkFBd0IsQ0FBQztRQUNsRyxNQUFNLGNBQWMsR0FBRyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNsRSxJQUFJLENBQUMsY0FBYztZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsdURBQXVELENBQUMsQ0FBQztRQUM5RixJQUFJLENBQUMsT0FBTztZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsc0RBQXNELENBQUMsQ0FBQztRQUN0RixPQUFPLFFBQVEsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxRQUFRLEVBQUUsY0FBYyxDQUF1QixDQUFDO0lBQ25GLENBQUM7Q0FDRiJ9
|
package/dest/index.d.ts
CHANGED
|
@@ -6,8 +6,8 @@ export * from './account/index.js';
|
|
|
6
6
|
export * from './contract_deployer/deploy_method.js';
|
|
7
7
|
export * from './sandbox/index.js';
|
|
8
8
|
export * from './wallet/index.js';
|
|
9
|
-
export { AztecAddress, EthAddress, Point, Fr, GrumpkinScalar } from '@aztec/circuits.js';
|
|
10
|
-
export { PXE, ContractData, ExtendedContractData as ExtendedContractData, DeployedContract, FunctionCall, L2BlockL2Logs, UnencryptedL2Log, NodeInfo, NotePreimage, PackedArguments, PublicKey, GrumpkinPrivateKey, SyncStatus, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, emptyFunctionCall, } from '@aztec/types';
|
|
9
|
+
export { AztecAddress, EthAddress, Point, Fr, FunctionSelector, GrumpkinScalar } from '@aztec/circuits.js';
|
|
10
|
+
export { PXE, ContractData, ExtendedContractData as ExtendedContractData, DeployedContract, FunctionCall, L2BlockL2Logs, LogFilter, UnencryptedL2Log, NodeInfo, NotePreimage, PackedArguments, PublicKey, GrumpkinPrivateKey, SyncStatus, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, emptyFunctionCall, } from '@aztec/types';
|
|
11
11
|
export { createDebugLogger, DebugLogger } from '@aztec/foundation/log';
|
|
12
12
|
export { fileURLToPath } from '@aztec/foundation/url';
|
|
13
13
|
export { sleep } from '@aztec/foundation/sleep';
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sCAAsC,CAAC;AACrD,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sCAAsC,CAAC;AACrD,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAIlC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3G,OAAO,EACL,GAAG,EACH,YAAY,EACZ,oBAAoB,IAAI,oBAAoB,EAC5C,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,SAAS,EACT,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,eAAe,EACf,SAAS,EACT,kBAAkB,EAClB,UAAU,EACV,EAAE,EACF,kBAAkB,EAClB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,iBAAiB,GAClB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -6,9 +6,11 @@ export * from './account/index.js';
|
|
|
6
6
|
export * from './contract_deployer/deploy_method.js';
|
|
7
7
|
export * from './sandbox/index.js';
|
|
8
8
|
export * from './wallet/index.js';
|
|
9
|
-
|
|
9
|
+
// TODO https://github.com/AztecProtocol/aztec-packages/issues/2632 --> FunctionSelector might not need to be exposed
|
|
10
|
+
// here once the issue is resolved.
|
|
11
|
+
export { AztecAddress, EthAddress, Point, Fr, FunctionSelector, GrumpkinScalar } from '@aztec/circuits.js';
|
|
10
12
|
export { ContractData, ExtendedContractData as ExtendedContractData, L2BlockL2Logs, UnencryptedL2Log, NotePreimage, PackedArguments, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, emptyFunctionCall, } from '@aztec/types';
|
|
11
13
|
export { createDebugLogger } from '@aztec/foundation/log';
|
|
12
14
|
export { fileURLToPath } from '@aztec/foundation/url';
|
|
13
15
|
export { sleep } from '@aztec/foundation/sleep';
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsc0NBQXNDLENBQUM7QUFDckQsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLG1CQUFtQixDQUFDO0FBRWxDLHFIQUFxSDtBQUNySCxtQ0FBbUM7QUFDbkMsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxnQkFBZ0IsRUFBRSxjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUMzRyxPQUFPLEVBRUwsWUFBWSxFQUNaLG9CQUFvQixJQUFJLG9CQUFvQixFQUc1QyxhQUFhLEVBRWIsZ0JBQWdCLEVBRWhCLFlBQVksRUFDWixlQUFlLEVBSWYsRUFBRSxFQUNGLGtCQUFrQixFQUNsQixNQUFNLEVBQ04sU0FBUyxFQUNULFFBQVEsRUFDUixpQkFBaUIsR0FDbEIsTUFBTSxjQUFjLENBQUM7QUFFdEIsT0FBTyxFQUFFLGlCQUFpQixFQUFlLE1BQU0sdUJBQXVCLENBQUM7QUFDdkUsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3RELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQyJ9
|
package/dest/pxe_client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pxe_client.d.ts","sourceRoot":"","sources":["../src/pxe_client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pxe_client.d.ts","sourceRoot":"","sources":["../src/pxe_client.ts"],"names":[],"mappings":"AAUA,OAAO,EASL,GAAG,EAKJ,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,eAAO,MAAM,eAAe,QAAS,MAAM,qGAAuC,GAwB/E,CAAC"}
|
package/dest/pxe_client.js
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
import { AztecAddress, CompleteAddress, EthAddress, Fr, GrumpkinScalar, Point } from '@aztec/circuits.js';
|
|
1
|
+
import { AztecAddress, CompleteAddress, EthAddress, Fr, FunctionSelector, GrumpkinScalar, Point, } from '@aztec/circuits.js';
|
|
2
2
|
import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
3
|
-
import { AuthWitness, ContractData, ExtendedContractData, L2BlockL2Logs, L2Tx, NotePreimage, Tx, TxExecutionRequest, TxHash, TxReceipt, } from '@aztec/types';
|
|
3
|
+
import { AuthWitness, ContractData, ExtendedContractData, ExtendedUnencryptedL2Log, L2BlockL2Logs, L2Tx, LogId, NotePreimage, Tx, TxExecutionRequest, TxHash, TxReceipt, } from '@aztec/types';
|
|
4
4
|
export { makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
5
5
|
export const createPXEClient = (url, fetch = makeFetch([1, 2, 3], true)) => createJsonRpcClient(url, {
|
|
6
6
|
CompleteAddress,
|
|
7
|
+
FunctionSelector,
|
|
7
8
|
AztecAddress,
|
|
8
9
|
TxExecutionRequest,
|
|
9
10
|
ContractData,
|
|
10
11
|
ExtendedContractData,
|
|
12
|
+
ExtendedUnencryptedL2Log,
|
|
11
13
|
TxHash,
|
|
12
14
|
EthAddress,
|
|
13
15
|
Point,
|
|
@@ -16,5 +18,6 @@ export const createPXEClient = (url, fetch = makeFetch([1, 2, 3], true)) => crea
|
|
|
16
18
|
NotePreimage,
|
|
17
19
|
AuthWitness,
|
|
18
20
|
L2Tx,
|
|
21
|
+
LogId,
|
|
19
22
|
}, { Tx, TxReceipt, L2BlockL2Logs }, false, fetch);
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHhlX2NsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9weGVfY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxZQUFZLEVBQ1osZUFBZSxFQUNmLFVBQVUsRUFDVixFQUFFLEVBQ0YsZ0JBQWdCLEVBQ2hCLGNBQWMsRUFDZCxLQUFLLEdBQ04sTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsU0FBUyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDbkYsT0FBTyxFQUNMLFdBQVcsRUFDWCxZQUFZLEVBQ1osb0JBQW9CLEVBQ3BCLHdCQUF3QixFQUN4QixhQUFhLEVBQ2IsSUFBSSxFQUNKLEtBQUssRUFDTCxZQUFZLEVBRVosRUFBRSxFQUNGLGtCQUFrQixFQUNsQixNQUFNLEVBQ04sU0FBUyxHQUNWLE1BQU0sY0FBYyxDQUFDO0FBRXRCLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUU5RCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsQ0FBQyxHQUFXLEVBQUUsS0FBSyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLEVBQU8sRUFBRSxDQUN0RixtQkFBbUIsQ0FDakIsR0FBRyxFQUNIO0lBQ0UsZUFBZTtJQUNmLGdCQUFnQjtJQUNoQixZQUFZO0lBQ1osa0JBQWtCO0lBQ2xCLFlBQVk7SUFDWixvQkFBb0I7SUFDcEIsd0JBQXdCO0lBQ3hCLE1BQU07SUFDTixVQUFVO0lBQ1YsS0FBSztJQUNMLEVBQUU7SUFDRixjQUFjO0lBQ2QsWUFBWTtJQUNaLFdBQVc7SUFDWCxJQUFJO0lBQ0osS0FBSztDQUNOLEVBQ0QsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxFQUNoQyxLQUFLLEVBQ0wsS0FBSyxDQUNOLENBQUMifQ==
|
package/dest/sandbox/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sandbox/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAM9D,OAAO,EAAE,2BAA2B,EAAE,GAAG,EAAsC,MAAM,aAAa,CAAC;AAEnG,eAAO,MAAM,+BAA+B,kBAI3C,CAAC;AAEF,eAAO,MAAM,4BAA4B,kBAAkC,CAAC;AAE5E,eAAO,MAAM,qBAAqB,MAA8B,CAAC;AAEjE,eAAO,MAAM,oCAAoC
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sandbox/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAM9D,OAAO,EAAE,2BAA2B,EAAE,GAAG,EAAsC,MAAM,aAAa,CAAC;AAEnG,eAAO,MAAM,+BAA+B,kBAI3C,CAAC;AAEF,eAAO,MAAM,4BAA4B,kBAAkC,CAAC;AAE5E,eAAO,MAAM,qBAAqB,MAA8B,CAAC;AAEjE,eAAO,MAAM,oCAAoC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAiC,CAAC;AAEnF,eAAO,MAAQ,OAAO,QAA0C,CAAC;AAEjE;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAM1F;AAED;;;;GAIG;AACH,wBAAsB,4BAA4B,CAAC,GAAG,EAAE,GAAG;;;KA4B1D;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,GAAG,CAAC,EAAE,GAAG,iBAU7C"}
|
package/dest/sandbox/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
|
|
2
2
|
import { sleep } from '@aztec/foundation/sleep';
|
|
3
3
|
import zip from 'lodash.zip';
|
|
4
|
-
import
|
|
4
|
+
import SchnorrAccountContractArtifact from '../artifacts/schnorr_account_contract.json' assert { type: 'json' };
|
|
5
5
|
import { createPXEClient, getSchnorrAccount } from '../index.js';
|
|
6
6
|
export const INITIAL_SANDBOX_ENCRYPTION_KEYS = [
|
|
7
7
|
GrumpkinScalar.fromString('2153536ff6628eee01cf4024889ff977a18d9fa61d0e414422f7681cf085c281'),
|
|
@@ -10,7 +10,7 @@ export const INITIAL_SANDBOX_ENCRYPTION_KEYS = [
|
|
|
10
10
|
];
|
|
11
11
|
export const INITIAL_SANDBOX_SIGNING_KEYS = INITIAL_SANDBOX_ENCRYPTION_KEYS;
|
|
12
12
|
export const INITIAL_SANDBOX_SALTS = [Fr.ZERO, Fr.ZERO, Fr.ZERO];
|
|
13
|
-
export const INITIAL_SANDBOX_ACCOUNT_CONTRACT_ABI =
|
|
13
|
+
export const INITIAL_SANDBOX_ACCOUNT_CONTRACT_ABI = SchnorrAccountContractArtifact;
|
|
14
14
|
export const { PXE_URL = 'http://localhost:8080' } = process.env;
|
|
15
15
|
/**
|
|
16
16
|
* Gets a collection of wallets for the Aztec accounts that are initially stored in the sandbox.
|
|
@@ -66,4 +66,4 @@ export async function waitForSandbox(pxe) {
|
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2FuZGJveC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLGNBQWMsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVoRCxPQUFPLEdBQUcsTUFBTSxZQUFZLENBQUM7QUFFN0IsT0FBTyw4QkFBOEIsTUFBTSw0Q0FBNEMsQ0FBQyxTQUFTLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQztBQUNoSCxPQUFPLEVBQW9DLGVBQWUsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVuRyxNQUFNLENBQUMsTUFBTSwrQkFBK0IsR0FBRztJQUM3QyxjQUFjLENBQUMsVUFBVSxDQUFDLGtFQUFrRSxDQUFDO0lBQzdGLGNBQWMsQ0FBQyxVQUFVLENBQUMsaUVBQWlFLENBQUM7SUFDNUYsY0FBYyxDQUFDLFVBQVUsQ0FBQyxrRUFBa0UsQ0FBQztDQUM5RixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sNEJBQTRCLEdBQUcsK0JBQStCLENBQUM7QUFFNUUsTUFBTSxDQUFDLE1BQU0scUJBQXFCLEdBQUcsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO0FBRWpFLE1BQU0sQ0FBQyxNQUFNLG9DQUFvQyxHQUFHLDhCQUE4QixDQUFDO0FBRW5GLE1BQU0sQ0FBQyxNQUFNLEVBQUUsT0FBTyxHQUFHLHVCQUF1QixFQUFFLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztBQUVqRTs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLHlCQUF5QixDQUFDLEdBQVE7SUFDaEQsT0FBTyxPQUFPLENBQUMsR0FBRyxDQUNoQixHQUFHLENBQUMsK0JBQStCLEVBQUUsNEJBQTRCLEVBQUUscUJBQXFCLENBQUMsQ0FBQyxHQUFHLENBQzNGLENBQUMsQ0FBQyxhQUFhLEVBQUUsVUFBVSxFQUFFLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLEVBQUUsYUFBYyxFQUFFLFVBQVcsRUFBRSxJQUFJLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FDN0csQ0FDRixDQUFDO0FBQ0osQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLDRCQUE0QixDQUFDLEdBQVE7SUFDekQsTUFBTSxRQUFRLEdBQUcsK0JBQStCLENBQUMsR0FBRyxDQUFDLENBQUMsVUFBVSxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQ3JFLE1BQU0sT0FBTyxHQUFHLGlCQUFpQixDQUFDLEdBQUcsRUFBRSxVQUFVLEVBQUUsNEJBQTRCLENBQUMsQ0FBQyxDQUFDLEVBQUUscUJBQXFCLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUM5RyxPQUFPO1lBQ0wsT0FBTztZQUNQLFVBQVU7U0FDWCxDQUFDO0lBQ0osQ0FBQyxDQUFDLENBQUM7SUFDSCxpREFBaUQ7SUFDakQsTUFBTSxhQUFhLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUNyQyxRQUFRLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBQyxDQUFDLEVBQUMsRUFBRTtRQUNyQixNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsQ0FBQyxPQUFPLENBQUMsZUFBZSxFQUFFLENBQUM7UUFDdkQsTUFBTSxZQUFZLENBQUMsTUFBTSxDQUFDLEVBQUUsbUJBQW1CLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ25FLE1BQU0sWUFBWSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNoQyxPQUFPLFlBQVksQ0FBQztJQUN0QixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0YsMERBQTBEO0lBQzFELE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEVBQUU7UUFDckMsT0FBTyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDSCxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQ2YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQzFCLE1BQU0sTUFBTSxHQUFHLE1BQU0sUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUNyRCxPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBQzdCLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDRixPQUFPLFFBQVEsQ0FBQztBQUNsQixDQUFDO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxjQUFjLENBQUMsR0FBUztJQUM1QyxHQUFHLEdBQUcsR0FBRyxJQUFJLGVBQWUsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN0QyxPQUFPLElBQUksRUFBRTtRQUNYLElBQUk7WUFDRixNQUFNLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4QixNQUFNO1NBQ1A7UUFBQyxPQUFPLEdBQUcsRUFBRTtZQUNaLE1BQU0sS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ25CO0tBQ0Y7QUFDSCxDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authwit.d.ts","sourceRoot":"","sources":["../../src/utils/authwit.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAgC,MAAM,oBAAoB,CAAC;AAEhF,OAAO,EAAE,YAAY,EAAmB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"authwit.d.ts","sourceRoot":"","sources":["../../src/utils/authwit.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAgC,MAAM,oBAAoB,CAAC;AAEhF,OAAO,EAAE,YAAY,EAAmB,MAAM,cAAc,CAAC;AAG7D;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,WAAkB,YAAY,WAAW,YAAY,oBAY1F,CAAC"}
|
package/dest/utils/authwit.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CircuitsWasm, GeneratorIndex } from '@aztec/circuits.js';
|
|
2
2
|
import { pedersenPlookupCompressWithHashIndex } from '@aztec/circuits.js/barretenberg';
|
|
3
3
|
import { PackedArguments } from '@aztec/types';
|
|
4
|
+
// docs:start:authwit_computeAuthWitMessageHash
|
|
4
5
|
/**
|
|
5
6
|
* Compute an authentication witness message hash from a caller and a request
|
|
6
7
|
* H(caller: AztecAddress, target: AztecAddress, selector: Field, args_hash: Field)
|
|
@@ -17,4 +18,5 @@ export const computeAuthWitMessageHash = async (caller, request) => {
|
|
|
17
18
|
(await PackedArguments.fromArgs(request.args, wasm)).hash,
|
|
18
19
|
].map(fr => fr.toBuffer()), GeneratorIndex.SIGNATURE_PAYLOAD);
|
|
19
20
|
};
|
|
20
|
-
|
|
21
|
+
// docs:end:authwit_computeAuthWitMessageHash
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aHdpdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9hdXRod2l0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBZ0IsWUFBWSxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2hGLE9BQU8sRUFBRSxvQ0FBb0MsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3ZGLE9BQU8sRUFBZ0IsZUFBZSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRTdELCtDQUErQztBQUMvQzs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBRyxLQUFLLEVBQUUsTUFBb0IsRUFBRSxPQUFxQixFQUFFLEVBQUU7SUFDN0YsTUFBTSxJQUFJLEdBQUcsTUFBTSxZQUFZLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDdEMsT0FBTyxvQ0FBb0MsQ0FDekMsSUFBSSxFQUNKO1FBQ0UsTUFBTSxDQUFDLE9BQU8sRUFBRTtRQUNoQixPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRTtRQUNwQixPQUFPLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUU7UUFDdkMsQ0FBQyxNQUFNLGVBQWUsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUk7S0FDMUQsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUMsRUFDMUIsY0FBYyxDQUFDLGlCQUFpQixDQUNqQyxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBQ0YsNkNBQTZDIn0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AztecAddress, Fr, GrumpkinPrivateKey, PartialAddress } from '@aztec/circuits.js';
|
|
2
|
-
import { AuthWitness, ContractData, DeployedContract, ExtendedContractData, FunctionCall,
|
|
2
|
+
import { AuthWitness, ContractData, DeployedContract, ExtendedContractData, FunctionCall, GetUnencryptedLogsResponse, L2Tx, LogFilter, NodeInfo, NotePreimage, PXE, SyncStatus, Tx, TxExecutionRequest, TxHash, TxReceipt } from '@aztec/types';
|
|
3
3
|
import { CompleteAddress } from '../index.js';
|
|
4
4
|
import { Wallet } from './index.js';
|
|
5
5
|
/**
|
|
@@ -30,7 +30,7 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
30
30
|
viewTx(functionName: string, args: any[], to: AztecAddress, from?: AztecAddress | undefined): Promise<any>;
|
|
31
31
|
getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
|
|
32
32
|
getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined>;
|
|
33
|
-
getUnencryptedLogs(
|
|
33
|
+
getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse>;
|
|
34
34
|
getBlockNumber(): Promise<number>;
|
|
35
35
|
getNodeInfo(): Promise<NodeInfo>;
|
|
36
36
|
isGlobalStateSynchronized(): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/base_wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EACL,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/base_wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EACL,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACZ,0BAA0B,EAC1B,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,GAAG,EACH,UAAU,EACV,EAAE,EACF,kBAAkB,EAClB,MAAM,EACN,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC;;GAEG;AACH,8BAAsB,UAAW,YAAW,MAAM;IACpC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG;gBAAR,GAAG,EAAE,GAAG;IAEvC,QAAQ,CAAC,kBAAkB,IAAI,eAAe;IAE9C,QAAQ,CAAC,wBAAwB,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAErF,QAAQ,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAE7D,eAAe,CAAC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAGtG,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAG1D,qBAAqB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAGnD,oBAAoB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAGjF,aAAa,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAG3C,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAGzE,YAAY,CAAC,SAAS,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAG1D,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAGvC,UAAU,CAAC,SAAS,EAAE,kBAAkB,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC;IAG/E,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAG/B,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAGhD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAGhD,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAG1G,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAGzE,OAAO,CACL,OAAO,EAAE,YAAY,EACrB,QAAQ,EAAE,YAAY,EACtB,WAAW,EAAE,EAAE,EACf,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,EAAE,GACT,OAAO,CAAC,IAAI,CAAC;IAGhB,aAAa,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAG7G,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC;IAG1G,uBAAuB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAGjG,eAAe,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAGjF,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAG1E,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAGjC,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;IAGhC,yBAAyB;IAGzB,0BAA0B,CAAC,OAAO,EAAE,YAAY;IAGhD,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC;IAGpC,cAAc,CAAC,WAAW,EAAE,WAAW;CAGxC"}
|
|
@@ -62,8 +62,8 @@ export class BaseWallet {
|
|
|
62
62
|
getContractData(contractAddress) {
|
|
63
63
|
return this.pxe.getContractData(contractAddress);
|
|
64
64
|
}
|
|
65
|
-
getUnencryptedLogs(
|
|
66
|
-
return this.pxe.getUnencryptedLogs(
|
|
65
|
+
getUnencryptedLogs(filter) {
|
|
66
|
+
return this.pxe.getUnencryptedLogs(filter);
|
|
67
67
|
}
|
|
68
68
|
getBlockNumber() {
|
|
69
69
|
return this.pxe.getBlockNumber();
|
|
@@ -84,4 +84,4 @@ export class BaseWallet {
|
|
|
84
84
|
return this.pxe.addAuthWitness(authWitness);
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV93YWxsZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2Jhc2Vfd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXVCQTs7R0FFRztBQUNILE1BQU0sT0FBZ0IsVUFBVTtJQUM5QixZQUErQixHQUFRO1FBQVIsUUFBRyxHQUFILEdBQUcsQ0FBSztJQUFHLENBQUM7SUFRM0MsZUFBZSxDQUFDLE9BQTJCLEVBQUUsY0FBOEI7UUFDekUsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxPQUFPLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDM0QsQ0FBQztJQUNELGlCQUFpQixDQUFDLE9BQXdCO1FBQ3hDLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBQ0QscUJBQXFCO1FBQ25CLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDO0lBQzFDLENBQUM7SUFDRCxvQkFBb0IsQ0FBQyxPQUFxQjtRQUN4QyxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUNELGFBQWE7UUFDWCxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsYUFBYSxFQUFFLENBQUM7SUFDbEMsQ0FBQztJQUNELFlBQVksQ0FBQyxPQUFxQjtRQUNoQyxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFDRCxZQUFZLENBQUMsU0FBNkI7UUFDeEMsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBQ0QsWUFBWTtRQUNWLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUNqQyxDQUFDO0lBQ0QsVUFBVSxDQUFDLFNBQTZC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
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec.js",
|
|
3
3
|
"homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js",
|
|
4
|
-
"version": "0.8.
|
|
4
|
+
"version": "0.8.11",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
"node": "./dest/index.js",
|
|
@@ -38,10 +38,10 @@
|
|
|
38
38
|
"rootDir": "./src"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@aztec/circuits.js": "0.8.
|
|
42
|
-
"@aztec/ethereum": "0.8.
|
|
43
|
-
"@aztec/foundation": "0.8.
|
|
44
|
-
"@aztec/types": "0.8.
|
|
41
|
+
"@aztec/circuits.js": "0.8.11",
|
|
42
|
+
"@aztec/ethereum": "0.8.11",
|
|
43
|
+
"@aztec/foundation": "0.8.11",
|
|
44
|
+
"@aztec/types": "0.8.11",
|
|
45
45
|
"lodash.every": "^4.6.0",
|
|
46
46
|
"lodash.partition": "^4.6.0",
|
|
47
47
|
"lodash.zip": "^4.2.0",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ContractArtifact } from '@aztec/foundation/abi';
|
|
2
2
|
import { CompleteAddress, NodeInfo } from '@aztec/types';
|
|
3
3
|
|
|
4
4
|
import { DefaultAccountInterface } from '../defaults/default_interface.js';
|
|
@@ -13,10 +13,10 @@ export abstract class BaseAccountContract implements AccountContract {
|
|
|
13
13
|
abstract getAuthWitnessProvider(address: CompleteAddress): AuthWitnessProvider;
|
|
14
14
|
abstract getDeploymentArgs(): Promise<any[]>;
|
|
15
15
|
|
|
16
|
-
constructor(private
|
|
16
|
+
constructor(private artifact: ContractArtifact) {}
|
|
17
17
|
|
|
18
|
-
|
|
19
|
-
return this.
|
|
18
|
+
getContractArtifact(): ContractArtifact {
|
|
19
|
+
return this.artifact;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
getInterface(address: CompleteAddress, nodeInfo: NodeInfo): Promise<AccountInterface> {
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Ecdsa } from '@aztec/circuits.js/barretenberg';
|
|
2
|
-
import {
|
|
2
|
+
import { ContractArtifact } from '@aztec/foundation/abi';
|
|
3
3
|
import { Fr } from '@aztec/foundation/fields';
|
|
4
4
|
import { AuthWitness, CompleteAddress } from '@aztec/types';
|
|
5
5
|
|
|
6
|
-
import
|
|
6
|
+
import EcdsaAccountContractArtifact from '../../artifacts/ecdsa_account_contract.json' assert { type: 'json' };
|
|
7
7
|
import { AuthWitnessProvider } from '../interface.js';
|
|
8
8
|
import { BaseAccountContract } from './base_account_contract.js';
|
|
9
9
|
|
|
@@ -13,7 +13,7 @@ import { BaseAccountContract } from './base_account_contract.js';
|
|
|
13
13
|
*/
|
|
14
14
|
export class EcdsaAccountContract extends BaseAccountContract {
|
|
15
15
|
constructor(private signingPrivateKey: Buffer) {
|
|
16
|
-
super(
|
|
16
|
+
super(EcdsaAccountContractArtifact as ContractArtifact);
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
async getDeploymentArgs() {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ContractArtifact } from '@aztec/foundation/abi';
|
|
2
2
|
import { CompleteAddress, NodeInfo } from '@aztec/types';
|
|
3
3
|
|
|
4
4
|
import { AccountInterface } from '../interface.js';
|
|
@@ -10,14 +10,14 @@ export * from './base_account_contract.js';
|
|
|
10
10
|
|
|
11
11
|
// docs:start:account-contract-interface
|
|
12
12
|
/**
|
|
13
|
-
* An account contract instance. Knows its
|
|
13
|
+
* An account contract instance. Knows its artifact, deployment arguments, how to create
|
|
14
14
|
* transaction execution requests out of function calls, and how to authorize actions.
|
|
15
15
|
*/
|
|
16
16
|
export interface AccountContract {
|
|
17
17
|
/**
|
|
18
|
-
* Returns the
|
|
18
|
+
* Returns the artifact of this account contract.
|
|
19
19
|
*/
|
|
20
|
-
|
|
20
|
+
getContractArtifact(): ContractArtifact;
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
23
|
* Returns the deployment arguments for this instance.
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Schnorr } from '@aztec/circuits.js/barretenberg';
|
|
2
|
-
import {
|
|
2
|
+
import { ContractArtifact } from '@aztec/foundation/abi';
|
|
3
3
|
import { Fr } from '@aztec/foundation/fields';
|
|
4
4
|
import { AuthWitness, CompleteAddress, GrumpkinPrivateKey } from '@aztec/types';
|
|
5
5
|
|
|
6
|
-
import
|
|
6
|
+
import SchnorrAccountContractArtifact from '../../artifacts/schnorr_account_contract.json' assert { type: 'json' };
|
|
7
7
|
import { AuthWitnessProvider } from '../interface.js';
|
|
8
8
|
import { BaseAccountContract } from './base_account_contract.js';
|
|
9
9
|
|
|
@@ -13,7 +13,7 @@ import { BaseAccountContract } from './base_account_contract.js';
|
|
|
13
13
|
*/
|
|
14
14
|
export class SchnorrAccountContract extends BaseAccountContract {
|
|
15
15
|
constructor(private signingPrivateKey: GrumpkinPrivateKey) {
|
|
16
|
-
super(
|
|
16
|
+
super(SchnorrAccountContractArtifact as ContractArtifact);
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
async getDeploymentArgs() {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { PartialAddress } from '@aztec/circuits.js';
|
|
2
2
|
import { Schnorr } from '@aztec/circuits.js/barretenberg';
|
|
3
|
-
import {
|
|
3
|
+
import { ContractArtifact } from '@aztec/foundation/abi';
|
|
4
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import { AuthWitness, CompleteAddress, GrumpkinPrivateKey } from '@aztec/types';
|
|
6
6
|
|
|
7
|
-
import
|
|
7
|
+
import SchnorrSingleKeyAccountContractArtifact from '../../artifacts/schnorr_single_key_account_contract.json' assert { type: 'json' };
|
|
8
8
|
import { generatePublicKey } from '../../index.js';
|
|
9
9
|
import { AuthWitnessProvider } from '../interface.js';
|
|
10
10
|
import { BaseAccountContract } from './base_account_contract.js';
|
|
@@ -15,7 +15,7 @@ import { BaseAccountContract } from './base_account_contract.js';
|
|
|
15
15
|
*/
|
|
16
16
|
export class SingleKeyAccountContract extends BaseAccountContract {
|
|
17
17
|
constructor(private encryptionPrivateKey: GrumpkinPrivateKey) {
|
|
18
|
-
super(
|
|
18
|
+
super(SchnorrSingleKeyAccountContractArtifact as ContractArtifact);
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
getDeploymentArgs(): Promise<any[]> {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AztecAddress, Fr, FunctionData, TxContext } from '@aztec/circuits.js';
|
|
2
|
-
import {
|
|
2
|
+
import { FunctionAbi, encodeArguments } from '@aztec/foundation/abi';
|
|
3
3
|
import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/types';
|
|
4
4
|
|
|
5
5
|
import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from '../../utils/defaults.js';
|
|
@@ -97,6 +97,6 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
|
|
|
97
97
|
},
|
|
98
98
|
],
|
|
99
99
|
returnTypes: [],
|
|
100
|
-
} as
|
|
100
|
+
} as FunctionAbi;
|
|
101
101
|
}
|
|
102
102
|
}
|
|
@@ -64,7 +64,7 @@ export class AccountManager {
|
|
|
64
64
|
if (!this.completeAddress) {
|
|
65
65
|
const encryptionPublicKey = await generatePublicKey(this.encryptionPrivateKey);
|
|
66
66
|
const contractDeploymentInfo = await getContractDeploymentInfo(
|
|
67
|
-
this.accountContract.
|
|
67
|
+
this.accountContract.getContractArtifact(),
|
|
68
68
|
await this.accountContract.getDeploymentArgs(),
|
|
69
69
|
this.salt!,
|
|
70
70
|
encryptionPublicKey,
|
|
@@ -107,7 +107,7 @@ export class AccountManager {
|
|
|
107
107
|
if (!this.salt) throw new Error(`Cannot deploy account contract without known salt.`);
|
|
108
108
|
await this.register();
|
|
109
109
|
const encryptionPublicKey = await this.getEncryptionPublicKey();
|
|
110
|
-
const deployer = new ContractDeployer(this.accountContract.
|
|
110
|
+
const deployer = new ContractDeployer(this.accountContract.getContractArtifact(), this.pxe, encryptionPublicKey);
|
|
111
111
|
const args = await this.accountContract.getDeploymentArgs();
|
|
112
112
|
this.deployMethod = deployer.deploy(...args);
|
|
113
113
|
}
|