@aztec/accounts 0.0.0-test.0 → 0.0.1-commit.03f7ef2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/artifacts/EcdsaKAccount.json +4967 -3959
- package/artifacts/EcdsaRAccount.json +5259 -4251
- package/artifacts/SchnorrAccount.json +5271 -4131
- package/artifacts/SchnorrSingleKeyAccount.json +3162 -2408
- package/artifacts/SimulatedAccount.d.json.ts +3 -0
- package/artifacts/SimulatedAccount.json +4635 -0
- package/dest/defaults/account_contract.d.ts +10 -5
- package/dest/defaults/account_contract.d.ts.map +1 -1
- package/dest/defaults/account_contract.js +2 -2
- package/dest/defaults/account_interface.d.ts +8 -7
- package/dest/defaults/account_interface.d.ts.map +1 -1
- package/dest/defaults/account_interface.js +6 -7
- package/dest/defaults/index.d.ts +2 -2
- package/dest/defaults/index.js +1 -1
- package/dest/ecdsa/ecdsa_k/account_contract.d.ts +5 -4
- package/dest/ecdsa/ecdsa_k/account_contract.d.ts.map +1 -1
- package/dest/ecdsa/ecdsa_k/account_contract.js +9 -6
- package/dest/ecdsa/ecdsa_k/index.d.ts +1 -25
- package/dest/ecdsa/ecdsa_k/index.d.ts.map +1 -1
- package/dest/ecdsa/ecdsa_k/index.js +2 -23
- package/dest/ecdsa/ecdsa_k/lazy.d.ts +1 -25
- package/dest/ecdsa/ecdsa_k/lazy.d.ts.map +1 -1
- package/dest/ecdsa/ecdsa_k/lazy.js +5 -26
- package/dest/ecdsa/ecdsa_r/account_contract.d.ts +19 -0
- package/dest/ecdsa/ecdsa_r/account_contract.d.ts.map +1 -0
- package/dest/ecdsa/ecdsa_r/account_contract.js +41 -0
- package/dest/ecdsa/ecdsa_r/index.d.ts +19 -0
- package/dest/ecdsa/ecdsa_r/index.d.ts.map +1 -0
- package/dest/ecdsa/ecdsa_r/index.js +23 -0
- package/dest/ecdsa/ecdsa_r/lazy.d.ts +23 -0
- package/dest/ecdsa/ecdsa_r/lazy.d.ts.map +1 -0
- package/dest/ecdsa/ecdsa_r/lazy.js +31 -0
- package/dest/ecdsa/index.d.ts +2 -1
- package/dest/ecdsa/index.d.ts.map +1 -1
- package/dest/ecdsa/index.js +1 -0
- package/dest/ecdsa/lazy.d.ts +2 -1
- package/dest/ecdsa/lazy.d.ts.map +1 -1
- package/dest/ecdsa/lazy.js +1 -0
- package/dest/ecdsa/ssh_ecdsa_r/account_contract.d.ts +5 -4
- package/dest/ecdsa/ssh_ecdsa_r/account_contract.d.ts.map +1 -1
- package/dest/ecdsa/ssh_ecdsa_r/account_contract.js +9 -6
- package/dest/ecdsa/ssh_ecdsa_r/index.d.ts +2 -27
- package/dest/ecdsa/ssh_ecdsa_r/index.d.ts.map +1 -1
- package/dest/ecdsa/ssh_ecdsa_r/index.js +3 -28
- package/dest/ecdsa/ssh_ecdsa_r/lazy.d.ts +2 -30
- package/dest/ecdsa/ssh_ecdsa_r/lazy.d.ts.map +1 -1
- package/dest/ecdsa/ssh_ecdsa_r/lazy.js +3 -38
- package/dest/schnorr/account_contract.d.ts +7 -3
- package/dest/schnorr/account_contract.d.ts.map +1 -1
- package/dest/schnorr/account_contract.js +9 -6
- package/dest/schnorr/index.d.ts +4 -38
- package/dest/schnorr/index.d.ts.map +1 -1
- package/dest/schnorr/index.js +2 -33
- package/dest/schnorr/lazy.d.ts +4 -38
- package/dest/schnorr/lazy.d.ts.map +1 -1
- package/dest/schnorr/lazy.js +5 -36
- package/dest/single_key/account_contract.d.ts +3 -3
- package/dest/single_key/account_contract.d.ts.map +1 -1
- package/dest/single_key/account_contract.js +2 -2
- package/dest/single_key/index.d.ts +2 -21
- package/dest/single_key/index.d.ts.map +1 -1
- package/dest/single_key/index.js +2 -24
- package/dest/single_key/lazy.d.ts +2 -21
- package/dest/single_key/lazy.d.ts.map +1 -1
- package/dest/single_key/lazy.js +5 -27
- package/dest/stub/account_contract.d.ts +29 -0
- package/dest/stub/account_contract.d.ts.map +1 -0
- package/dest/stub/account_contract.js +30 -0
- package/dest/stub/index.d.ts +21 -0
- package/dest/stub/index.d.ts.map +1 -0
- package/dest/stub/index.js +29 -0
- package/dest/stub/lazy.d.ts +23 -0
- package/dest/stub/lazy.d.ts.map +1 -0
- package/dest/stub/lazy.js +35 -0
- package/dest/testing/configuration.d.ts +5 -4
- package/dest/testing/configuration.d.ts.map +1 -1
- package/dest/testing/configuration.js +1 -1
- package/dest/testing/index.d.ts +6 -30
- package/dest/testing/index.d.ts.map +1 -1
- package/dest/testing/index.js +18 -30
- package/dest/testing/lazy.d.ts +5 -28
- package/dest/testing/lazy.d.ts.map +1 -1
- package/dest/testing/lazy.js +19 -30
- package/dest/utils/index.d.ts +1 -1
- package/dest/utils/ssh_agent.d.ts +2 -5
- package/dest/utils/ssh_agent.d.ts.map +1 -1
- package/package.json +26 -20
- package/src/defaults/account_contract.ts +13 -5
- package/src/defaults/account_interface.ts +16 -12
- package/src/defaults/index.ts +1 -1
- package/src/ecdsa/ecdsa_k/account_contract.ts +7 -4
- package/src/ecdsa/ecdsa_k/index.ts +1 -33
- package/src/ecdsa/ecdsa_k/lazy.ts +4 -36
- package/src/ecdsa/ecdsa_r/account_contract.ts +42 -0
- package/src/ecdsa/ecdsa_r/index.ts +31 -0
- package/src/ecdsa/ecdsa_r/lazy.ts +39 -0
- package/src/ecdsa/index.ts +1 -0
- package/src/ecdsa/lazy.ts +1 -0
- package/src/ecdsa/ssh_ecdsa_r/account_contract.ts +7 -4
- package/src/ecdsa/ssh_ecdsa_r/index.ts +3 -42
- package/src/ecdsa/ssh_ecdsa_r/lazy.ts +3 -53
- package/src/schnorr/account_contract.ts +5 -4
- package/src/schnorr/index.ts +10 -57
- package/src/schnorr/lazy.ts +13 -60
- package/src/single_key/account_contract.ts +8 -4
- package/src/single_key/index.ts +2 -33
- package/src/single_key/lazy.ts +5 -36
- package/src/stub/account_contract.ts +39 -0
- package/src/stub/index.ts +41 -0
- package/src/stub/lazy.ts +49 -0
- package/src/testing/configuration.ts +2 -1
- package/src/testing/index.ts +19 -51
- package/src/testing/lazy.ts +18 -50
- package/dest/dapp/dapp_interface.d.ts +0 -10
- package/dest/dapp/dapp_interface.d.ts.map +0 -1
- package/dest/dapp/dapp_interface.js +0 -16
- package/dest/dapp/index.d.ts +0 -2
- package/dest/dapp/index.d.ts.map +0 -1
- package/dest/dapp/index.js +0 -1
- package/dest/testing/create_account.d.ts +0 -43
- package/dest/testing/create_account.d.ts.map +0 -1
- package/dest/testing/create_account.js +0 -58
- package/src/dapp/dapp_interface.ts +0 -38
- package/src/dapp/index.ts +0 -1
- package/src/testing/create_account.ts +0 -93
|
@@ -4,33 +4,11 @@
|
|
|
4
4
|
*
|
|
5
5
|
* @packageDocumentation
|
|
6
6
|
*/
|
|
7
|
-
import { AccountManager, type Salt } from '@aztec/aztec.js/account';
|
|
8
|
-
import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
|
|
9
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
10
7
|
import type { ContractArtifact } from '@aztec/stdlib/abi';
|
|
11
|
-
import { loadContractArtifact } from '@aztec/stdlib/abi';
|
|
12
|
-
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
13
|
-
import type { PXE } from '@aztec/stdlib/interfaces/client';
|
|
14
8
|
|
|
9
|
+
import { getEcdsaRAccountContractArtifact } from '../ecdsa_r/lazy.js';
|
|
15
10
|
import { EcdsaRSSHBaseAccountContract } from './account_contract.js';
|
|
16
11
|
|
|
17
|
-
/*
|
|
18
|
-
* Lazily loads the contract artifact
|
|
19
|
-
* @returns The contract artifact for the ecdsa R account contract
|
|
20
|
-
*/
|
|
21
|
-
/**
|
|
22
|
-
*
|
|
23
|
-
*/
|
|
24
|
-
export async function getEcdsaRAccountContractArtifact() {
|
|
25
|
-
// Cannot assert this import as it's incompatible with browsers
|
|
26
|
-
// https://caniuse.com/mdn-javascript_statements_import_import_assertions_type_json
|
|
27
|
-
// Use the new "with" syntax once supported by firefox
|
|
28
|
-
// https://caniuse.com/mdn-javascript_statements_import_import_attributes_type_json
|
|
29
|
-
// In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
|
|
30
|
-
const { default: ecdsaKAccountContractJson } = await import('../../../artifacts/EcdsaRAccount.json');
|
|
31
|
-
return loadContractArtifact(ecdsaKAccountContractJson);
|
|
32
|
-
}
|
|
33
|
-
|
|
34
12
|
/**
|
|
35
13
|
* Account contract that authenticates transactions using ECDSA signatures
|
|
36
14
|
* verified against a secp256r1 public key stored in an immutable encrypted note.
|
|
@@ -40,39 +18,11 @@ export async function getEcdsaRAccountContractArtifact() {
|
|
|
40
18
|
* Lazily loads the contract artifact
|
|
41
19
|
*/
|
|
42
20
|
export class EcdsaRSSHAccountContract extends EcdsaRSSHBaseAccountContract {
|
|
43
|
-
constructor(
|
|
44
|
-
super(
|
|
21
|
+
constructor(signingPublicKey: Buffer) {
|
|
22
|
+
super(signingPublicKey);
|
|
45
23
|
}
|
|
46
24
|
|
|
47
25
|
override getContractArtifact(): Promise<ContractArtifact> {
|
|
48
26
|
return getEcdsaRAccountContractArtifact();
|
|
49
27
|
}
|
|
50
28
|
}
|
|
51
|
-
|
|
52
|
-
/**
|
|
53
|
-
* Creates an Account that relies on an ECDSA signing key for authentication.
|
|
54
|
-
* @param pxe - An PXE server instance.
|
|
55
|
-
* @param secretKey - Secret key used to derive all the keystore keys.
|
|
56
|
-
* @param signingPublicKey - Secp2561 key used to identify its corresponding private key in the SSH Agent.
|
|
57
|
-
* @param salt - Deployment salt.
|
|
58
|
-
* @returns An account manager initialized with the account contract and its deployment params
|
|
59
|
-
*/
|
|
60
|
-
export function getEcdsaRSSHAccount(
|
|
61
|
-
pxe: PXE,
|
|
62
|
-
secretKey: Fr,
|
|
63
|
-
signingPublicKey: Buffer,
|
|
64
|
-
salt?: Salt,
|
|
65
|
-
): Promise<AccountManager> {
|
|
66
|
-
return AccountManager.create(pxe, secretKey, new EcdsaRSSHAccountContract(signingPublicKey), salt);
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
/**
|
|
70
|
-
* Gets a wallet for an already registered account using ECDSA signatures.
|
|
71
|
-
* @param pxe - An PXE server instance.
|
|
72
|
-
* @param address - Address for the account.
|
|
73
|
-
* @param signingPrivateKey - ECDSA key used for signing transactions.
|
|
74
|
-
* @returns A wallet for this account that can be used to interact with a contract instance.
|
|
75
|
-
*/
|
|
76
|
-
export function getEcdsaRSSHWallet(pxe: PXE, address: AztecAddress, signingPublicKey: Buffer): Promise<AccountWallet> {
|
|
77
|
-
return getWallet(pxe, address, new EcdsaRSSHAccountContract(signingPublicKey));
|
|
78
|
-
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
|
|
2
|
-
import { Schnorr } from '@aztec/foundation/crypto';
|
|
3
|
-
import { Fr
|
|
2
|
+
import { Schnorr } from '@aztec/foundation/crypto/schnorr';
|
|
3
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
|
+
import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
|
|
4
5
|
import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
5
6
|
import { CompleteAddress } from '@aztec/stdlib/contract';
|
|
6
7
|
|
|
@@ -17,9 +18,9 @@ export abstract class SchnorrBaseAccountContract extends DefaultAccountContract
|
|
|
17
18
|
super();
|
|
18
19
|
}
|
|
19
20
|
|
|
20
|
-
async
|
|
21
|
+
async getInitializationFunctionAndArgs() {
|
|
21
22
|
const signingPublicKey = await new Schnorr().computePublicKey(this.signingPrivateKey);
|
|
22
|
-
return [signingPublicKey.x, signingPublicKey.y];
|
|
23
|
+
return { constructorName: 'constructor', constructorArgs: [signingPublicKey.x, signingPublicKey.y] };
|
|
23
24
|
}
|
|
24
25
|
|
|
25
26
|
getAuthWitnessProvider(_address: CompleteAddress): AuthWitnessProvider {
|
package/src/schnorr/index.ts
CHANGED
|
@@ -4,17 +4,16 @@
|
|
|
4
4
|
*
|
|
5
5
|
* @packageDocumentation
|
|
6
6
|
*/
|
|
7
|
-
import {
|
|
8
|
-
import
|
|
9
|
-
import { Fr
|
|
7
|
+
import { getAccountContractAddress } from '@aztec/aztec.js/account';
|
|
8
|
+
import type { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
9
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
10
|
+
import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
|
|
10
11
|
import type { ContractArtifact } from '@aztec/stdlib/abi';
|
|
11
12
|
import { loadContractArtifact } from '@aztec/stdlib/abi';
|
|
12
|
-
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
13
|
-
import type { PXE } from '@aztec/stdlib/interfaces/client';
|
|
14
13
|
import { deriveSigningKey } from '@aztec/stdlib/keys';
|
|
15
14
|
import type { NoirCompiledContract } from '@aztec/stdlib/noir';
|
|
16
15
|
|
|
17
|
-
import SchnorrAccountContractJson from '../../artifacts/SchnorrAccount.json'
|
|
16
|
+
import SchnorrAccountContractJson from '../../artifacts/SchnorrAccount.json' with { type: 'json' };
|
|
18
17
|
import { SchnorrBaseAccountContract } from './account_contract.js';
|
|
19
18
|
|
|
20
19
|
export const SchnorrAccountContractArtifact = loadContractArtifact(SchnorrAccountContractJson as NoirCompiledContract);
|
|
@@ -34,63 +33,17 @@ export class SchnorrAccountContract extends SchnorrBaseAccountContract {
|
|
|
34
33
|
}
|
|
35
34
|
}
|
|
36
35
|
|
|
37
|
-
/**
|
|
38
|
-
* Creates an Account Manager that relies on a Grumpkin signing key for authentication.
|
|
39
|
-
* @param pxe - An PXE server instance.
|
|
40
|
-
* @param secretKey - Secret key used to derive all the keystore keys.
|
|
41
|
-
* @param signingPrivateKey - Grumpkin key used for signing transactions.
|
|
42
|
-
* @param salt - Deployment salt.
|
|
43
|
-
* @returns An account manager initialized with the account contract and its deployment params
|
|
44
|
-
*/
|
|
45
|
-
export function getSchnorrAccount(
|
|
46
|
-
pxe: PXE,
|
|
47
|
-
secretKey: Fr,
|
|
48
|
-
signingPrivateKey: GrumpkinScalar,
|
|
49
|
-
salt?: Salt,
|
|
50
|
-
): Promise<AccountManager> {
|
|
51
|
-
return AccountManager.create(pxe, secretKey, new SchnorrAccountContract(signingPrivateKey), salt);
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
/**
|
|
55
|
-
* Gets a wallet for an already registered account using Schnorr signatures.
|
|
56
|
-
* @param pxe - An PXE server instance.
|
|
57
|
-
* @param address - Address for the account.
|
|
58
|
-
* @param signingPrivateKey - Grumpkin key used for signing transactions.
|
|
59
|
-
* @returns A wallet for this account that can be used to interact with a contract instance.
|
|
60
|
-
*/
|
|
61
|
-
export function getSchnorrWallet(
|
|
62
|
-
pxe: PXE,
|
|
63
|
-
address: AztecAddress,
|
|
64
|
-
signingPrivateKey: GrumpkinScalar,
|
|
65
|
-
): Promise<AccountWallet> {
|
|
66
|
-
return getWallet(pxe, address, new SchnorrAccountContract(signingPrivateKey));
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
/**
|
|
70
|
-
* Gets a wallet for an already registered account using Schnorr signatures.
|
|
71
|
-
* @param pxe - An PXE server instance.
|
|
72
|
-
* @param secretKey - Secret key used to derive all the keystore keys.
|
|
73
|
-
* @param signingPrivateKey - Grumpkin key used for signing transactions.
|
|
74
|
-
* @param salt - Deployment salt.
|
|
75
|
-
* @returns A wallet for this account that can be used to interact with a contract instance.
|
|
76
|
-
*/
|
|
77
|
-
export async function getSchnorrWalletWithSecretKey(
|
|
78
|
-
pxe: PXE,
|
|
79
|
-
secretKey: Fr,
|
|
80
|
-
signingPrivateKey: GrumpkinScalar,
|
|
81
|
-
salt: Salt,
|
|
82
|
-
): Promise<AccountWalletWithSecretKey> {
|
|
83
|
-
const account = await getSchnorrAccount(pxe, secretKey, signingPrivateKey, salt);
|
|
84
|
-
return account.getWallet();
|
|
85
|
-
}
|
|
86
|
-
|
|
87
36
|
/**
|
|
88
37
|
* Compute the address of a schnorr account contract.
|
|
89
38
|
* @param secret - A seed for deriving the signing key and public keys.
|
|
90
39
|
* @param salt - The contract address salt.
|
|
91
40
|
* @param signingPrivateKey - A specific signing private key that's not derived from the secret.
|
|
92
41
|
*/
|
|
93
|
-
export async function getSchnorrAccountContractAddress(
|
|
42
|
+
export async function getSchnorrAccountContractAddress(
|
|
43
|
+
secret: Fr,
|
|
44
|
+
salt: Fr,
|
|
45
|
+
signingPrivateKey?: GrumpkinScalar,
|
|
46
|
+
): Promise<AztecAddress> {
|
|
94
47
|
const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
|
|
95
48
|
const accountContract = new SchnorrAccountContract(signingKey);
|
|
96
49
|
return await getAccountContractAddress(accountContract, secret, salt);
|
package/src/schnorr/lazy.ts
CHANGED
|
@@ -4,13 +4,12 @@
|
|
|
4
4
|
*
|
|
5
5
|
* @packageDocumentation
|
|
6
6
|
*/
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
7
|
+
import { getAccountContractAddress } from '@aztec/aztec.js/account';
|
|
8
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
9
|
+
import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
|
|
10
10
|
import type { ContractArtifact } from '@aztec/stdlib/abi';
|
|
11
11
|
import { loadContractArtifact } from '@aztec/stdlib/abi';
|
|
12
|
-
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
13
|
-
import type { PXE } from '@aztec/stdlib/interfaces/client';
|
|
12
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
14
13
|
import { deriveSigningKey } from '@aztec/stdlib/keys';
|
|
15
14
|
|
|
16
15
|
import { SchnorrBaseAccountContract } from './account_contract.js';
|
|
@@ -20,10 +19,10 @@ import { SchnorrBaseAccountContract } from './account_contract.js';
|
|
|
20
19
|
* @returns The contract artifact for the schnorr account contract
|
|
21
20
|
*/
|
|
22
21
|
export async function getSchnorrAccountContractArtifact() {
|
|
23
|
-
// Cannot assert this import as it's incompatible with
|
|
24
|
-
// https://
|
|
25
|
-
//
|
|
26
|
-
//
|
|
22
|
+
// Cannot assert this import as it's incompatible with bundlers like vite
|
|
23
|
+
// https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
|
|
24
|
+
// Even if now supported by al major browsers, the MIME type is replaced with
|
|
25
|
+
// "text/javascript"
|
|
27
26
|
// In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
|
|
28
27
|
const { default: schnorrAccountContractJson } = await import('../../artifacts/SchnorrAccount.json');
|
|
29
28
|
return loadContractArtifact(schnorrAccountContractJson);
|
|
@@ -44,63 +43,17 @@ export class SchnorrAccountContract extends SchnorrBaseAccountContract {
|
|
|
44
43
|
}
|
|
45
44
|
}
|
|
46
45
|
|
|
47
|
-
/**
|
|
48
|
-
* Creates an Account Manager that relies on a Grumpkin signing key for authentication.
|
|
49
|
-
* @param pxe - An PXE server instance.
|
|
50
|
-
* @param secretKey - Secret key used to derive all the keystore keys.
|
|
51
|
-
* @param signingPrivateKey - Grumpkin key used for signing transactions.
|
|
52
|
-
* @param salt - Deployment salt.
|
|
53
|
-
* @returns An account manager initialized with the account contract and its deployment params
|
|
54
|
-
*/
|
|
55
|
-
export function getSchnorrAccount(
|
|
56
|
-
pxe: PXE,
|
|
57
|
-
secretKey: Fr,
|
|
58
|
-
signingPrivateKey: GrumpkinScalar,
|
|
59
|
-
salt?: Salt,
|
|
60
|
-
): Promise<AccountManager> {
|
|
61
|
-
return AccountManager.create(pxe, secretKey, new SchnorrAccountContract(signingPrivateKey), salt);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
/**
|
|
65
|
-
* Gets a wallet for an already registered account using Schnorr signatures.
|
|
66
|
-
* @param pxe - An PXE server instance.
|
|
67
|
-
* @param address - Address for the account.
|
|
68
|
-
* @param signingPrivateKey - Grumpkin key used for signing transactions.
|
|
69
|
-
* @returns A wallet for this account that can be used to interact with a contract instance.
|
|
70
|
-
*/
|
|
71
|
-
export function getSchnorrWallet(
|
|
72
|
-
pxe: PXE,
|
|
73
|
-
address: AztecAddress,
|
|
74
|
-
signingPrivateKey: GrumpkinScalar,
|
|
75
|
-
): Promise<AccountWallet> {
|
|
76
|
-
return getWallet(pxe, address, new SchnorrAccountContract(signingPrivateKey));
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
/**
|
|
80
|
-
* Gets a wallet for an already registered account using Schnorr signatures.
|
|
81
|
-
* @param pxe - An PXE server instance.
|
|
82
|
-
* @param secretKey - Secret key used to derive all the keystore keys.
|
|
83
|
-
* @param signingPrivateKey - Grumpkin key used for signing transactions.
|
|
84
|
-
* @param salt - Deployment salt.
|
|
85
|
-
* @returns A wallet for this account that can be used to interact with a contract instance.
|
|
86
|
-
*/
|
|
87
|
-
export async function getSchnorrWalletWithSecretKey(
|
|
88
|
-
pxe: PXE,
|
|
89
|
-
secretKey: Fr,
|
|
90
|
-
signingPrivateKey: GrumpkinScalar,
|
|
91
|
-
salt: Salt,
|
|
92
|
-
): Promise<AccountWalletWithSecretKey> {
|
|
93
|
-
const account = await getSchnorrAccount(pxe, secretKey, signingPrivateKey, salt);
|
|
94
|
-
return account.getWallet();
|
|
95
|
-
}
|
|
96
|
-
|
|
97
46
|
/**
|
|
98
47
|
* Compute the address of a schnorr account contract.
|
|
99
48
|
* @param secret - A seed for deriving the signing key and public keys.
|
|
100
49
|
* @param salt - The contract address salt.
|
|
101
50
|
* @param signingPrivateKey - A specific signing private key that's not derived from the secret.
|
|
102
51
|
*/
|
|
103
|
-
export async function getSchnorrAccountContractAddress(
|
|
52
|
+
export async function getSchnorrAccountContractAddress(
|
|
53
|
+
secret: Fr,
|
|
54
|
+
salt: Fr,
|
|
55
|
+
signingPrivateKey?: GrumpkinScalar,
|
|
56
|
+
): Promise<AztecAddress> {
|
|
104
57
|
const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
|
|
105
58
|
const accountContract = new SchnorrAccountContract(signingKey);
|
|
106
59
|
return await getAccountContractAddress(accountContract, secret, salt);
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
|
|
2
|
-
import { Schnorr } from '@aztec/foundation/crypto';
|
|
3
|
-
import {
|
|
2
|
+
import { Schnorr } from '@aztec/foundation/crypto/schnorr';
|
|
3
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
|
+
import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
|
|
4
5
|
import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
5
6
|
import { CompleteAddress } from '@aztec/stdlib/contract';
|
|
6
7
|
|
|
@@ -17,7 +18,7 @@ export abstract class SingleKeyBaseAccountContract extends DefaultAccountContrac
|
|
|
17
18
|
super();
|
|
18
19
|
}
|
|
19
20
|
|
|
20
|
-
|
|
21
|
+
getInitializationFunctionAndArgs() {
|
|
21
22
|
return Promise.resolve(undefined);
|
|
22
23
|
}
|
|
23
24
|
|
|
@@ -32,7 +33,10 @@ export abstract class SingleKeyBaseAccountContract extends DefaultAccountContrac
|
|
|
32
33
|
* by reconstructing the current address.
|
|
33
34
|
*/
|
|
34
35
|
class SingleKeyAuthWitnessProvider implements AuthWitnessProvider {
|
|
35
|
-
constructor(
|
|
36
|
+
constructor(
|
|
37
|
+
private privateKey: GrumpkinScalar,
|
|
38
|
+
private account: CompleteAddress,
|
|
39
|
+
) {}
|
|
36
40
|
|
|
37
41
|
async createAuthWit(messageHash: Fr): Promise<AuthWitness> {
|
|
38
42
|
const schnorr = new Schnorr();
|
package/src/single_key/index.ts
CHANGED
|
@@ -4,16 +4,12 @@
|
|
|
4
4
|
*
|
|
5
5
|
* @packageDocumentation
|
|
6
6
|
*/
|
|
7
|
-
import type {
|
|
8
|
-
import { AccountManager, type Salt } from '@aztec/aztec.js/account';
|
|
9
|
-
import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
|
|
7
|
+
import type { GrumpkinScalar } from '@aztec/aztec.js/fields';
|
|
10
8
|
import type { ContractArtifact } from '@aztec/stdlib/abi';
|
|
11
9
|
import { loadContractArtifact } from '@aztec/stdlib/abi';
|
|
12
|
-
import type { PXE } from '@aztec/stdlib/interfaces/client';
|
|
13
|
-
import { deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys';
|
|
14
10
|
import type { NoirCompiledContract } from '@aztec/stdlib/noir';
|
|
15
11
|
|
|
16
|
-
import SchnorrSingleKeyAccountContractJson from '../../artifacts/SchnorrSingleKeyAccount.json'
|
|
12
|
+
import SchnorrSingleKeyAccountContractJson from '../../artifacts/SchnorrSingleKeyAccount.json' with { type: 'json' };
|
|
17
13
|
import { SingleKeyBaseAccountContract } from './account_contract.js';
|
|
18
14
|
|
|
19
15
|
export const SchnorrSingleKeyAccountContractArtifact = loadContractArtifact(
|
|
@@ -34,30 +30,3 @@ export class SingleKeyAccountContract extends SingleKeyBaseAccountContract {
|
|
|
34
30
|
return Promise.resolve(SchnorrSingleKeyAccountContractArtifact);
|
|
35
31
|
}
|
|
36
32
|
}
|
|
37
|
-
|
|
38
|
-
/**
|
|
39
|
-
* Creates an Account that uses the same Grumpkin key for encryption and authentication.
|
|
40
|
-
* @param pxe - An PXE server instance.
|
|
41
|
-
* @param secretKey - Secret key used to derive all the keystore keys (in this case also used to get signing key).
|
|
42
|
-
* @param salt - Deployment salt.
|
|
43
|
-
* @returns An account manager initialized with the account contract and its deployment params
|
|
44
|
-
*/
|
|
45
|
-
export function getUnsafeSchnorrAccount(pxe: PXE, secretKey: Fr, salt?: Salt) {
|
|
46
|
-
const encryptionPrivateKey = deriveMasterIncomingViewingSecretKey(secretKey);
|
|
47
|
-
return AccountManager.create(pxe, secretKey, new SingleKeyAccountContract(encryptionPrivateKey), salt);
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
/**
|
|
51
|
-
* Gets a wallet for an already registered account using Schnorr signatures with a single key for encryption and authentication.
|
|
52
|
-
* @param pxe - An PXE server instance.
|
|
53
|
-
* @param address - Address for the account.
|
|
54
|
-
* @param signingPrivateKey - Grumpkin key used for note encryption and signing transactions.
|
|
55
|
-
* @returns A wallet for this account that can be used to interact with a contract instance.
|
|
56
|
-
*/
|
|
57
|
-
export function getUnsafeSchnorrWallet(
|
|
58
|
-
pxe: PXE,
|
|
59
|
-
address: AztecAddress,
|
|
60
|
-
signingPrivateKey: GrumpkinScalar,
|
|
61
|
-
): Promise<AccountWallet> {
|
|
62
|
-
return getWallet(pxe, address, new SingleKeyAccountContract(signingPrivateKey));
|
|
63
|
-
}
|
package/src/single_key/lazy.ts
CHANGED
|
@@ -4,13 +4,9 @@
|
|
|
4
4
|
*
|
|
5
5
|
* @packageDocumentation
|
|
6
6
|
*/
|
|
7
|
-
import type {
|
|
8
|
-
import { AccountManager, type Salt } from '@aztec/aztec.js/account';
|
|
9
|
-
import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
|
|
7
|
+
import type { GrumpkinScalar } from '@aztec/aztec.js/fields';
|
|
10
8
|
import type { ContractArtifact } from '@aztec/stdlib/abi';
|
|
11
9
|
import { loadContractArtifact } from '@aztec/stdlib/abi';
|
|
12
|
-
import type { PXE } from '@aztec/stdlib/interfaces/client';
|
|
13
|
-
import { deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys';
|
|
14
10
|
|
|
15
11
|
import { SingleKeyBaseAccountContract } from './account_contract.js';
|
|
16
12
|
|
|
@@ -19,10 +15,10 @@ import { SingleKeyBaseAccountContract } from './account_contract.js';
|
|
|
19
15
|
* @returns The contract artifact for the single key account contract
|
|
20
16
|
*/
|
|
21
17
|
export async function getSingleKeyAccountContractArtifact() {
|
|
22
|
-
// Cannot assert this import as it's incompatible with
|
|
23
|
-
// https://
|
|
24
|
-
//
|
|
25
|
-
//
|
|
18
|
+
// Cannot assert this import as it's incompatible with bundlers like vite
|
|
19
|
+
// https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
|
|
20
|
+
// Even if now supported by al major browsers, the MIME type is replaced with
|
|
21
|
+
// "text/javascript"
|
|
26
22
|
// In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
|
|
27
23
|
const { default: schnorrAccountContractJson } = await import('../../artifacts/SchnorrAccount.json');
|
|
28
24
|
return loadContractArtifact(schnorrAccountContractJson);
|
|
@@ -42,30 +38,3 @@ export class SingleKeyAccountContract extends SingleKeyBaseAccountContract {
|
|
|
42
38
|
return getSingleKeyAccountContractArtifact();
|
|
43
39
|
}
|
|
44
40
|
}
|
|
45
|
-
|
|
46
|
-
/**
|
|
47
|
-
* Creates an Account that uses the same Grumpkin key for encryption and authentication.
|
|
48
|
-
* @param pxe - An PXE server instance.
|
|
49
|
-
* @param secretKey - Secret key used to derive all the keystore keys (in this case also used to get signing key).
|
|
50
|
-
* @param salt - Deployment salt.
|
|
51
|
-
* @returns An account manager initialized with the account contract and its deployment params
|
|
52
|
-
*/
|
|
53
|
-
export function getUnsafeSchnorrAccount(pxe: PXE, secretKey: Fr, salt?: Salt) {
|
|
54
|
-
const encryptionPrivateKey = deriveMasterIncomingViewingSecretKey(secretKey);
|
|
55
|
-
return AccountManager.create(pxe, secretKey, new SingleKeyAccountContract(encryptionPrivateKey), salt);
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
/**
|
|
59
|
-
* Gets a wallet for an already registered account using Schnorr signatures with a single key for encryption and authentication.
|
|
60
|
-
* @param pxe - An PXE server instance.
|
|
61
|
-
* @param address - Address for the account.
|
|
62
|
-
* @param signingPrivateKey - Grumpkin key used for note encryption and signing transactions.
|
|
63
|
-
* @returns A wallet for this account that can be used to interact with a contract instance.
|
|
64
|
-
*/
|
|
65
|
-
export function getUnsafeSchnorrWallet(
|
|
66
|
-
pxe: PXE,
|
|
67
|
-
address: AztecAddress,
|
|
68
|
-
signingPrivateKey: GrumpkinScalar,
|
|
69
|
-
): Promise<AccountWallet> {
|
|
70
|
-
return getWallet(pxe, address, new SingleKeyAccountContract(signingPrivateKey));
|
|
71
|
-
}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
|
|
2
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
+
import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
4
|
+
import { CompleteAddress } from '@aztec/stdlib/contract';
|
|
5
|
+
|
|
6
|
+
import { DefaultAccountContract } from '../defaults/account_contract.js';
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* An Account contract that does not perform any authentication of authwits
|
|
10
|
+
* (`is_valid` always returns `true`)
|
|
11
|
+
* It is used to capture authorization data during simulations
|
|
12
|
+
*/
|
|
13
|
+
export abstract class StubBaseAccountContract extends DefaultAccountContract {
|
|
14
|
+
constructor() {
|
|
15
|
+
super();
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
getInitializationFunctionAndArgs() {
|
|
19
|
+
return Promise.resolve({ constructorName: 'constructor', constructorArgs: [] });
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
getAuthWitnessProvider(_address: CompleteAddress): AuthWitnessProvider {
|
|
23
|
+
return new StubAuthWitnessProvider();
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/** Creates auth witnesses using Stub signatures. */
|
|
28
|
+
export class StubAuthWitnessProvider implements AuthWitnessProvider {
|
|
29
|
+
constructor() {}
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* A fake account always returns an empty authwitness, since it doesn't
|
|
33
|
+
* perform any verification whatsoever
|
|
34
|
+
* @param messageHash - The outer hash of the message for which the auth witness is created
|
|
35
|
+
*/
|
|
36
|
+
createAuthWit(messageHash: Fr): Promise<AuthWitness> {
|
|
37
|
+
return Promise.resolve(new AuthWitness(messageHash, []));
|
|
38
|
+
}
|
|
39
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { BaseAccount, type ChainInfo } from '@aztec/aztec.js/account';
|
|
2
|
+
import type { CompleteAddress } from '@aztec/aztec.js/addresses';
|
|
3
|
+
import type { ContractArtifact } from '@aztec/stdlib/abi';
|
|
4
|
+
import { loadContractArtifact } from '@aztec/stdlib/abi';
|
|
5
|
+
import type { NoirCompiledContract } from '@aztec/stdlib/noir';
|
|
6
|
+
|
|
7
|
+
import SimulatedAccountContract from '../../artifacts/SimulatedAccount.json' with { type: 'json' };
|
|
8
|
+
import { DefaultAccountInterface } from '../defaults/account_interface.js';
|
|
9
|
+
import { StubBaseAccountContract } from './account_contract.js';
|
|
10
|
+
|
|
11
|
+
export const StubAccountContractArtifact = loadContractArtifact(SimulatedAccountContract as NoirCompiledContract);
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Stub account contract
|
|
15
|
+
* Eagerly loads the contract artifact
|
|
16
|
+
*/
|
|
17
|
+
export class StubAccountContract extends StubBaseAccountContract {
|
|
18
|
+
constructor() {
|
|
19
|
+
super();
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
override getContractArtifact(): Promise<ContractArtifact> {
|
|
23
|
+
return Promise.resolve(StubAccountContractArtifact);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* Creates a stub account that impersonates the one with the provided originalAddress.
|
|
29
|
+
* @param originalAddress - The address of the account to stub
|
|
30
|
+
* @param chainInfo - The chain info that the account is connected to
|
|
31
|
+
* @returns A stub account that can be used for kernelless simulations
|
|
32
|
+
*/
|
|
33
|
+
export function createStubAccount(originalAddress: CompleteAddress, chainInfo: ChainInfo) {
|
|
34
|
+
const accountContract = new StubAccountContract();
|
|
35
|
+
const accountInterface = new DefaultAccountInterface(
|
|
36
|
+
accountContract.getAuthWitnessProvider(originalAddress),
|
|
37
|
+
originalAddress,
|
|
38
|
+
chainInfo,
|
|
39
|
+
);
|
|
40
|
+
return new BaseAccount(accountInterface);
|
|
41
|
+
}
|
package/src/stub/lazy.ts
ADDED
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { BaseAccount, type ChainInfo } from '@aztec/aztec.js/account';
|
|
2
|
+
import type { CompleteAddress } from '@aztec/aztec.js/addresses';
|
|
3
|
+
import type { ContractArtifact } from '@aztec/stdlib/abi';
|
|
4
|
+
import { loadContractArtifact } from '@aztec/stdlib/abi';
|
|
5
|
+
|
|
6
|
+
import { DefaultAccountInterface } from '../defaults/account_interface.js';
|
|
7
|
+
import { StubBaseAccountContract } from './account_contract.js';
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Lazily loads the contract artifact
|
|
11
|
+
* @returns The contract artifact for the Stub account contract
|
|
12
|
+
*/
|
|
13
|
+
export async function getStubAccountContractArtifact() {
|
|
14
|
+
// Cannot assert this import as it's incompatible with bundlers like vite
|
|
15
|
+
// https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
|
|
16
|
+
// Even if now supported by al major browsers, the MIME type is replaced with
|
|
17
|
+
// "text/javascript"
|
|
18
|
+
// In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
|
|
19
|
+
const { default: StubAccountContractJson } = await import('../../artifacts/SimulatedAccount.json');
|
|
20
|
+
return loadContractArtifact(StubAccountContractJson);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Account contract that authenticates transactions using Stub signatures
|
|
25
|
+
* verified against a Grumpkin public key stored in an immutable encrypted note.
|
|
26
|
+
* Lazily loads the contract artifact
|
|
27
|
+
*/
|
|
28
|
+
export class StubAccountContract extends StubBaseAccountContract {
|
|
29
|
+
constructor() {
|
|
30
|
+
super();
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
override getContractArtifact(): Promise<ContractArtifact> {
|
|
34
|
+
return getStubAccountContractArtifact();
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
*
|
|
40
|
+
*/
|
|
41
|
+
export function createStubAccount(originalAddress: CompleteAddress, chainInfo: ChainInfo) {
|
|
42
|
+
const accountContract = new StubAccountContract();
|
|
43
|
+
const accountInterface = new DefaultAccountInterface(
|
|
44
|
+
accountContract.getAuthWitnessProvider(originalAddress),
|
|
45
|
+
originalAddress,
|
|
46
|
+
chainInfo,
|
|
47
|
+
);
|
|
48
|
+
return new BaseAccount(accountInterface);
|
|
49
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Fr
|
|
1
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
+
import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
|
|
2
3
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
3
4
|
import { deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys';
|
|
4
5
|
|