@aztec/wallets 0.0.1-commit.858058eac → 0.0.1-commit.8655d4a
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 +4 -3
- package/dest/embedded/account-contract-providers/bundle.d.ts.map +1 -1
- package/dest/embedded/account-contract-providers/bundle.js +6 -5
- package/dest/embedded/account-contract-providers/lazy.d.ts +4 -3
- package/dest/embedded/account-contract-providers/lazy.d.ts.map +1 -1
- package/dest/embedded/account-contract-providers/lazy.js +16 -6
- package/dest/embedded/account-contract-providers/types.d.ts +4 -3
- package/dest/embedded/account-contract-providers/types.d.ts.map +1 -1
- package/dest/embedded/embedded_wallet.d.ts +66 -7
- package/dest/embedded/embedded_wallet.d.ts.map +1 -1
- package/dest/embedded/embedded_wallet.js +218 -53
- package/dest/embedded/entrypoints/browser.d.ts +8 -3
- package/dest/embedded/entrypoints/browser.d.ts.map +1 -1
- package/dest/embedded/entrypoints/browser.js +50 -16
- package/dest/embedded/entrypoints/node.d.ts +7 -11
- package/dest/embedded/entrypoints/node.d.ts.map +1 -1
- package/dest/embedded/entrypoints/node.js +35 -16
- package/dest/embedded/store_encryption.d.ts +67 -0
- package/dest/embedded/store_encryption.d.ts.map +1 -0
- package/dest/embedded/store_encryption.js +71 -0
- package/dest/embedded/wallet_db.d.ts +5 -4
- package/dest/embedded/wallet_db.d.ts.map +1 -1
- package/dest/embedded/wallet_db.js +9 -9
- package/dest/testing.d.ts +1 -1
- package/dest/testing.d.ts.map +1 -1
- package/dest/testing.js +2 -2
- package/package.json +21 -9
- package/src/embedded/account-contract-providers/bundle.ts +7 -5
- package/src/embedded/account-contract-providers/lazy.ts +17 -6
- package/src/embedded/account-contract-providers/types.ts +4 -2
- package/src/embedded/embedded_wallet.ts +311 -61
- package/src/embedded/entrypoints/browser.ts +70 -26
- package/src/embedded/entrypoints/node.ts +59 -45
- package/src/embedded/store_encryption.ts +107 -0
- package/src/embedded/wallet_db.ts +12 -9
- package/src/testing.ts +2 -1
- package/dest/embedded/embedded_wallet_browser.d.ts +0 -5
- package/dest/embedded/embedded_wallet_browser.d.ts.map +0 -1
- package/dest/embedded/embedded_wallet_browser.js +0 -31
- package/src/embedded/embedded_wallet_browser.ts +0 -40
|
@@ -2,6 +2,7 @@ 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
4
|
import type { CompleteAddress } from '@aztec/stdlib/contract';
|
|
5
|
+
import type { AccountType } from '../wallet_db.js';
|
|
5
6
|
import type { AccountContractsProvider } from './types.js';
|
|
6
7
|
/**
|
|
7
8
|
* Loads account contract artifacts eagerly via static imports.
|
|
@@ -11,7 +12,7 @@ export declare class BundleAccountContractsProvider implements AccountContractsP
|
|
|
11
12
|
getSchnorrAccountContract(signingKey: Fq): Promise<AccountContract>;
|
|
12
13
|
getEcdsaRAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
13
14
|
getEcdsaKAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
14
|
-
getStubAccountContractArtifact(): Promise<ContractArtifact>;
|
|
15
|
-
createStubAccount(address: CompleteAddress): Promise<Account>;
|
|
15
|
+
getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact>;
|
|
16
|
+
createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account>;
|
|
16
17
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVuZGxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZW1iZWRkZWQvYWNjb3VudC1jb250cmFjdC1wcm92aWRlcnMvYnVuZGxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTNEOzs7R0FHRztBQUNILHFCQUFhLDhCQUErQixZQUFXLHdCQUF3QjtJQUM3RSx5QkFBeUIsQ0FBQyxVQUFVLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFbEU7SUFFRCx3QkFBd0IsQ0FBQyxVQUFVLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFckU7SUFFRCx3QkFBd0IsQ0FBQyxVQUFVLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFckU7SUFFRCw4QkFBOEIsQ0FBQyxJQUFJLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUUzRTtJQUVELGlCQUFpQixDQUFDLE9BQU8sRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRS9FO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/embedded/account-contract-providers/bundle.ts"],"names":[],"mappings":"
|
|
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,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,CAE3E;IAED,iBAAiB,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAE/E;CACF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { EcdsaKAccountContract, EcdsaRAccountContract } from '@aztec/accounts/ecdsa';
|
|
2
2
|
import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
|
|
3
|
-
import {
|
|
3
|
+
import { StubEcdsaAccountContractArtifact, createStubEcdsaAccount } from '@aztec/accounts/stub/ecdsa';
|
|
4
|
+
import { StubSchnorrAccountContractArtifact, createStubSchnorrAccount } from '@aztec/accounts/stub/schnorr';
|
|
4
5
|
/**
|
|
5
6
|
* Loads account contract artifacts eagerly via static imports.
|
|
6
7
|
* Designed for Node.js environments where all artifacts are available at startup.
|
|
@@ -14,10 +15,10 @@ import { StubAccountContractArtifact, createStubAccount } from '@aztec/accounts/
|
|
|
14
15
|
getEcdsaKAccountContract(signingKey) {
|
|
15
16
|
return Promise.resolve(new EcdsaKAccountContract(signingKey));
|
|
16
17
|
}
|
|
17
|
-
getStubAccountContractArtifact() {
|
|
18
|
-
return Promise.resolve(
|
|
18
|
+
getStubAccountContractArtifact(type) {
|
|
19
|
+
return Promise.resolve(type === 'schnorr' ? StubSchnorrAccountContractArtifact : StubEcdsaAccountContractArtifact);
|
|
19
20
|
}
|
|
20
|
-
createStubAccount(address) {
|
|
21
|
-
return Promise.resolve(
|
|
21
|
+
createStubAccount(address, type) {
|
|
22
|
+
return Promise.resolve(type === 'schnorr' ? createStubSchnorrAccount(address) : createStubEcdsaAccount(address));
|
|
22
23
|
}
|
|
23
24
|
}
|
|
@@ -2,6 +2,7 @@ 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
4
|
import type { CompleteAddress } from '@aztec/stdlib/contract';
|
|
5
|
+
import type { AccountType } from '../wallet_db.js';
|
|
5
6
|
import type { AccountContractsProvider } from './types.js';
|
|
6
7
|
/**
|
|
7
8
|
* Loads account contract artifacts lazily via dynamic imports.
|
|
@@ -11,7 +12,7 @@ export declare class LazyAccountContractsProvider implements AccountContractsPro
|
|
|
11
12
|
getSchnorrAccountContract(signingKey: Fq): Promise<AccountContract>;
|
|
12
13
|
getEcdsaRAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
13
14
|
getEcdsaKAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
14
|
-
getStubAccountContractArtifact(): Promise<ContractArtifact>;
|
|
15
|
-
createStubAccount(address: CompleteAddress): Promise<Account>;
|
|
15
|
+
getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact>;
|
|
16
|
+
createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account>;
|
|
16
17
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VtYmVkZGVkL2FjY291bnQtY29udHJhY3QtcHJvdmlkZXJzL2xhenkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFM0Q7OztHQUdHO0FBQ0gscUJBQWEsNEJBQTZCLFlBQVcsd0JBQXdCO0lBQ3JFLHlCQUF5QixDQUFDLFVBQVUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUd4RTtJQUVLLHdCQUF3QixDQUFDLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUczRTtJQUVLLHdCQUF3QixDQUFDLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUczRTtJQUVLLDhCQUE4QixDQUFDLElBQUksRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBUWpGO0lBRUssaUJBQWlCLENBQUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxJQUFJLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FRckY7Q0FDRiJ9
|
|
@@ -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;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,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,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,IAAI,OAAO,CAAC,gBAAgB,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,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"}
|
|
@@ -14,12 +14,22 @@
|
|
|
14
14
|
const { EcdsaKAccountContract } = await import('@aztec/accounts/ecdsa/lazy');
|
|
15
15
|
return new EcdsaKAccountContract(signingKey);
|
|
16
16
|
}
|
|
17
|
-
async getStubAccountContractArtifact() {
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
async getStubAccountContractArtifact(type) {
|
|
18
|
+
if (type === 'schnorr') {
|
|
19
|
+
const { getStubSchnorrAccountContractArtifact } = await import('@aztec/accounts/stub/schnorr/lazy');
|
|
20
|
+
return getStubSchnorrAccountContractArtifact();
|
|
21
|
+
} else {
|
|
22
|
+
const { getStubEcdsaAccountContractArtifact } = await import('@aztec/accounts/stub/ecdsa/lazy');
|
|
23
|
+
return getStubEcdsaAccountContractArtifact();
|
|
24
|
+
}
|
|
20
25
|
}
|
|
21
|
-
async createStubAccount(address) {
|
|
22
|
-
|
|
23
|
-
|
|
26
|
+
async createStubAccount(address, type) {
|
|
27
|
+
if (type === 'schnorr') {
|
|
28
|
+
const { createStubSchnorrAccount } = await import('@aztec/accounts/stub/schnorr/lazy');
|
|
29
|
+
return createStubSchnorrAccount(address);
|
|
30
|
+
} else {
|
|
31
|
+
const { createStubEcdsaAccount } = await import('@aztec/accounts/stub/ecdsa/lazy');
|
|
32
|
+
return createStubEcdsaAccount(address);
|
|
33
|
+
}
|
|
24
34
|
}
|
|
25
35
|
}
|
|
@@ -2,6 +2,7 @@ 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
4
|
import type { CompleteAddress } from '@aztec/stdlib/contract';
|
|
5
|
+
import type { AccountType } from '../wallet_db.js';
|
|
5
6
|
/**
|
|
6
7
|
* Provides account contract implementations and stub accounts for the EmbeddedWallet.
|
|
7
8
|
* Two implementations exist:
|
|
@@ -12,7 +13,7 @@ export interface AccountContractsProvider {
|
|
|
12
13
|
getSchnorrAccountContract(signingKey: Fq): Promise<AccountContract>;
|
|
13
14
|
getEcdsaRAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
14
15
|
getEcdsaKAccountContract(signingKey: Buffer): Promise<AccountContract>;
|
|
15
|
-
getStubAccountContractArtifact(): Promise<ContractArtifact>;
|
|
16
|
-
createStubAccount(address: CompleteAddress): Promise<Account>;
|
|
16
|
+
getStubAccountContractArtifact(type: AccountType): Promise<ContractArtifact>;
|
|
17
|
+
createStubAccount(address: CompleteAddress, type: AccountType): Promise<Account>;
|
|
17
18
|
}
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lbWJlZGRlZC9hY2NvdW50LWNvbnRyYWN0LXByb3ZpZGVycy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVuRDs7Ozs7R0FLRztBQUNILE1BQU0sV0FBVyx3QkFBd0I7SUFDdkMseUJBQXlCLENBQUMsVUFBVSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDcEUsd0JBQXdCLENBQUMsVUFBVSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDdkUsd0JBQXdCLENBQUMsVUFBVSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDdkUsOEJBQThCLENBQUMsSUFBSSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUM3RSxpQkFBaUIsQ0FBQyxPQUFPLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0NBQ2xGIn0=
|
|
@@ -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,MAAM,wBAAwB,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,WAAW,wBAAwB;IACvC,yBAAyB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACpE,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,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;
|
|
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,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,42 +1,101 @@
|
|
|
1
1
|
import { type Account } from '@aztec/aztec.js/account';
|
|
2
|
-
import type
|
|
3
|
-
import {
|
|
2
|
+
import { type InteractionWaitOptions, type SendReturn } from '@aztec/aztec.js/contracts';
|
|
3
|
+
import type { Aliased, ExecuteUtilityOptions, PrivateEvent, PrivateEventFilter, ProfileOptions, SendOptions, SimulateOptions } from '@aztec/aztec.js/wallet';
|
|
4
|
+
import { AccountManager, TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
|
|
4
5
|
import { Fq, Fr } from '@aztec/foundation/curves/bn254';
|
|
5
6
|
import type { Logger } from '@aztec/foundation/log';
|
|
7
|
+
import type { AztecAsyncKVStore } from '@aztec/kv-store';
|
|
8
|
+
import type { PXEConfig, PXECreationOptions } from '@aztec/pxe/client/lazy';
|
|
6
9
|
import type { PXE } from '@aztec/pxe/server';
|
|
10
|
+
import type { ContractArtifact, EventMetadataDefinition, FunctionCall } from '@aztec/stdlib/abi';
|
|
7
11
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
12
|
+
import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
|
|
8
13
|
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
9
|
-
import { ExecutionPayload, type
|
|
10
|
-
import { BaseWallet, type
|
|
14
|
+
import { type ContractOverrides, ExecutionPayload, type TxProfileResult, type UtilityExecutionResult } from '@aztec/stdlib/tx';
|
|
15
|
+
import { BaseWallet, type SimulateViaEntrypointOptions } from '@aztec/wallet-sdk/base-wallet';
|
|
11
16
|
import type { AccountContractsProvider } from './account-contract-providers/types.js';
|
|
12
17
|
import { type AccountType, WalletDB } from './wallet_db.js';
|
|
18
|
+
/** Options for the PXE instance created by the EmbeddedWallet. */
|
|
19
|
+
export type EmbeddedWalletPXEOptions = Partial<PXEConfig> & PXECreationOptions;
|
|
20
|
+
/** Splits a unified EmbeddedWalletPXEOptions into PXEConfig overrides and PXECreationOptions. */
|
|
21
|
+
export declare function splitPxeOptions(pxe?: EmbeddedWalletPXEOptions): {
|
|
22
|
+
config: Partial<PXEConfig>;
|
|
23
|
+
creation: PXECreationOptions;
|
|
24
|
+
};
|
|
25
|
+
/** Options for the EmbeddedWallet's own DB (accounts, senders — distinct from PXE state). */
|
|
26
|
+
export type EmbeddedWalletDBOptions = {
|
|
27
|
+
/** Override the wallet DB backend. If omitted, an IndexedDB (browser) / LMDB (node) store is created. */
|
|
28
|
+
store?: AztecAsyncKVStore;
|
|
29
|
+
};
|
|
13
30
|
export type EmbeddedWalletOptions = {
|
|
14
31
|
/** Parent logger. Child loggers are derived via createChild() for each subsystem. */
|
|
15
32
|
logger?: Logger;
|
|
16
33
|
/** Use ephemeral (in-memory) stores. Data will not persist across sessions. */
|
|
17
34
|
ephemeral?: boolean;
|
|
35
|
+
/** PXE configuration and dependency overrides (custom store, prover, simulator). */
|
|
36
|
+
pxe?: EmbeddedWalletPXEOptions;
|
|
37
|
+
/** Wallet DB dependency overrides (custom store). */
|
|
38
|
+
walletDb?: EmbeddedWalletDBOptions;
|
|
39
|
+
/**
|
|
40
|
+
* Override PXE configuration.
|
|
41
|
+
* @deprecated Use `pxe` instead.
|
|
42
|
+
*/
|
|
43
|
+
pxeConfig?: Partial<PXEConfig>;
|
|
44
|
+
/**
|
|
45
|
+
* Advanced PXE creation options (custom store, prover, simulator).
|
|
46
|
+
* @deprecated Use `pxe` instead.
|
|
47
|
+
*/
|
|
48
|
+
pxeOptions?: PXECreationOptions;
|
|
18
49
|
};
|
|
19
50
|
export declare class EmbeddedWallet extends BaseWallet {
|
|
20
51
|
protected walletDB: WalletDB;
|
|
21
52
|
protected accountContracts: AccountContractsProvider;
|
|
53
|
+
protected estimatedGasPadding: number;
|
|
54
|
+
protected stubClassIds: Map<"ecdsasecp256k1" | "ecdsasecp256r1" | "schnorr", Fr>;
|
|
22
55
|
constructor(pxe: PXE, aztecNode: AztecNode, walletDB: WalletDB, accountContracts: AccountContractsProvider, log?: Logger);
|
|
23
56
|
protected getAccountFromAddress(address: AztecAddress): Promise<Account>;
|
|
24
57
|
getAccounts(): Promise<Aliased<AztecAddress>[]>;
|
|
25
58
|
registerSender(address: AztecAddress, alias: string): Promise<AztecAddress>;
|
|
26
59
|
getAddressBook(): Promise<Aliased<AztecAddress>[]>;
|
|
60
|
+
/**
|
|
61
|
+
* Overrides the base sendTx to add a pre-simulation step before the actual send. The simulation
|
|
62
|
+
* estimates actual gas usage and captures call authorization requests to generate
|
|
63
|
+
* the necessary authwitnesses.
|
|
64
|
+
*/
|
|
65
|
+
sendTx<W extends InteractionWaitOptions = undefined>(executionPayload: ExecutionPayload, opts: SendOptions<W>): Promise<SendReturn<W>>;
|
|
66
|
+
/**
|
|
67
|
+
* Overrides the base simulateTx to drive PXE syncing explicitly. The PXE created by the embedded
|
|
68
|
+
* wallet has autoSync disabled (so we can share one sync across simulate+send in sendTx); for
|
|
69
|
+
* standalone simulations we still need a fresh anchor block, which we provide here.
|
|
70
|
+
*/
|
|
71
|
+
simulateTx(executionPayload: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResultWithAppOffset>;
|
|
72
|
+
profileTx(executionPayload: ExecutionPayload, opts: ProfileOptions): Promise<TxProfileResult>;
|
|
73
|
+
executeUtility(call: FunctionCall, opts: ExecuteUtilityOptions): Promise<UtilityExecutionResult>;
|
|
74
|
+
getPrivateEvents<T>(eventDef: EventMetadataDefinition, eventFilter: PrivateEventFilter): Promise<PrivateEvent<T>[]>;
|
|
75
|
+
registerContract(instance: ContractInstanceWithAddress, artifact?: ContractArtifact, secretKey?: Fr): Promise<ContractInstanceWithAddress>;
|
|
76
|
+
/**
|
|
77
|
+
* Hashes and registers the stub class for every supported account type with PXE, populating
|
|
78
|
+
* stubClassIds. Called on wallet initialization.
|
|
79
|
+
*/
|
|
80
|
+
initStubClasses(): Promise<void>;
|
|
81
|
+
/**
|
|
82
|
+
* Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
|
|
83
|
+
* Uses a type-specific stub artifact so that the stub's constructor selector matches the real account's constructor.
|
|
84
|
+
*/
|
|
85
|
+
protected buildAccountOverrides(addresses: AztecAddress[]): Promise<ContractOverrides>;
|
|
27
86
|
/**
|
|
28
87
|
* Simulates calls via a stub account entrypoint, bypassing real account authorization.
|
|
29
88
|
* This allows kernelless simulation with contract overrides, skipping expensive
|
|
30
89
|
* private kernel circuit execution.
|
|
31
90
|
*/
|
|
32
|
-
protected simulateViaEntrypoint(executionPayload: ExecutionPayload,
|
|
33
|
-
private getFakeAccountDataFor;
|
|
91
|
+
protected simulateViaEntrypoint(executionPayload: ExecutionPayload, opts: SimulateViaEntrypointOptions): Promise<TxSimulationResultWithAppOffset>;
|
|
34
92
|
protected createAccountInternal(type: AccountType, secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager>;
|
|
35
93
|
createAndStoreAccount(alias: string, type: AccountType, secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager>;
|
|
36
94
|
createSchnorrAccount(secret: Fr, salt: Fr, signingKey?: Fq, alias?: string): Promise<AccountManager>;
|
|
37
95
|
createECDSARAccount(secret: Fr, salt: Fr, signingKey: Buffer, alias?: string): Promise<AccountManager>;
|
|
38
96
|
createECDSAKAccount(secret: Fr, salt: Fr, signingKey: Buffer, alias?: string): Promise<AccountManager>;
|
|
39
97
|
setMinFeePadding(value?: number): void;
|
|
98
|
+
setEstimatedGasPadding(value?: number): void;
|
|
40
99
|
stop(): Promise<void>;
|
|
41
100
|
}
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1iZWRkZWRfd2FsbGV0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZW1iZWRkZWQvZW1iZWRkZWRfd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBVyxNQUFNLHlCQUF5QixDQUFDO0FBRWhFLE9BQU8sRUFBRSxLQUFLLHNCQUFzQixFQUFFLEtBQUssVUFBVSxFQUErQixNQUFNLDJCQUEyQixDQUFDO0FBQ3RILE9BQU8sS0FBSyxFQUNWLE9BQU8sRUFDUCxxQkFBcUIsRUFDckIsWUFBWSxFQUNaLGtCQUFrQixFQUNsQixjQUFjLEVBQ2QsV0FBVyxFQUNYLGVBQWUsRUFDaEIsTUFBTSx3QkFBd0IsQ0FBQztBQUNoQyxPQUFPLEVBQUUsY0FBYyxFQUFFLCtCQUErQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHekYsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVFLE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzdDLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLHVCQUF1QixFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pHLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSywyQkFBMkIsRUFBZ0MsTUFBTSx3QkFBd0IsQ0FBQztBQUV4RyxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRSxPQUFP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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,
|
|
1
|
+
{"version":3,"file":"embedded_wallet.d.ts","sourceRoot":"","sources":["../../src/embedded/embedded_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,47 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { NO_FROM } from '@aztec/aztec.js/account';
|
|
2
|
+
import { CallAuthorizationRequest } from '@aztec/aztec.js/authorization';
|
|
3
|
+
import { getGasLimits } from '@aztec/aztec.js/contracts';
|
|
4
|
+
import { AccountManager, TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
|
|
5
|
+
import { DefaultEntrypoint } from '@aztec/entrypoints/default';
|
|
3
6
|
import { Fq, Fr } from '@aztec/foundation/curves/bn254';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
7
|
+
import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
|
|
8
|
+
import { GasSettings } from '@aztec/stdlib/gas';
|
|
6
9
|
import { deriveSigningKey } from '@aztec/stdlib/keys';
|
|
7
|
-
import { mergeExecutionPayloads } from '@aztec/stdlib/tx';
|
|
10
|
+
import { SimulationOverrides, TxStatus, collectOffchainEffects, mergeExecutionPayloads } from '@aztec/stdlib/tx';
|
|
8
11
|
import { BaseWallet } from '@aztec/wallet-sdk/base-wallet';
|
|
12
|
+
/** Splits a unified EmbeddedWalletPXEOptions into PXEConfig overrides and PXECreationOptions. */ export function splitPxeOptions(pxe) {
|
|
13
|
+
if (!pxe) {
|
|
14
|
+
return {
|
|
15
|
+
config: {},
|
|
16
|
+
creation: {}
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
const { loggers, loggerActorLabel, proverOrOptions, store, simulator, hooks, preloadedContractsProvider, ...config } = pxe;
|
|
20
|
+
return {
|
|
21
|
+
config,
|
|
22
|
+
creation: {
|
|
23
|
+
loggers,
|
|
24
|
+
loggerActorLabel,
|
|
25
|
+
proverOrOptions,
|
|
26
|
+
store,
|
|
27
|
+
simulator,
|
|
28
|
+
hooks,
|
|
29
|
+
preloadedContractsProvider
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
const DEFAULT_ESTIMATED_GAS_PADDING = 0.1;
|
|
9
34
|
export class EmbeddedWallet extends BaseWallet {
|
|
10
35
|
walletDB;
|
|
11
36
|
accountContracts;
|
|
37
|
+
estimatedGasPadding;
|
|
38
|
+
// Stub class ids, populated on wallet startup
|
|
39
|
+
// to avoid redundant work per simulation
|
|
40
|
+
stubClassIds;
|
|
12
41
|
constructor(pxe, aztecNode, walletDB, accountContracts, log){
|
|
13
|
-
super(pxe, aztecNode, log), this.walletDB = walletDB, this.accountContracts = accountContracts;
|
|
42
|
+
super(pxe, aztecNode, log), this.walletDB = walletDB, this.accountContracts = accountContracts, this.estimatedGasPadding = DEFAULT_ESTIMATED_GAS_PADDING, this.stubClassIds = new Map();
|
|
14
43
|
}
|
|
15
44
|
async getAccountFromAddress(address) {
|
|
16
|
-
if (address.equals(AztecAddress.ZERO)) {
|
|
17
|
-
return new SignerlessAccount();
|
|
18
|
-
}
|
|
19
45
|
const { secretKey, salt, signingKey, type } = await this.walletDB.retrieveAccount(address);
|
|
20
46
|
const accountManager = await this.createAccountInternal(type, secretKey, salt, signingKey);
|
|
21
47
|
const account = await accountManager.getAccount();
|
|
@@ -42,57 +68,187 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
42
68
|
return storedSenders;
|
|
43
69
|
}
|
|
44
70
|
/**
|
|
71
|
+
* Overrides the base sendTx to add a pre-simulation step before the actual send. The simulation
|
|
72
|
+
* estimates actual gas usage and captures call authorization requests to generate
|
|
73
|
+
* the necessary authwitnesses.
|
|
74
|
+
*/ async sendTx(executionPayload, opts) {
|
|
75
|
+
// PXE has autoSync disabled by the embedded wallet entrypoints, so we sync once here to cover
|
|
76
|
+
// both the inner simulateTx (via simulateViaEntrypoint) and the proveTx that super.sendTx
|
|
77
|
+
await this.pxe.sync();
|
|
78
|
+
const feeOptions = await this.completeFeeOptions({
|
|
79
|
+
from: opts.from,
|
|
80
|
+
feePayer: executionPayload.feePayer,
|
|
81
|
+
gasSettings: opts.fee?.gasSettings,
|
|
82
|
+
forEstimation: true
|
|
83
|
+
});
|
|
84
|
+
// Simulate the transaction first to estimate gas and capture required
|
|
85
|
+
// private authwitnesses based on offchain effects.
|
|
86
|
+
const simulationResult = await this.simulateViaEntrypoint(executionPayload, {
|
|
87
|
+
from: opts.from,
|
|
88
|
+
feeOptions,
|
|
89
|
+
additionalScopes: opts.additionalScopes,
|
|
90
|
+
skipTxValidation: true,
|
|
91
|
+
sendMessagesAs: opts.sendMessagesAs
|
|
92
|
+
});
|
|
93
|
+
const offchainEffects = collectOffchainEffects(simulationResult.privateExecutionResult);
|
|
94
|
+
const authWitnesses = await Promise.all(offchainEffects.map(async (effect)=>{
|
|
95
|
+
try {
|
|
96
|
+
const authRequest = await CallAuthorizationRequest.fromFields(effect.data);
|
|
97
|
+
return this.createAuthWit(authRequest.onBehalfOf, {
|
|
98
|
+
consumer: effect.contractAddress,
|
|
99
|
+
innerHash: authRequest.innerHash
|
|
100
|
+
});
|
|
101
|
+
} catch {
|
|
102
|
+
return undefined;
|
|
103
|
+
}
|
|
104
|
+
}));
|
|
105
|
+
for (const authwit of authWitnesses){
|
|
106
|
+
if (authwit) {
|
|
107
|
+
executionPayload.authWitnesses.push(authwit);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
const estimated = getGasLimits(simulationResult, this.estimatedGasPadding);
|
|
111
|
+
this.log.verbose(`Estimated gas limits for tx: DA=${estimated.gasLimits.daGas} L2=${estimated.gasLimits.l2Gas} teardownDA=${estimated.teardownGasLimits.daGas} teardownL2=${estimated.teardownGasLimits.l2Gas}`);
|
|
112
|
+
const gasSettings = GasSettings.from({
|
|
113
|
+
...opts.fee?.gasSettings,
|
|
114
|
+
maxFeesPerGas: feeOptions.gasSettings.maxFeesPerGas,
|
|
115
|
+
maxPriorityFeesPerGas: feeOptions.gasSettings.maxPriorityFeesPerGas,
|
|
116
|
+
gasLimits: opts.fee?.gasSettings?.gasLimits ?? estimated.gasLimits,
|
|
117
|
+
teardownGasLimits: opts.fee?.gasSettings?.teardownGasLimits ?? estimated.teardownGasLimits
|
|
118
|
+
});
|
|
119
|
+
const waitOpts = typeof opts.wait === 'object' ? opts.wait : {};
|
|
120
|
+
if (!waitOpts?.waitForStatus) {
|
|
121
|
+
// Default to PROPOSED so the wait returns as soon as the tx lands in a proposed L2 block,
|
|
122
|
+
// rather than waiting until the end of the slot for the checkpoint to be published to L1.
|
|
123
|
+
// This is what makes MBPS (Multiple Blocks Per Slot) actually improve UX: with CHECKPOINTED
|
|
124
|
+
// we'd block until L1 inclusion regardless of how early in the slot the tx was sequenced.
|
|
125
|
+
// The tradeoff is a weaker guarantee — a proposed block only becomes canonical once it (or
|
|
126
|
+
// a later block in the same slot) is checkpointed, so a tx could be re-orged out if the
|
|
127
|
+
// proposer fails to publish to L1 (which should be rare, since they'd get slashed for it).
|
|
128
|
+
waitOpts.waitForStatus = TxStatus.PROPOSED;
|
|
129
|
+
}
|
|
130
|
+
return super.sendTx(executionPayload, {
|
|
131
|
+
...opts,
|
|
132
|
+
fee: {
|
|
133
|
+
...opts.fee,
|
|
134
|
+
gasSettings
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
/**
|
|
139
|
+
* Overrides the base simulateTx to drive PXE syncing explicitly. The PXE created by the embedded
|
|
140
|
+
* wallet has autoSync disabled (so we can share one sync across simulate+send in sendTx); for
|
|
141
|
+
* standalone simulations we still need a fresh anchor block, which we provide here.
|
|
142
|
+
*/ async simulateTx(executionPayload, opts) {
|
|
143
|
+
await this.pxe.sync();
|
|
144
|
+
return super.simulateTx(executionPayload, opts);
|
|
145
|
+
}
|
|
146
|
+
async profileTx(executionPayload, opts) {
|
|
147
|
+
await this.pxe.sync();
|
|
148
|
+
return super.profileTx(executionPayload, opts);
|
|
149
|
+
}
|
|
150
|
+
async executeUtility(call, opts) {
|
|
151
|
+
await this.pxe.sync();
|
|
152
|
+
return super.executeUtility(call, opts);
|
|
153
|
+
}
|
|
154
|
+
async getPrivateEvents(eventDef, eventFilter) {
|
|
155
|
+
await this.pxe.sync();
|
|
156
|
+
return super.getPrivateEvents(eventDef, eventFilter);
|
|
157
|
+
}
|
|
158
|
+
async registerContract(instance, artifact, secretKey) {
|
|
159
|
+
// registerContract may call pxe.updateContract under the hood, which depends on a fresh anchor
|
|
160
|
+
// block to verify the current class id from the node.
|
|
161
|
+
await this.pxe.sync();
|
|
162
|
+
return super.registerContract(instance, artifact, secretKey);
|
|
163
|
+
}
|
|
164
|
+
/**
|
|
165
|
+
* Hashes and registers the stub class for every supported account type with PXE, populating
|
|
166
|
+
* stubClassIds. Called on wallet initialization.
|
|
167
|
+
*/ async initStubClasses() {
|
|
168
|
+
const schnorrArtifact = await this.accountContracts.getStubAccountContractArtifact('schnorr');
|
|
169
|
+
const { id: schnorrClassId } = await getContractClassFromArtifact(schnorrArtifact);
|
|
170
|
+
await this.pxe.registerContractClass(schnorrArtifact);
|
|
171
|
+
// ecdsa stubs share the same class id
|
|
172
|
+
const ecdsaArtifact = await this.accountContracts.getStubAccountContractArtifact('ecdsasecp256r1');
|
|
173
|
+
const { id: ecdsaClassId } = await getContractClassFromArtifact(ecdsaArtifact);
|
|
174
|
+
await this.pxe.registerContractClass(ecdsaArtifact);
|
|
175
|
+
this.stubClassIds.set('schnorr', schnorrClassId);
|
|
176
|
+
this.stubClassIds.set('ecdsasecp256k1', ecdsaClassId);
|
|
177
|
+
this.stubClassIds.set('ecdsasecp256r1', ecdsaClassId);
|
|
178
|
+
}
|
|
179
|
+
/**
|
|
180
|
+
* Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
|
|
181
|
+
* Uses a type-specific stub artifact so that the stub's constructor selector matches the real account's constructor.
|
|
182
|
+
*/ async buildAccountOverrides(addresses) {
|
|
183
|
+
const accounts = await this.getAccounts();
|
|
184
|
+
const contracts = {};
|
|
185
|
+
const filtered = accounts.filter((acc)=>addresses.some((addr)=>addr.equals(acc.item)));
|
|
186
|
+
for (const account of filtered){
|
|
187
|
+
const address = account.item;
|
|
188
|
+
const { type } = await this.walletDB.retrieveAccount(address);
|
|
189
|
+
const stubClassId = this.stubClassIds.get(type);
|
|
190
|
+
if (!stubClassId) {
|
|
191
|
+
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.`);
|
|
192
|
+
}
|
|
193
|
+
const originalAccount = await this.getAccountFromAddress(address);
|
|
194
|
+
const completeAddress = originalAccount.getCompleteAddress();
|
|
195
|
+
const contractInstance = await this.pxe.getContractInstance(completeAddress.address);
|
|
196
|
+
if (!contractInstance) {
|
|
197
|
+
throw new Error(`No contract instance found for address: ${completeAddress.address} during account override building. This is a bug!`);
|
|
198
|
+
}
|
|
199
|
+
contracts[address.toString()] = {
|
|
200
|
+
instance: {
|
|
201
|
+
...contractInstance,
|
|
202
|
+
currentContractClassId: stubClassId
|
|
203
|
+
}
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
return contracts;
|
|
207
|
+
}
|
|
208
|
+
/**
|
|
45
209
|
* Simulates calls via a stub account entrypoint, bypassing real account authorization.
|
|
46
210
|
* This allows kernelless simulation with contract overrides, skipping expensive
|
|
47
211
|
* private kernel circuit execution.
|
|
48
|
-
*/ async simulateViaEntrypoint(executionPayload,
|
|
49
|
-
const {
|
|
212
|
+
*/ async simulateViaEntrypoint(executionPayload, opts) {
|
|
213
|
+
const { from, feeOptions, additionalScopes, skipTxValidation, skipFeeEnforcement, sendMessagesAs } = opts;
|
|
214
|
+
const scopes = this.scopesFrom(from, additionalScopes);
|
|
50
215
|
const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
|
|
51
|
-
const executionOptions = {
|
|
52
|
-
txNonce: Fr.random(),
|
|
53
|
-
cancellable: this.cancellableTransactions,
|
|
54
|
-
feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
|
|
55
|
-
};
|
|
56
216
|
const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
|
|
57
217
|
feeExecutionPayload,
|
|
58
218
|
executionPayload
|
|
59
219
|
]) : executionPayload;
|
|
60
220
|
const chainInfo = await this.getChainInfo();
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
skipFeeEnforcement: true,
|
|
65
|
-
skipTxValidation: true,
|
|
66
|
-
overrides: {
|
|
67
|
-
contracts: {
|
|
68
|
-
[from.toString()]: {
|
|
69
|
-
instance,
|
|
70
|
-
artifact
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
}
|
|
221
|
+
const accountOverrides = await this.buildAccountOverrides(scopes);
|
|
222
|
+
const overrides = new SimulationOverrides({
|
|
223
|
+
contracts: accountOverrides
|
|
74
224
|
});
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
225
|
+
let txRequest;
|
|
226
|
+
if (from === NO_FROM) {
|
|
227
|
+
const entrypoint = new DefaultEntrypoint();
|
|
228
|
+
txRequest = await entrypoint.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo);
|
|
229
|
+
} else {
|
|
230
|
+
const { type } = await this.walletDB.retrieveAccount(from);
|
|
231
|
+
const originalAccount = await this.getAccountFromAddress(from);
|
|
232
|
+
const completeAddress = originalAccount.getCompleteAddress();
|
|
233
|
+
const account = await this.accountContracts.createStubAccount(completeAddress, type);
|
|
234
|
+
const executionOptions = {
|
|
235
|
+
txNonce: Fr.random(),
|
|
236
|
+
cancellable: this.cancellableTransactions,
|
|
237
|
+
// If from is an address, feeOptions include the way the account contract should handle the fee payment
|
|
238
|
+
feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
|
|
239
|
+
};
|
|
240
|
+
txRequest = await account.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
|
|
85
241
|
}
|
|
86
|
-
const
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
242
|
+
const result = await this.pxe.simulateTx(txRequest, {
|
|
243
|
+
simulatePublic: true,
|
|
244
|
+
skipFeeEnforcement,
|
|
245
|
+
skipTxValidation,
|
|
246
|
+
overrides,
|
|
247
|
+
scopes,
|
|
248
|
+
senderForTags: this.senderForTagsFrom(from, sendMessagesAs)
|
|
90
249
|
});
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
instance,
|
|
94
|
-
artifact: stubArtifact
|
|
95
|
-
};
|
|
250
|
+
const appCallOffset = await this.computeAppCallOffset(from, feeOptions);
|
|
251
|
+
return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
|
|
96
252
|
}
|
|
97
253
|
async createAccountInternal(type, secret, salt, signingKey) {
|
|
98
254
|
let contract;
|
|
@@ -117,10 +273,15 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
117
273
|
throw new Error(`Unknown account type ${type}`);
|
|
118
274
|
}
|
|
119
275
|
}
|
|
120
|
-
const accountManager = await AccountManager.create(this, secret, contract,
|
|
276
|
+
const accountManager = await AccountManager.create(this, secret, contract, {
|
|
277
|
+
salt
|
|
278
|
+
});
|
|
121
279
|
const instance = accountManager.getInstance();
|
|
122
|
-
const
|
|
123
|
-
|
|
280
|
+
const existingInstance = await this.pxe.getContractInstance(instance.address);
|
|
281
|
+
if (!existingInstance) {
|
|
282
|
+
const existingArtifact = await this.pxe.getContractArtifact(instance.currentContractClassId);
|
|
283
|
+
await this.registerContract(instance, !existingArtifact ? await accountManager.getAccountContract().getContractArtifact() : undefined, accountManager.getSecretKey());
|
|
284
|
+
}
|
|
124
285
|
return accountManager;
|
|
125
286
|
}
|
|
126
287
|
async createAndStoreAccount(alias, type, secret, salt, signingKey) {
|
|
@@ -147,7 +308,11 @@ export class EmbeddedWallet extends BaseWallet {
|
|
|
147
308
|
setMinFeePadding(value) {
|
|
148
309
|
this.minFeePadding = value ?? 0.5;
|
|
149
310
|
}
|
|
150
|
-
|
|
151
|
-
|
|
311
|
+
setEstimatedGasPadding(value) {
|
|
312
|
+
this.estimatedGasPadding = value ?? DEFAULT_ESTIMATED_GAS_PADDING;
|
|
313
|
+
}
|
|
314
|
+
async stop() {
|
|
315
|
+
await this.pxe.stop();
|
|
316
|
+
await this.walletDB.close();
|
|
152
317
|
}
|
|
153
318
|
}
|