@aztec/wallets 0.0.1-commit.d20b825a7 → 0.0.1-commit.d58ff9d0
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/embedded/account-contract-providers/bundle.d.ts +3 -6
- package/dest/embedded/account-contract-providers/bundle.d.ts.map +1 -1
- package/dest/embedded/account-contract-providers/bundle.js +10 -9
- package/dest/embedded/account-contract-providers/lazy.d.ts +3 -6
- package/dest/embedded/account-contract-providers/lazy.d.ts.map +1 -1
- package/dest/embedded/account-contract-providers/lazy.js +10 -10
- package/dest/embedded/account-contract-providers/types.d.ts +3 -6
- package/dest/embedded/account-contract-providers/types.d.ts.map +1 -1
- package/dest/embedded/embedded_wallet.d.ts +21 -4
- package/dest/embedded/embedded_wallet.d.ts.map +1 -1
- package/dest/embedded/embedded_wallet.js +133 -43
- package/dest/embedded/entrypoints/browser.d.ts +1 -1
- package/dest/embedded/entrypoints/browser.d.ts.map +1 -1
- package/dest/embedded/entrypoints/browser.js +33 -13
- package/dest/embedded/entrypoints/node.d.ts +1 -1
- package/dest/embedded/entrypoints/node.d.ts.map +1 -1
- package/dest/embedded/entrypoints/node.js +36 -13
- package/dest/embedded/store_encryption.d.ts +74 -0
- package/dest/embedded/store_encryption.d.ts.map +1 -0
- package/dest/embedded/store_encryption.js +93 -0
- package/dest/embedded/wallet_db.d.ts +9 -6
- package/dest/embedded/wallet_db.d.ts.map +1 -1
- package/dest/embedded/wallet_db.js +13 -11
- package/dest/testing.d.ts +8 -4
- package/dest/testing.d.ts.map +1 -1
- package/dest/testing.js +8 -14
- package/package.json +12 -10
- package/src/embedded/account-contract-providers/bundle.ts +12 -11
- package/src/embedded/account-contract-providers/lazy.ts +12 -12
- package/src/embedded/account-contract-providers/types.ts +2 -2
- package/src/embedded/embedded_wallet.ts +152 -39
- package/src/embedded/entrypoints/browser.ts +35 -22
- package/src/embedded/entrypoints/node.ts +42 -28
- package/src/embedded/store_encryption.ts +146 -0
- package/src/embedded/wallet_db.ts +18 -12
- package/src/testing.ts +11 -17
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Account, AccountContract } from '@aztec/aztec.js/account';
|
|
2
2
|
import type { Fq } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import type { ContractArtifact } from '@aztec/stdlib/abi';
|
|
4
|
-
import type { CompleteAddress
|
|
4
|
+
import type { CompleteAddress } from '@aztec/stdlib/contract';
|
|
5
5
|
import type { AccountType } from '../wallet_db.js';
|
|
6
6
|
import type { AccountContractsProvider } from './types.js';
|
|
7
7
|
/**
|
|
@@ -10,13 +10,10 @@ import type { AccountContractsProvider } from './types.js';
|
|
|
10
10
|
*/
|
|
11
11
|
export declare class BundleAccountContractsProvider implements AccountContractsProvider {
|
|
12
12
|
getSchnorrAccountContract(signingKey: Fq): Promise<AccountContract>;
|
|
13
|
+
getSchnorrInitializerlessAccountContract(signingKey: Fq): Promise<AccountContract>;
|
|
13
14
|
getEcdsaRAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
14
15
|
getEcdsaKAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
15
16
|
getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact>;
|
|
16
17
|
createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account>;
|
|
17
|
-
getMulticallContract(): Promise<{
|
|
18
|
-
instance: ContractInstanceWithAddress;
|
|
19
|
-
artifact: ContractArtifact;
|
|
20
|
-
}>;
|
|
21
18
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVuZGxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZW1iZWRkZWQvYWNjb3VudC1jb250cmFjdC1wcm92aWRlcnMvYnVuZGxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTNEOzs7R0FHRztBQUNILHFCQUFhLDhCQUErQixZQUFXLHdCQUF3QjtJQUM3RSx5QkFBeUIsQ0FBQyxVQUFVLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFbEU7SUFFRCx3Q0FBd0MsQ0FBQyxVQUFVLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFakY7SUFFRCx3QkFBd0IsQ0FBQyxVQUFVLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFckU7SUFFRCx3QkFBd0IsQ0FBQyxVQUFVLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFckU7SUFFRCw4QkFBOEIsQ0FBQyxJQUFJLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUczRTtJQUVELGlCQUFpQixDQUFDLE9BQU8sRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRy9FO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/embedded/account-contract-providers/bundle.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/embedded/account-contract-providers/bundle.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE3D;;;GAGG;AACH,qBAAa,8BAA+B,YAAW,wBAAwB;IAC7E,yBAAyB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAElE;IAED,wCAAwC,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAEjF;IAED,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAErE;IAED,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAErE;IAED,8BAA8B,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAG3E;IAED,iBAAiB,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAG/E;CACF"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { EcdsaKAccountContract, EcdsaRAccountContract } from '@aztec/accounts/ecdsa';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { StubSchnorrAccountContractArtifact, createStubSchnorrAccount } from '@aztec/accounts/stub
|
|
5
|
-
import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi-call-entrypoint';
|
|
2
|
+
import { StubEcdsaAccountContractArtifact, createStubEcdsaAccount } from '@aztec/accounts/ecdsa/stub';
|
|
3
|
+
import { SchnorrAccountContract, SchnorrInitializerlessAccountContract } from '@aztec/accounts/schnorr';
|
|
4
|
+
import { StubSchnorrAccountContractArtifact, createStubSchnorrAccount } from '@aztec/accounts/schnorr/stub';
|
|
6
5
|
/**
|
|
7
6
|
* Loads account contract artifacts eagerly via static imports.
|
|
8
7
|
* Designed for Node.js environments where all artifacts are available at startup.
|
|
@@ -10,6 +9,9 @@ import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi
|
|
|
10
9
|
getSchnorrAccountContract(signingKey) {
|
|
11
10
|
return Promise.resolve(new SchnorrAccountContract(signingKey));
|
|
12
11
|
}
|
|
12
|
+
getSchnorrInitializerlessAccountContract(signingKey) {
|
|
13
|
+
return Promise.resolve(new SchnorrInitializerlessAccountContract(signingKey));
|
|
14
|
+
}
|
|
13
15
|
getEcdsaRAccountContract(signingKey) {
|
|
14
16
|
return Promise.resolve(new EcdsaRAccountContract(signingKey));
|
|
15
17
|
}
|
|
@@ -17,12 +19,11 @@ import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi
|
|
|
17
19
|
return Promise.resolve(new EcdsaKAccountContract(signingKey));
|
|
18
20
|
}
|
|
19
21
|
getStubAccountContractArtifact(type) {
|
|
20
|
-
|
|
22
|
+
const isSchnorr = type === 'schnorr' || type === 'schnorr_initializerless';
|
|
23
|
+
return Promise.resolve(isSchnorr ? StubSchnorrAccountContractArtifact : StubEcdsaAccountContractArtifact);
|
|
21
24
|
}
|
|
22
25
|
createStubAccount(address, type) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
getMulticallContract() {
|
|
26
|
-
return getCanonicalMultiCallEntrypoint();
|
|
26
|
+
const isSchnorr = type === 'schnorr' || type === 'schnorr_initializerless';
|
|
27
|
+
return Promise.resolve(isSchnorr ? createStubSchnorrAccount(address) : createStubEcdsaAccount(address));
|
|
27
28
|
}
|
|
28
29
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Account, AccountContract } from '@aztec/aztec.js/account';
|
|
2
2
|
import type { Fq } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import type { ContractArtifact } from '@aztec/stdlib/abi';
|
|
4
|
-
import type { CompleteAddress
|
|
4
|
+
import type { CompleteAddress } from '@aztec/stdlib/contract';
|
|
5
5
|
import type { AccountType } from '../wallet_db.js';
|
|
6
6
|
import type { AccountContractsProvider } from './types.js';
|
|
7
7
|
/**
|
|
@@ -10,13 +10,10 @@ import type { AccountContractsProvider } from './types.js';
|
|
|
10
10
|
*/
|
|
11
11
|
export declare class LazyAccountContractsProvider implements AccountContractsProvider {
|
|
12
12
|
getSchnorrAccountContract(signingKey: Fq): Promise<AccountContract>;
|
|
13
|
+
getSchnorrInitializerlessAccountContract(signingKey: Fq): Promise<AccountContract>;
|
|
13
14
|
getEcdsaRAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
14
15
|
getEcdsaKAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
15
16
|
getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact>;
|
|
16
17
|
createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account>;
|
|
17
|
-
getMulticallContract(): Promise<{
|
|
18
|
-
instance: ContractInstanceWithAddress;
|
|
19
|
-
artifact: ContractArtifact;
|
|
20
|
-
}>;
|
|
21
18
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VtYmVkZGVkL2FjY291bnQtY29udHJhY3QtcHJvdmlkZXJzL2xhenkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFM0Q7OztHQUdHO0FBQ0gscUJBQWEsNEJBQTZCLFlBQVcsd0JBQXdCO0lBQ3JFLHlCQUF5QixDQUFDLFVBQVUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUd4RTtJQUVLLHdDQUF3QyxDQUFDLFVBQVUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUd2RjtJQUVLLHdCQUF3QixDQUFDLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUczRTtJQUVLLHdCQUF3QixDQUFDLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUczRTtJQUVLLDhCQUE4QixDQUFDLElBQUksRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBUWpGO0lBRUssaUJBQWlCLENBQUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxJQUFJLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FRckY7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../../src/embedded/account-contract-providers/lazy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../../src/embedded/account-contract-providers/lazy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE3D;;;GAGG;AACH,qBAAa,4BAA6B,YAAW,wBAAwB;IACrE,yBAAyB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAGxE;IAEK,wCAAwC,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAGvF;IAEK,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAG3E;IAEK,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAG3E;IAEK,8BAA8B,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAQjF;IAEK,iBAAiB,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAQrF;CACF"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi-call-entrypoint/lazy';
|
|
2
1
|
/**
|
|
3
2
|
* Loads account contract artifacts lazily via dynamic imports.
|
|
4
3
|
* Designed for browser environments where code splitting reduces initial bundle size.
|
|
@@ -7,6 +6,10 @@ import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi
|
|
|
7
6
|
const { SchnorrAccountContract } = await import('@aztec/accounts/schnorr/lazy');
|
|
8
7
|
return new SchnorrAccountContract(signingKey);
|
|
9
8
|
}
|
|
9
|
+
async getSchnorrInitializerlessAccountContract(signingKey) {
|
|
10
|
+
const { SchnorrInitializerlessAccountContract } = await import('@aztec/accounts/schnorr/lazy');
|
|
11
|
+
return new SchnorrInitializerlessAccountContract(signingKey);
|
|
12
|
+
}
|
|
10
13
|
async getEcdsaRAccountContract(signingKey) {
|
|
11
14
|
const { EcdsaRAccountContract } = await import('@aztec/accounts/ecdsa/lazy');
|
|
12
15
|
return new EcdsaRAccountContract(signingKey);
|
|
@@ -16,24 +19,21 @@ import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi
|
|
|
16
19
|
return new EcdsaKAccountContract(signingKey);
|
|
17
20
|
}
|
|
18
21
|
async getStubAccountContractArtifact(type) {
|
|
19
|
-
if (type === 'schnorr') {
|
|
20
|
-
const { getStubSchnorrAccountContractArtifact } = await import('@aztec/accounts/stub/
|
|
22
|
+
if (type === 'schnorr' || type === 'schnorr_initializerless') {
|
|
23
|
+
const { getStubSchnorrAccountContractArtifact } = await import('@aztec/accounts/schnorr/stub/lazy');
|
|
21
24
|
return getStubSchnorrAccountContractArtifact();
|
|
22
25
|
} else {
|
|
23
|
-
const { getStubEcdsaAccountContractArtifact } = await import('@aztec/accounts/stub/
|
|
26
|
+
const { getStubEcdsaAccountContractArtifact } = await import('@aztec/accounts/ecdsa/stub/lazy');
|
|
24
27
|
return getStubEcdsaAccountContractArtifact();
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
30
|
async createStubAccount(address, type) {
|
|
28
|
-
if (type === 'schnorr') {
|
|
29
|
-
const { createStubSchnorrAccount } = await import('@aztec/accounts/stub/
|
|
31
|
+
if (type === 'schnorr' || type === 'schnorr_initializerless') {
|
|
32
|
+
const { createStubSchnorrAccount } = await import('@aztec/accounts/schnorr/stub/lazy');
|
|
30
33
|
return createStubSchnorrAccount(address);
|
|
31
34
|
} else {
|
|
32
|
-
const { createStubEcdsaAccount } = await import('@aztec/accounts/stub/
|
|
35
|
+
const { createStubEcdsaAccount } = await import('@aztec/accounts/ecdsa/stub/lazy');
|
|
33
36
|
return createStubEcdsaAccount(address);
|
|
34
37
|
}
|
|
35
38
|
}
|
|
36
|
-
getMulticallContract() {
|
|
37
|
-
return getCanonicalMultiCallEntrypoint();
|
|
38
|
-
}
|
|
39
39
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Account, AccountContract } from '@aztec/aztec.js/account';
|
|
2
2
|
import type { Fq } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import type { ContractArtifact } from '@aztec/stdlib/abi';
|
|
4
|
-
import type { CompleteAddress
|
|
4
|
+
import type { CompleteAddress } from '@aztec/stdlib/contract';
|
|
5
5
|
import type { AccountType } from '../wallet_db.js';
|
|
6
6
|
/**
|
|
7
7
|
* Provides account contract implementations and stub accounts for the EmbeddedWallet.
|
|
@@ -11,13 +11,10 @@ import type { AccountType } from '../wallet_db.js';
|
|
|
11
11
|
*/
|
|
12
12
|
export interface AccountContractsProvider {
|
|
13
13
|
getSchnorrAccountContract(signingKey: Fq): Promise<AccountContract>;
|
|
14
|
+
getSchnorrInitializerlessAccountContract(signingKey: Fq): Promise<AccountContract>;
|
|
14
15
|
getEcdsaRAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
15
16
|
getEcdsaKAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
16
17
|
getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact>;
|
|
17
|
-
getMulticallContract(): Promise<{
|
|
18
|
-
instance: ContractInstanceWithAddress;
|
|
19
|
-
artifact: ContractArtifact;
|
|
20
|
-
}>;
|
|
21
18
|
createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account>;
|
|
22
19
|
}
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lbWJlZGRlZC9hY2NvdW50LWNvbnRyYWN0LXByb3ZpZGVycy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVuRDs7Ozs7R0FLRztBQUNILE1BQU0sV0FBVyx3QkFBd0I7SUFDdkMseUJBQXlCLENBQUMsVUFBVSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDcEUsd0NBQXdDLENBQUMsVUFBVSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDbkYsd0JBQXdCLENBQUMsVUFBVSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDdkUsd0JBQXdCLENBQUMsVUFBVSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDdkUsOEJBQThCLENBQUMsSUFBSSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUM3RSxpQkFBaUIsQ0FBQyxPQUFPLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0NBQ2xGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/embedded/account-contract-providers/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/embedded/account-contract-providers/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;;;;GAKG;AACH,MAAM,WAAW,wBAAwB;IACvC,yBAAyB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACpE,wCAAwC,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACnF,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACvE,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACvE,8BAA8B,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7E,iBAAiB,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAClF"}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import { type Account } from '@aztec/aztec.js/account';
|
|
2
2
|
import { type InteractionWaitOptions, type SendReturn } from '@aztec/aztec.js/contracts';
|
|
3
|
-
import type { Aliased, SendOptions } from '@aztec/aztec.js/wallet';
|
|
3
|
+
import type { Aliased, ExecuteUtilityOptions, PrivateEvent, PrivateEventFilter, ProfileOptions, SendOptions, SimulateOptions } from '@aztec/aztec.js/wallet';
|
|
4
4
|
import { AccountManager, TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
|
|
5
5
|
import { Fq, Fr } from '@aztec/foundation/curves/bn254';
|
|
6
6
|
import type { Logger } from '@aztec/foundation/log';
|
|
7
7
|
import type { AztecAsyncKVStore } from '@aztec/kv-store';
|
|
8
8
|
import type { PXEConfig, PXECreationOptions } from '@aztec/pxe/client/lazy';
|
|
9
9
|
import type { PXE } from '@aztec/pxe/server';
|
|
10
|
+
import type { EventMetadataDefinition, FunctionCall } from '@aztec/stdlib/abi';
|
|
10
11
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
11
12
|
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
12
|
-
import { type ContractOverrides, ExecutionPayload } from '@aztec/stdlib/tx';
|
|
13
|
+
import { type ContractOverrides, ExecutionPayload, type TxProfileResult, type UtilityExecutionResult } from '@aztec/stdlib/tx';
|
|
13
14
|
import { BaseWallet, type SimulateViaEntrypointOptions } from '@aztec/wallet-sdk/base-wallet';
|
|
14
15
|
import type { AccountContractsProvider } from './account-contract-providers/types.js';
|
|
15
16
|
import { type AccountType, WalletDB } from './wallet_db.js';
|
|
@@ -49,6 +50,7 @@ export declare class EmbeddedWallet extends BaseWallet {
|
|
|
49
50
|
protected walletDB: WalletDB;
|
|
50
51
|
protected accountContracts: AccountContractsProvider;
|
|
51
52
|
protected estimatedGasPadding: number;
|
|
53
|
+
protected stubClassIds: Map<"ecdsasecp256k1" | "ecdsasecp256r1" | "schnorr" | "schnorr_initializerless", Fr>;
|
|
52
54
|
constructor(pxe: PXE, aztecNode: AztecNode, walletDB: WalletDB, accountContracts: AccountContractsProvider, log?: Logger);
|
|
53
55
|
protected getAccountFromAddress(address: AztecAddress): Promise<Account>;
|
|
54
56
|
getAccounts(): Promise<Aliased<AztecAddress>[]>;
|
|
@@ -60,6 +62,20 @@ export declare class EmbeddedWallet extends BaseWallet {
|
|
|
60
62
|
* the necessary authwitnesses.
|
|
61
63
|
*/
|
|
62
64
|
sendTx<W extends InteractionWaitOptions = undefined>(executionPayload: ExecutionPayload, opts: SendOptions<W>): Promise<SendReturn<W>>;
|
|
65
|
+
/**
|
|
66
|
+
* Overrides the base simulateTx to drive PXE syncing explicitly. The PXE created by the embedded
|
|
67
|
+
* wallet has autoSync disabled (so we can share one sync across simulate+send in sendTx); for
|
|
68
|
+
* standalone simulations we still need a fresh anchor block, which we provide here.
|
|
69
|
+
*/
|
|
70
|
+
simulateTx(executionPayload: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResultWithAppOffset>;
|
|
71
|
+
profileTx(executionPayload: ExecutionPayload, opts: ProfileOptions): Promise<TxProfileResult>;
|
|
72
|
+
executeUtility(call: FunctionCall, opts: ExecuteUtilityOptions): Promise<UtilityExecutionResult>;
|
|
73
|
+
getPrivateEvents<T>(eventDef: EventMetadataDefinition, eventFilter: PrivateEventFilter): Promise<PrivateEvent<T>[]>;
|
|
74
|
+
/**
|
|
75
|
+
* Hashes and registers the stub class for every supported account type with PXE, populating
|
|
76
|
+
* stubClassIds. Called on wallet initialization.
|
|
77
|
+
*/
|
|
78
|
+
initStubClasses(): Promise<void>;
|
|
63
79
|
/**
|
|
64
80
|
* Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
|
|
65
81
|
* Uses a type-specific stub artifact so that the stub's constructor selector matches the real account's constructor.
|
|
@@ -73,11 +89,12 @@ export declare class EmbeddedWallet extends BaseWallet {
|
|
|
73
89
|
protected simulateViaEntrypoint(executionPayload: ExecutionPayload, opts: SimulateViaEntrypointOptions): Promise<TxSimulationResultWithAppOffset>;
|
|
74
90
|
protected createAccountInternal(type: AccountType, secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager>;
|
|
75
91
|
createAndStoreAccount(alias: string, type: AccountType, secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager>;
|
|
76
|
-
createSchnorrAccount(secret: Fr, salt: Fr, signingKey
|
|
92
|
+
createSchnorrAccount(secret: Fr, salt: Fr, signingKey: Fq, alias?: string): Promise<AccountManager>;
|
|
93
|
+
createSchnorrInitializerlessAccount(secret: Fr, salt: Fr, signingKey: Fq, alias?: string): Promise<AccountManager>;
|
|
77
94
|
createECDSARAccount(secret: Fr, salt: Fr, signingKey: Buffer, alias?: string): Promise<AccountManager>;
|
|
78
95
|
createECDSAKAccount(secret: Fr, salt: Fr, signingKey: Buffer, alias?: string): Promise<AccountManager>;
|
|
79
96
|
setMinFeePadding(value?: number): void;
|
|
80
97
|
setEstimatedGasPadding(value?: number): void;
|
|
81
98
|
stop(): Promise<void>;
|
|
82
99
|
}
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1iZWRkZWRfd2FsbGV0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZW1iZWRkZWQvZW1iZWRkZWRfd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBVyxNQUFNLHlCQUF5QixDQUFDO0FBRWhFLE9BQU8sRUFFTCxLQUFLLHNCQUFzQixFQUUzQixLQUFLLFVBQVUsRUFFaEIsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEtBQUssRUFDVixPQUFPLEVBQ1AscUJBQXFCLEVBQ3JCLFlBQVksRUFDWixrQkFBa0IsRUFDbEIsY0FBYyxFQUNkLFdBQVcsRUFDWCxlQUFlLEVBQ2hCLE1BQU0sd0JBQXdCLENBQUM7QUFDaEMsT0FBTyxFQUFFLGNBQWMsRUFBRSwrQkFBK0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBS3pGLE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1RSxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM3QyxPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0QsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxFQUNMLEtBQUssaUJBQWlCLEVBQ3RCLGdCQUFnQixFQUdoQixLQUFLLGVBQWUsRUFFcEIsS0FBSyxzQkFB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"embedded_wallet.d.ts","sourceRoot":"","sources":["../../src/embedded/embedded_wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAW,MAAM,yBAAyB,CAAC;AAEhE,OAAO,
|
|
1
|
+
{"version":3,"file":"embedded_wallet.d.ts","sourceRoot":"","sources":["../../src/embedded/embedded_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import { NO_FROM } from '@aztec/aztec.js/account';
|
|
2
2
|
import { CallAuthorizationRequest } from '@aztec/aztec.js/authorization';
|
|
3
|
-
import {
|
|
3
|
+
import { ContractFunctionInteraction, NO_WAIT } from '@aztec/aztec.js/contracts';
|
|
4
4
|
import { AccountManager, TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
|
|
5
5
|
import { DefaultEntrypoint } from '@aztec/entrypoints/default';
|
|
6
|
+
import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
|
|
7
|
+
import { Schnorr } from '@aztec/foundation/crypto/schnorr';
|
|
6
8
|
import { Fq, Fr } from '@aztec/foundation/curves/bn254';
|
|
7
|
-
import {
|
|
9
|
+
import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
|
|
8
10
|
import { GasSettings } from '@aztec/stdlib/gas';
|
|
9
|
-
import { deriveSigningKey } from '@aztec/stdlib/keys';
|
|
10
11
|
import { SimulationOverrides, TxStatus, collectOffchainEffects, mergeExecutionPayloads } from '@aztec/stdlib/tx';
|
|
11
|
-
import { BaseWallet } from '@aztec/wallet-sdk/base-wallet';
|
|
12
|
+
import { BaseWallet, getGasLimits } from '@aztec/wallet-sdk/base-wallet';
|
|
12
13
|
/** Splits a unified EmbeddedWalletPXEOptions into PXEConfig overrides and PXECreationOptions. */ export function splitPxeOptions(pxe) {
|
|
13
14
|
if (!pxe) {
|
|
14
15
|
return {
|
|
@@ -16,7 +17,7 @@ import { BaseWallet } from '@aztec/wallet-sdk/base-wallet';
|
|
|
16
17
|
creation: {}
|
|
17
18
|
};
|
|
18
19
|
}
|
|
19
|
-
const { loggers, loggerActorLabel, proverOrOptions, store, simulator, ...config } = pxe;
|
|
20
|
+
const { loggers, loggerActorLabel, proverOrOptions, store, simulator, hooks, preloadedContractsProvider, ...config } = pxe;
|
|
20
21
|
return {
|
|
21
22
|
config,
|
|
22
23
|
creation: {
|
|
@@ -24,7 +25,9 @@ import { BaseWallet } from '@aztec/wallet-sdk/base-wallet';
|
|
|
24
25
|
loggerActorLabel,
|
|
25
26
|
proverOrOptions,
|
|
26
27
|
store,
|
|
27
|
-
simulator
|
|
28
|
+
simulator,
|
|
29
|
+
hooks,
|
|
30
|
+
preloadedContractsProvider
|
|
28
31
|
}
|
|
29
32
|
};
|
|
30
33
|
}
|
|
@@ -33,8 +36,11 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
33
36
|
walletDB;
|
|
34
37
|
accountContracts;
|
|
35
38
|
estimatedGasPadding;
|
|
39
|
+
// Stub class ids, populated on wallet startup
|
|
40
|
+
// to avoid redundant work per simulation
|
|
41
|
+
stubClassIds;
|
|
36
42
|
constructor(pxe, aztecNode, walletDB, accountContracts, log){
|
|
37
|
-
super(pxe, aztecNode, log), this.walletDB = walletDB, this.accountContracts = accountContracts, this.estimatedGasPadding = DEFAULT_ESTIMATED_GAS_PADDING;
|
|
43
|
+
super(pxe, aztecNode, log), this.walletDB = walletDB, this.accountContracts = accountContracts, this.estimatedGasPadding = DEFAULT_ESTIMATED_GAS_PADDING, this.stubClassIds = new Map();
|
|
38
44
|
}
|
|
39
45
|
async getAccountFromAddress(address) {
|
|
40
46
|
const { secretKey, salt, signingKey, type } = await this.walletDB.retrieveAccount(address);
|
|
@@ -50,14 +56,24 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
50
56
|
}
|
|
51
57
|
async registerSender(address, alias) {
|
|
52
58
|
await this.walletDB.storeSender(address, alias);
|
|
53
|
-
|
|
59
|
+
await this.pxe.registerTaggingSecretSource({
|
|
60
|
+
kind: 'address-derived',
|
|
61
|
+
sender: address
|
|
62
|
+
});
|
|
63
|
+
return address;
|
|
54
64
|
}
|
|
55
65
|
async getAddressBook() {
|
|
56
|
-
const
|
|
66
|
+
const sources = await this.pxe.getTaggingSecretSources({
|
|
67
|
+
kind: 'address-derived'
|
|
68
|
+
});
|
|
69
|
+
const senders = sources.map((source)=>source.sender);
|
|
57
70
|
const storedSenders = await this.walletDB.listSenders();
|
|
58
71
|
for (const storedSender of storedSenders){
|
|
59
72
|
if (senders.findIndex((sender)=>sender.equals(storedSender.item)) === -1) {
|
|
60
|
-
await this.pxe.
|
|
73
|
+
await this.pxe.registerTaggingSecretSource({
|
|
74
|
+
kind: 'address-derived',
|
|
75
|
+
sender: storedSender.item
|
|
76
|
+
});
|
|
61
77
|
}
|
|
62
78
|
}
|
|
63
79
|
return storedSenders;
|
|
@@ -67,6 +83,9 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
67
83
|
* estimates actual gas usage and captures call authorization requests to generate
|
|
68
84
|
* the necessary authwitnesses.
|
|
69
85
|
*/ async sendTx(executionPayload, opts) {
|
|
86
|
+
// PXE has autoSync disabled by the embedded wallet entrypoints, so we sync once here to cover
|
|
87
|
+
// both the inner simulateTx (via simulateViaEntrypoint) and the proveTx that super.sendTx
|
|
88
|
+
await this.pxe.sync();
|
|
70
89
|
const feeOptions = await this.completeFeeOptions({
|
|
71
90
|
from: opts.from,
|
|
72
91
|
feePayer: executionPayload.feePayer,
|
|
@@ -79,7 +98,8 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
79
98
|
from: opts.from,
|
|
80
99
|
feeOptions,
|
|
81
100
|
additionalScopes: opts.additionalScopes,
|
|
82
|
-
skipTxValidation: true
|
|
101
|
+
skipTxValidation: true,
|
|
102
|
+
sendMessagesAs: opts.sendMessagesAs
|
|
83
103
|
});
|
|
84
104
|
const offchainEffects = collectOffchainEffects(simulationResult.privateExecutionResult);
|
|
85
105
|
const authWitnesses = await Promise.all(offchainEffects.map(async (effect)=>{
|
|
@@ -98,7 +118,8 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
98
118
|
executionPayload.authWitnesses.push(authwit);
|
|
99
119
|
}
|
|
100
120
|
}
|
|
101
|
-
const
|
|
121
|
+
const maxTxGasLimits = await this.getMaxTxGasLimits();
|
|
122
|
+
const estimated = getGasLimits(simulationResult.gasUsed, maxTxGasLimits, this.estimatedGasPadding);
|
|
102
123
|
this.log.verbose(`Estimated gas limits for tx: DA=${estimated.gasLimits.daGas} L2=${estimated.gasLimits.l2Gas} teardownDA=${estimated.teardownGasLimits.daGas} teardownL2=${estimated.teardownGasLimits.l2Gas}`);
|
|
103
124
|
const gasSettings = GasSettings.from({
|
|
104
125
|
...opts.fee?.gasSettings,
|
|
@@ -107,19 +128,24 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
107
128
|
gasLimits: opts.fee?.gasSettings?.gasLimits ?? estimated.gasLimits,
|
|
108
129
|
teardownGasLimits: opts.fee?.gasSettings?.teardownGasLimits ?? estimated.teardownGasLimits
|
|
109
130
|
});
|
|
110
|
-
|
|
111
|
-
if (
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
131
|
+
let wait = opts.wait;
|
|
132
|
+
if (wait !== NO_WAIT) {
|
|
133
|
+
const callerWaitOpts = typeof wait === 'object' ? wait : {};
|
|
134
|
+
wait = {
|
|
135
|
+
...callerWaitOpts,
|
|
136
|
+
// Default to PROPOSED so the wait returns as soon as the tx lands in a proposed L2 block,
|
|
137
|
+
// rather than waiting until the end of the slot for the checkpoint to be published to L1.
|
|
138
|
+
// This is what makes MBPS (Multiple Blocks Per Slot) actually improve UX: with CHECKPOINTED
|
|
139
|
+
// we'd block until L1 inclusion regardless of how early in the slot the tx was sequenced.
|
|
140
|
+
// The tradeoff is a weaker guarantee — a proposed block only becomes canonical once it (or
|
|
141
|
+
// a later block in the same slot) is checkpointed, so a tx could be re-orged out if the
|
|
142
|
+
// proposer fails to publish to L1 (which should be rare, since they'd get slashed for it).
|
|
143
|
+
waitForStatus: callerWaitOpts.waitForStatus ?? TxStatus.PROPOSED
|
|
144
|
+
};
|
|
120
145
|
}
|
|
121
146
|
return super.sendTx(executionPayload, {
|
|
122
147
|
...opts,
|
|
148
|
+
wait: wait,
|
|
123
149
|
fee: {
|
|
124
150
|
...opts.fee,
|
|
125
151
|
gasSettings
|
|
@@ -127,6 +153,42 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
127
153
|
});
|
|
128
154
|
}
|
|
129
155
|
/**
|
|
156
|
+
* Overrides the base simulateTx to drive PXE syncing explicitly. The PXE created by the embedded
|
|
157
|
+
* wallet has autoSync disabled (so we can share one sync across simulate+send in sendTx); for
|
|
158
|
+
* standalone simulations we still need a fresh anchor block, which we provide here.
|
|
159
|
+
*/ async simulateTx(executionPayload, opts) {
|
|
160
|
+
await this.pxe.sync();
|
|
161
|
+
return super.simulateTx(executionPayload, opts);
|
|
162
|
+
}
|
|
163
|
+
async profileTx(executionPayload, opts) {
|
|
164
|
+
await this.pxe.sync();
|
|
165
|
+
return super.profileTx(executionPayload, opts);
|
|
166
|
+
}
|
|
167
|
+
async executeUtility(call, opts) {
|
|
168
|
+
await this.pxe.sync();
|
|
169
|
+
return super.executeUtility(call, opts);
|
|
170
|
+
}
|
|
171
|
+
async getPrivateEvents(eventDef, eventFilter) {
|
|
172
|
+
await this.pxe.sync();
|
|
173
|
+
return super.getPrivateEvents(eventDef, eventFilter);
|
|
174
|
+
}
|
|
175
|
+
/**
|
|
176
|
+
* Hashes and registers the stub class for every supported account type with PXE, populating
|
|
177
|
+
* stubClassIds. Called on wallet initialization.
|
|
178
|
+
*/ async initStubClasses() {
|
|
179
|
+
const schnorrArtifact = await this.accountContracts.getStubAccountContractArtifact('schnorr');
|
|
180
|
+
const { id: schnorrClassId } = await getContractClassFromArtifact(schnorrArtifact);
|
|
181
|
+
await this.pxe.registerContractClass(schnorrArtifact);
|
|
182
|
+
// ecdsa stubs share the same class id
|
|
183
|
+
const ecdsaArtifact = await this.accountContracts.getStubAccountContractArtifact('ecdsasecp256r1');
|
|
184
|
+
const { id: ecdsaClassId } = await getContractClassFromArtifact(ecdsaArtifact);
|
|
185
|
+
await this.pxe.registerContractClass(ecdsaArtifact);
|
|
186
|
+
this.stubClassIds.set('schnorr', schnorrClassId);
|
|
187
|
+
this.stubClassIds.set('schnorr_initializerless', schnorrClassId);
|
|
188
|
+
this.stubClassIds.set('ecdsasecp256k1', ecdsaClassId);
|
|
189
|
+
this.stubClassIds.set('ecdsasecp256r1', ecdsaClassId);
|
|
190
|
+
}
|
|
191
|
+
/**
|
|
130
192
|
* Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
|
|
131
193
|
* Uses a type-specific stub artifact so that the stub's constructor selector matches the real account's constructor.
|
|
132
194
|
*/ async buildAccountOverrides(addresses) {
|
|
@@ -136,27 +198,21 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
136
198
|
for (const account of filtered){
|
|
137
199
|
const address = account.item;
|
|
138
200
|
const { type } = await this.walletDB.retrieveAccount(address);
|
|
139
|
-
const
|
|
201
|
+
const stubClassId = this.stubClassIds.get(type);
|
|
202
|
+
if (!stubClassId) {
|
|
203
|
+
throw new Error(`Stub class for account type '${type}' was not registered at wallet init. This is a bug — initStubClasses should cover every supported AccountType.`);
|
|
204
|
+
}
|
|
140
205
|
const originalAccount = await this.getAccountFromAddress(address);
|
|
141
206
|
const completeAddress = originalAccount.getCompleteAddress();
|
|
142
207
|
const contractInstance = await this.pxe.getContractInstance(completeAddress.address);
|
|
143
208
|
if (!contractInstance) {
|
|
144
209
|
throw new Error(`No contract instance found for address: ${completeAddress.address} during account override building. This is a bug!`);
|
|
145
210
|
}
|
|
146
|
-
const stubConstructorArgs = type === 'schnorr' ? [
|
|
147
|
-
Fr.ZERO,
|
|
148
|
-
Fr.ZERO
|
|
149
|
-
] : [
|
|
150
|
-
Buffer.alloc(32),
|
|
151
|
-
Buffer.alloc(32)
|
|
152
|
-
];
|
|
153
|
-
const stubInstance = await getContractInstanceFromInstantiationParams(stubArtifact, {
|
|
154
|
-
salt: Fr.random(),
|
|
155
|
-
constructorArgs: stubConstructorArgs
|
|
156
|
-
});
|
|
157
211
|
contracts[address.toString()] = {
|
|
158
|
-
instance:
|
|
159
|
-
|
|
212
|
+
instance: {
|
|
213
|
+
...contractInstance,
|
|
214
|
+
currentContractClassId: stubClassId
|
|
215
|
+
}
|
|
160
216
|
};
|
|
161
217
|
}
|
|
162
218
|
return contracts;
|
|
@@ -167,7 +223,7 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
167
223
|
* private kernel circuit execution.
|
|
168
224
|
*/ async simulateViaEntrypoint(executionPayload, opts) {
|
|
169
225
|
const { from, feeOptions, additionalScopes, skipTxValidation, skipFeeEnforcement, sendMessagesAs } = opts;
|
|
170
|
-
const scopes = this.scopesFrom(from, additionalScopes);
|
|
226
|
+
const scopes = this.scopesFrom(from, additionalScopes ?? [], sendMessagesAs);
|
|
171
227
|
const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
|
|
172
228
|
const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
|
|
173
229
|
feeExecutionPayload,
|
|
@@ -175,7 +231,9 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
175
231
|
]) : executionPayload;
|
|
176
232
|
const chainInfo = await this.getChainInfo();
|
|
177
233
|
const accountOverrides = await this.buildAccountOverrides(scopes);
|
|
178
|
-
const overrides = new SimulationOverrides(
|
|
234
|
+
const overrides = new SimulationOverrides({
|
|
235
|
+
contracts: accountOverrides
|
|
236
|
+
});
|
|
179
237
|
let txRequest;
|
|
180
238
|
if (from === NO_FROM) {
|
|
181
239
|
const entrypoint = new DefaultEntrypoint();
|
|
@@ -206,12 +264,24 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
206
264
|
}
|
|
207
265
|
async createAccountInternal(type, secret, salt, signingKey) {
|
|
208
266
|
let contract;
|
|
267
|
+
let immutablesHash;
|
|
268
|
+
let publicKey;
|
|
209
269
|
switch(type){
|
|
210
270
|
case 'schnorr':
|
|
211
271
|
{
|
|
212
272
|
contract = await this.accountContracts.getSchnorrAccountContract(Fq.fromBuffer(signingKey));
|
|
213
273
|
break;
|
|
214
274
|
}
|
|
275
|
+
case 'schnorr_initializerless':
|
|
276
|
+
{
|
|
277
|
+
contract = await this.accountContracts.getSchnorrInitializerlessAccountContract(Fq.fromBuffer(signingKey));
|
|
278
|
+
publicKey = await new Schnorr().computePublicKey(Fq.fromBuffer(signingKey));
|
|
279
|
+
immutablesHash = await poseidon2Hash([
|
|
280
|
+
publicKey.x,
|
|
281
|
+
publicKey.y
|
|
282
|
+
]);
|
|
283
|
+
break;
|
|
284
|
+
}
|
|
215
285
|
case 'ecdsasecp256k1':
|
|
216
286
|
{
|
|
217
287
|
contract = await this.accountContracts.getEcdsaKAccountContract(signingKey);
|
|
@@ -227,12 +297,29 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
227
297
|
throw new Error(`Unknown account type ${type}`);
|
|
228
298
|
}
|
|
229
299
|
}
|
|
230
|
-
const accountManager = await AccountManager.create(this, secret, contract,
|
|
300
|
+
const accountManager = await AccountManager.create(this, secret, contract, {
|
|
301
|
+
salt,
|
|
302
|
+
immutablesHash
|
|
303
|
+
});
|
|
231
304
|
const instance = accountManager.getInstance();
|
|
232
305
|
const existingInstance = await this.pxe.getContractInstance(instance.address);
|
|
233
306
|
if (!existingInstance) {
|
|
234
307
|
const existingArtifact = await this.pxe.getContractArtifact(instance.currentContractClassId);
|
|
308
|
+
const artifact = existingArtifact ?? await accountManager.getAccountContract().getContractArtifact();
|
|
235
309
|
await this.registerContract(instance, !existingArtifact ? await accountManager.getAccountContract().getContractArtifact() : undefined, accountManager.getSecretKey());
|
|
310
|
+
if (type === 'schnorr_initializerless') {
|
|
311
|
+
const constructor = artifact.functions.find((f)=>f.name === 'constructor');
|
|
312
|
+
if (!constructor) {
|
|
313
|
+
throw new Error('Could not create SchnorrInitializerlessAccountContract: constructor ABI not found');
|
|
314
|
+
}
|
|
315
|
+
const storeCall = new ContractFunctionInteraction(this, instance.address, constructor, [
|
|
316
|
+
publicKey.x,
|
|
317
|
+
publicKey.y
|
|
318
|
+
]);
|
|
319
|
+
await storeCall.simulate({
|
|
320
|
+
from: instance.address
|
|
321
|
+
});
|
|
322
|
+
}
|
|
236
323
|
}
|
|
237
324
|
return accountManager;
|
|
238
325
|
}
|
|
@@ -248,8 +335,10 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
248
335
|
return accountManager;
|
|
249
336
|
}
|
|
250
337
|
createSchnorrAccount(secret, salt, signingKey, alias) {
|
|
251
|
-
|
|
252
|
-
|
|
338
|
+
return this.createAndStoreAccount(alias ?? '', 'schnorr', secret, salt, signingKey.toBuffer());
|
|
339
|
+
}
|
|
340
|
+
createSchnorrInitializerlessAccount(secret, salt, signingKey, alias) {
|
|
341
|
+
return this.createAndStoreAccount(alias ?? '', 'schnorr_initializerless', secret, salt, signingKey.toBuffer());
|
|
253
342
|
}
|
|
254
343
|
createECDSARAccount(secret, salt, signingKey, alias) {
|
|
255
344
|
return this.createAndStoreAccount(alias ?? '', 'ecdsasecp256r1', secret, salt, signingKey);
|
|
@@ -263,7 +352,8 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
263
352
|
setEstimatedGasPadding(value) {
|
|
264
353
|
this.estimatedGasPadding = value ?? DEFAULT_ESTIMATED_GAS_PADDING;
|
|
265
354
|
}
|
|
266
|
-
stop() {
|
|
267
|
-
|
|
355
|
+
async stop() {
|
|
356
|
+
await this.pxe.stop();
|
|
357
|
+
await this.walletDB.close();
|
|
268
358
|
}
|
|
269
359
|
}
|