@aztec/aztec.js 0.65.2 → 0.67.0
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/contract/base_contract_interaction.d.ts.map +1 -1
- package/dest/contract/base_contract_interaction.js +3 -3
- package/dest/contract/deploy_method.d.ts.map +1 -1
- package/dest/contract/deploy_method.js +5 -2
- package/dest/contract/deploy_sent_tx.d.ts.map +1 -1
- package/dest/contract/deploy_sent_tx.js +3 -3
- package/dest/contract/proven_tx.d.ts.map +1 -1
- package/dest/contract/proven_tx.js +3 -3
- package/dest/contract/sent_tx.d.ts +0 -5
- package/dest/contract/sent_tx.d.ts.map +1 -1
- package/dest/contract/sent_tx.js +2 -12
- package/dest/deployment/register_class.d.ts +1 -1
- package/dest/deployment/register_class.d.ts.map +1 -1
- package/dest/deployment/register_class.js +8 -3
- package/dest/index.d.ts +5 -5
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +5 -5
- package/dest/main.js +1 -1
- package/dest/rpc_clients/node/index.d.ts +2 -2
- package/dest/rpc_clients/node/index.d.ts.map +1 -1
- package/dest/rpc_clients/node/index.js +1 -1
- package/dest/utils/anvil_test_watcher.d.ts.map +1 -1
- package/dest/utils/anvil_test_watcher.js +5 -5
- package/dest/utils/cheat_codes.d.ts +2 -125
- package/dest/utils/cheat_codes.d.ts.map +1 -1
- package/dest/utils/cheat_codes.js +12 -236
- package/dest/utils/index.d.ts +1 -0
- package/dest/utils/index.d.ts.map +1 -1
- package/dest/utils/index.js +2 -1
- package/dest/utils/node.d.ts +4 -0
- package/dest/utils/node.d.ts.map +1 -0
- package/dest/utils/node.js +16 -0
- package/dest/utils/portal_manager.d.ts +8 -8
- package/dest/utils/portal_manager.d.ts.map +1 -1
- package/dest/utils/portal_manager.js +1 -1
- package/dest/utils/pxe.d.ts +2 -2
- package/dest/utils/pxe.d.ts.map +1 -1
- package/dest/utils/pxe.js +1 -1
- package/dest/wallet/account_wallet.d.ts +1 -0
- package/dest/wallet/account_wallet.d.ts.map +1 -1
- package/dest/wallet/account_wallet.js +4 -1
- package/dest/wallet/base_wallet.d.ts +2 -4
- package/dest/wallet/base_wallet.d.ts.map +1 -1
- package/dest/wallet/base_wallet.js +2 -14
- package/dest/wallet/signerless_wallet.d.ts +1 -0
- package/dest/wallet/signerless_wallet.d.ts.map +1 -1
- package/dest/wallet/signerless_wallet.js +4 -1
- package/package.json +12 -8
- package/src/contract/base_contract_interaction.ts +2 -2
- package/src/contract/deploy_method.ts +5 -1
- package/src/contract/deploy_sent_tx.ts +2 -2
- package/src/contract/proven_tx.ts +0 -4
- package/src/contract/sent_tx.ts +1 -16
- package/src/deployment/register_class.ts +8 -1
- package/src/index.ts +7 -10
- package/src/rpc_clients/node/index.ts +2 -2
- package/src/utils/anvil_test_watcher.ts +4 -4
- package/src/utils/cheat_codes.ts +17 -254
- package/src/utils/index.ts +1 -0
- package/src/utils/node.ts +17 -0
- package/src/utils/portal_manager.ts +7 -7
- package/src/utils/pxe.ts +2 -2
- package/src/wallet/account_wallet.ts +4 -0
- package/src/wallet/base_wallet.ts +3 -15
- package/src/wallet/signerless_wallet.ts +4 -0
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { retryUntil } from '@aztec/foundation/retry';
|
|
2
|
+
export const waitForNode = async (node, logger) => {
|
|
3
|
+
await retryUntil(async () => {
|
|
4
|
+
try {
|
|
5
|
+
logger?.verbose('Attempting to contact Aztec node...');
|
|
6
|
+
await node.getNodeInfo();
|
|
7
|
+
logger?.verbose('Contacted Aztec node');
|
|
8
|
+
return true;
|
|
9
|
+
}
|
|
10
|
+
catch (error) {
|
|
11
|
+
logger?.verbose('Failed to contact Aztec Node');
|
|
12
|
+
}
|
|
13
|
+
return undefined;
|
|
14
|
+
}, 'RPC Get Node Info');
|
|
15
|
+
};
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9ub2RlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVyRCxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsS0FBSyxFQUFFLElBQWUsRUFBRSxNQUFlLEVBQUUsRUFBRTtJQUNwRSxNQUFNLFVBQVUsQ0FBQyxLQUFLLElBQUksRUFBRTtRQUMxQixJQUFJLENBQUM7WUFDSCxNQUFNLEVBQUUsT0FBTyxDQUFDLHFDQUFxQyxDQUFDLENBQUM7WUFDdkQsTUFBTSxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDekIsTUFBTSxFQUFFLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO1lBQ3hDLE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDZixNQUFNLEVBQUUsT0FBTyxDQUFDLDhCQUE4QixDQUFDLENBQUM7UUFDbEQsQ0FBQztRQUNELE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUMsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0FBQzFCLENBQUMsQ0FBQyJ9
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type AztecAddress,
|
|
1
|
+
import { type AztecAddress, EthAddress, Fr, type Logger, type PXE, type SiblingPath } from '@aztec/aztec.js';
|
|
2
2
|
import { TokenPortalAbi } from '@aztec/l1-artifacts';
|
|
3
3
|
import { type Account, type Chain, type GetContractReturnType, type Hex, type HttpTransport, type PublicClient, type WalletClient } from 'viem';
|
|
4
4
|
/** L1 to L2 message info to claim it on L2. */
|
|
@@ -21,7 +21,7 @@ export type L2AmountClaimWithRecipient = L2AmountClaim & {
|
|
|
21
21
|
/** Address that will receive the newly minted notes. */ recipient: AztecAddress;
|
|
22
22
|
};
|
|
23
23
|
/** Generates a pair secret and secret hash */
|
|
24
|
-
export declare function generateClaimSecret(logger?:
|
|
24
|
+
export declare function generateClaimSecret(logger?: Logger): [Fr, Fr];
|
|
25
25
|
/** Helper for managing an ERC20 on L1. */
|
|
26
26
|
export declare class L1TokenManager {
|
|
27
27
|
/** Address of the ERC20 contract. */
|
|
@@ -32,7 +32,7 @@ export declare class L1TokenManager {
|
|
|
32
32
|
private contract;
|
|
33
33
|
constructor(
|
|
34
34
|
/** Address of the ERC20 contract. */
|
|
35
|
-
address: EthAddress, publicClient: PublicClient<HttpTransport, Chain>, walletClient: WalletClient<HttpTransport, Chain, Account>, logger:
|
|
35
|
+
address: EthAddress, publicClient: PublicClient<HttpTransport, Chain>, walletClient: WalletClient<HttpTransport, Chain, Account>, logger: Logger);
|
|
36
36
|
/**
|
|
37
37
|
* Returns the balance of the given address.
|
|
38
38
|
* @param address - Address to get the balance of.
|
|
@@ -60,7 +60,7 @@ export declare class L1FeeJuicePortalManager {
|
|
|
60
60
|
private readonly logger;
|
|
61
61
|
private readonly tokenManager;
|
|
62
62
|
private readonly contract;
|
|
63
|
-
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, publicClient: PublicClient<HttpTransport, Chain>, walletClient: WalletClient<HttpTransport, Chain, Account>, logger:
|
|
63
|
+
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, publicClient: PublicClient<HttpTransport, Chain>, walletClient: WalletClient<HttpTransport, Chain, Account>, logger: Logger);
|
|
64
64
|
/** Returns the associated token manager for the L1 ERC20. */
|
|
65
65
|
getTokenManager(): L1TokenManager;
|
|
66
66
|
/**
|
|
@@ -77,16 +77,16 @@ export declare class L1FeeJuicePortalManager {
|
|
|
77
77
|
* @param walletClient - L1 wallet client.
|
|
78
78
|
* @param logger - Logger.
|
|
79
79
|
*/
|
|
80
|
-
static new(pxe: PXE, publicClient: PublicClient<HttpTransport, Chain>, walletClient: WalletClient<HttpTransport, Chain, Account>, logger:
|
|
80
|
+
static new(pxe: PXE, publicClient: PublicClient<HttpTransport, Chain>, walletClient: WalletClient<HttpTransport, Chain, Account>, logger: Logger): Promise<L1FeeJuicePortalManager>;
|
|
81
81
|
}
|
|
82
82
|
/** Helper for interacting with a test TokenPortal on L1 for sending tokens to L2. */
|
|
83
83
|
export declare class L1ToL2TokenPortalManager {
|
|
84
84
|
protected publicClient: PublicClient<HttpTransport, Chain>;
|
|
85
85
|
protected walletClient: WalletClient<HttpTransport, Chain, Account>;
|
|
86
|
-
protected logger:
|
|
86
|
+
protected logger: Logger;
|
|
87
87
|
protected readonly portal: GetContractReturnType<typeof TokenPortalAbi, WalletClient<HttpTransport, Chain, Account>>;
|
|
88
88
|
protected readonly tokenManager: L1TokenManager;
|
|
89
|
-
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, publicClient: PublicClient<HttpTransport, Chain>, walletClient: WalletClient<HttpTransport, Chain, Account>, logger:
|
|
89
|
+
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, publicClient: PublicClient<HttpTransport, Chain>, walletClient: WalletClient<HttpTransport, Chain, Account>, logger: Logger);
|
|
90
90
|
/** Returns the token manager for the underlying L1 token. */
|
|
91
91
|
getTokenManager(): L1TokenManager;
|
|
92
92
|
/**
|
|
@@ -108,7 +108,7 @@ export declare class L1ToL2TokenPortalManager {
|
|
|
108
108
|
/** Helper for interacting with a test TokenPortal on L1 for both withdrawing from and bridging to L2. */
|
|
109
109
|
export declare class L1TokenPortalManager extends L1ToL2TokenPortalManager {
|
|
110
110
|
private readonly outbox;
|
|
111
|
-
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, outboxAddress: EthAddress, publicClient: PublicClient<HttpTransport, Chain>, walletClient: WalletClient<HttpTransport, Chain, Account>, logger:
|
|
111
|
+
constructor(portalAddress: EthAddress, tokenAddress: EthAddress, outboxAddress: EthAddress, publicClient: PublicClient<HttpTransport, Chain>, walletClient: WalletClient<HttpTransport, Chain, Account>, logger: Logger);
|
|
112
112
|
/**
|
|
113
113
|
* Withdraws funds from the portal by consuming an L2 to L1 message. Returns once the tx is mined on L1.
|
|
114
114
|
* @param amount - Amount to withdraw.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portal_manager.d.ts","sourceRoot":"","sources":["../../src/utils/portal_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,
|
|
1
|
+
{"version":3,"file":"portal_manager.d.ts","sourceRoot":"","sources":["../../src/utils/portal_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,UAAU,EACV,EAAE,EACF,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,WAAW,EAEjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAA8C,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEjG,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,qBAAqB,EAC1B,KAAK,GAAG,EACR,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,YAAY,EAGlB,MAAM,MAAM,CAAC;AAEd,+CAA+C;AAC/C,MAAM,MAAM,OAAO,GAAG;IACpB,2BAA2B;IAC3B,WAAW,EAAE,EAAE,CAAC;IAChB,uCAAuC;IACvC,eAAe,EAAE,EAAE,CAAC;IACpB,2BAA2B;IAC3B,WAAW,EAAE,GAAG,CAAC;IACjB,+CAA+C;IAC/C,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,oEAAoE;AACpE,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG;IAAyB,WAAW,EAAE,EAAE,CAAA;CAAE,CAAC;AAEjF,8FAA8F;AAC9F,MAAM,MAAM,0BAA0B,GAAG,aAAa,GAAG;IACvD,wDAAwD,CAAC,SAAS,EAAE,YAAY,CAAC;CAClF,CAAC;AAOF,8CAA8C;AAC9C,wBAAgB,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAK7D;AAED,0CAA0C;AAC1C,qBAAa,cAAc;IAIvB,qCAAqC;aACrB,OAAO,EAAE,UAAU;IACnC,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IAPhB,OAAO,CAAC,QAAQ,CAA0F;;IAGxG,qCAAqC;IACrB,OAAO,EAAE,UAAU,EAC3B,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,EAChD,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,EACzD,MAAM,EAAE,MAAM;IASxB;;;OAGG;IACU,iBAAiB,CAAC,OAAO,EAAE,GAAG;IAI3C;;;;;OAKG;IACU,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM;IAOpE;;;;;OAKG;IACU,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,SAAK;CAMpE;AAED,4DAA4D;AAC5D,qBAAa,uBAAuB;IAUhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXzB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAiB;IAC9C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAGvB;gBAGA,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,UAAU,EACP,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,EAChD,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,EACzD,MAAM,EAAE,MAAM;IAUjC,6DAA6D;IACtD,eAAe;IAItB;;;;;OAKG;IACU,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,aAAa,CAAC;IAsCvG;;;;;;OAMG;WACiB,GAAG,CACrB,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,EAChD,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,EACzD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,uBAAuB,CAAC;CAWpC;AAED,qFAAqF;AACrF,qBAAa,wBAAwB;IAOjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC;IAC1D,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC;IACnE,SAAS,CAAC,MAAM,EAAE,MAAM;IAR1B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IACrH,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAC;gBAG9C,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,UAAU,EACd,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,EAChD,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,EACzD,MAAM,EAAE,MAAM;IAU1B,6DAA6D;IACtD,eAAe;IAItB;;;;;OAKG;IACU,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,aAAa,CAAC;IAmCvG;;;;;OAKG;IACU,mBAAmB,CAC9B,EAAE,EAAE,YAAY,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,UAAQ,GACX,OAAO,CAAC,0BAA0B,CAAC;YAiCxB,WAAW;CAO1B;AAED,yGAAyG;AACzG,qBAAa,oBAAqB,SAAQ,wBAAwB;IAChE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuF;gBAG5G,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,UAAU,EACxB,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,EAChD,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,EACzD,MAAM,EAAE,MAAM;IAUhB;;;;;;;OAOG;IACU,aAAa,CACxB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,UAAU,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC;IA6BlC;;;;;;OAMG;IACI,oBAAoB,CACzB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,UAAU,EACrB,QAAQ,EAAE,YAAY,EACtB,UAAU,GAAE,UAA4B,GACvC,EAAE;CAiBN"}
|
|
@@ -262,4 +262,4 @@ export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
|
|
|
262
262
|
return leaf;
|
|
263
263
|
}
|
|
264
264
|
}
|
|
265
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"portal_manager.js","sourceRoot":"","sources":["../../src/utils/portal_manager.ts"],"names":[],"mappings":"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"}
|
|
265
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"portal_manager.js","sourceRoot":"","sources":["../../src/utils/portal_manager.ts"],"names":[],"mappings":"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"}
|
package/dest/utils/pxe.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { type PXE } from '@aztec/circuit-types';
|
|
2
|
-
import { type
|
|
3
|
-
export declare const waitForPXE: (pxe: PXE, logger?:
|
|
2
|
+
import { type Logger } from '@aztec/foundation/log';
|
|
3
|
+
export declare const waitForPXE: (pxe: PXE, logger?: Logger) => Promise<void>;
|
|
4
4
|
//# sourceMappingURL=pxe.d.ts.map
|
package/dest/utils/pxe.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pxe.d.ts","sourceRoot":"","sources":["../../src/utils/pxe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"pxe.d.ts","sourceRoot":"","sources":["../../src/utils/pxe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,eAAO,MAAM,UAAU,QAAe,GAAG,WAAW,MAAM,kBAYzD,CAAC"}
|
package/dest/utils/pxe.js
CHANGED
|
@@ -13,4 +13,4 @@ export const waitForPXE = async (pxe, logger) => {
|
|
|
13
13
|
return undefined;
|
|
14
14
|
}, 'RPC Get Node Info');
|
|
15
15
|
};
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHhlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3B4ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFckQsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLEtBQUssRUFBRSxHQUFRLEVBQUUsTUFBZSxFQUFFLEVBQUU7SUFDNUQsTUFBTSxVQUFVLENBQUMsS0FBSyxJQUFJLEVBQUU7UUFDMUIsSUFBSSxDQUFDO1lBQ0gsTUFBTSxFQUFFLE9BQU8sQ0FBQyw4QkFBOEIsQ0FBQyxDQUFDO1lBQ2hELE1BQU0sR0FBRyxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ3hCLE1BQU0sRUFBRSxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7WUFDakMsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNmLE1BQU0sRUFBRSxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBQztRQUMzQyxDQUFDO1FBQ0QsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQyxFQUFFLG1CQUFtQixDQUFDLENBQUM7QUFDMUIsQ0FBQyxDQUFDIn0=
|
|
@@ -16,6 +16,7 @@ export declare class AccountWallet extends BaseWallet {
|
|
|
16
16
|
createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest>;
|
|
17
17
|
getChainId(): Fr;
|
|
18
18
|
getVersion(): Fr;
|
|
19
|
+
isL1ToL2MessageSynced(l1ToL2Message: Fr): Promise<boolean>;
|
|
19
20
|
/**
|
|
20
21
|
* Computes an authentication witness from either a message hash or an intent.
|
|
21
22
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/account_wallet.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,GAAG,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EAAE,KAAK,YAAY,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAI3D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,eAAe,EAGrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;GAEG;AACH,qBAAa,aAAc,SAAQ,UAAU;IACrB,SAAS,CAAC,OAAO,EAAE,gBAAgB;gBAA7C,GAAG,EAAE,GAAG,EAAY,OAAO,EAAE,gBAAgB;IAIzD,wBAAwB,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAIjF,UAAU,IAAI,EAAE;IAIhB,UAAU,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"account_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/account_wallet.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,GAAG,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EAAE,KAAK,YAAY,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAI3D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,eAAe,EAGrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;GAEG;AACH,qBAAa,aAAc,SAAQ,UAAU;IACrB,SAAS,CAAC,OAAO,EAAE,gBAAgB;gBAA7C,GAAG,EAAE,GAAG,EAAY,OAAO,EAAE,gBAAgB;IAIzD,wBAAwB,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAIjF,UAAU,IAAI,EAAE;IAIhB,UAAU,IAAI,EAAE;IAIP,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAInE;;;;;;;;;OASG;IACG,aAAa,CAAC,mBAAmB,EAAE,EAAE,GAAG,MAAM,GAAG,YAAY,GAAG,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;IAe5G;;;;;;;;OAQG;IACI,gBAAgB,CACrB,mBAAmB,EAAE,EAAE,GAAG,MAAM,GAAG,eAAe,GAAG,YAAY,EACjE,UAAU,EAAE,OAAO,GAClB,2BAA2B;IAgB9B,OAAO,CAAC,uBAAuB;IAkB/B;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAMtB;;;;;;;;;OASG;IACG,cAAc,CAClB,UAAU,EAAE,YAAY,EACxB,MAAM,EAAE,eAAe,GAAG,YAAY,GACrC,OAAO,CAAC;QACT,yEAAyE;QACzE,gBAAgB,EAAE,OAAO,CAAC;QAC1B,wEAAwE;QACxE,eAAe,EAAE,OAAO,CAAC;KAC1B,CAAC;IA0BF,+EAA+E;IACxE,kBAAkB;IAIzB,sEAAsE;IACtD,UAAU;IAI1B,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,kBAAkB;CAuB3B"}
|
|
@@ -21,6 +21,9 @@ export class AccountWallet extends BaseWallet {
|
|
|
21
21
|
getVersion() {
|
|
22
22
|
return this.account.getVersion();
|
|
23
23
|
}
|
|
24
|
+
isL1ToL2MessageSynced(l1ToL2Message) {
|
|
25
|
+
return this.pxe.isL1ToL2MessageSynced(l1ToL2Message);
|
|
26
|
+
}
|
|
24
27
|
/**
|
|
25
28
|
* Computes an authentication witness from either a message hash or an intent.
|
|
26
29
|
*
|
|
@@ -188,4 +191,4 @@ export class AccountWallet extends BaseWallet {
|
|
|
188
191
|
};
|
|
189
192
|
}
|
|
190
193
|
}
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
194
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF93YWxsZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2FjY291bnRfd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBcUIsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDM0QsT0FBTyxFQUFpRCxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUdwRSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUUzRixPQUFPLEVBR0wseUJBQXlCLEVBQ3pCLGlDQUFpQyxHQUNsQyxNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU5Qzs7R0FFRztBQUNILE1BQU0sT0FBTyxhQUFjLFNBQVEsVUFBVTtJQUMzQyxZQUFZLEdBQVEsRUFBWSxPQUF5QjtRQUN2RCxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQztRQURMLFlBQU8sR0FBUCxPQUFPLENBQWtCO0lBRXpELENBQUM7SUFFRCx3QkFBd0IsQ0FBQyxJQUEwQjtRQUNqRCxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsd0JBQXdCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDckQsQ0FBQztJQUVELFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDbkMsQ0FBQztJQUVELFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDbkMsQ0FBQztJQUVRLHFCQUFxQixDQUFDLGFBQWlCO1FBQzlDLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBRUQ7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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
/// <reference types="node" resolution-mode="require"/>
|
|
3
|
-
import { type AuthWitness, type EventMetadataDefinition, type ExtendedNote, type GetUnencryptedLogsResponse, type IncomingNotesFilter, type L2Block, type LogFilter, type
|
|
3
|
+
import { type AuthWitness, type EventMetadataDefinition, type ExtendedNote, type GetUnencryptedLogsResponse, type IncomingNotesFilter, type L2Block, type LogFilter, type PXE, type PXEInfo, type PrivateExecutionResult, type SiblingPath, type Tx, type TxExecutionRequest, type TxHash, type TxProvingResult, type TxReceipt, type TxSimulationResult, type UniqueNote } from '@aztec/circuit-types';
|
|
4
4
|
import { type AztecAddress, type CompleteAddress, type ContractClassWithId, type ContractInstanceWithAddress, type Fr, type GasFees, type L1_TO_L2_MSG_TREE_HEIGHT, type NodeInfo, type PartialAddress, type Point } from '@aztec/circuits.js';
|
|
5
5
|
import type { AbiDecoded, ContractArtifact } from '@aztec/foundation/abi';
|
|
6
6
|
import { type Wallet } from '../account/wallet.js';
|
|
@@ -13,6 +13,7 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
13
13
|
protected readonly pxe: PXE;
|
|
14
14
|
private scopes?;
|
|
15
15
|
constructor(pxe: PXE, scopes?: AztecAddress[] | undefined);
|
|
16
|
+
abstract isL1ToL2MessageSynced(l1ToL2Message: Fr): Promise<boolean>;
|
|
16
17
|
abstract getCompleteAddress(): CompleteAddress;
|
|
17
18
|
abstract getChainId(): Fr;
|
|
18
19
|
abstract getVersion(): Fr;
|
|
@@ -43,7 +44,6 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
43
44
|
getTxEffect(txHash: TxHash): Promise<import("@aztec/circuit-types").InBlock<import("@aztec/circuit-types").TxEffect> | undefined>;
|
|
44
45
|
getTxReceipt(txHash: TxHash): Promise<TxReceipt>;
|
|
45
46
|
getIncomingNotes(filter: IncomingNotesFilter): Promise<UniqueNote[]>;
|
|
46
|
-
getOutgoingNotes(filter: OutgoingNotesFilter): Promise<UniqueNote[]>;
|
|
47
47
|
getPublicStorageAt(contract: AztecAddress, storageSlot: Fr): Promise<any>;
|
|
48
48
|
addNote(note: ExtendedNote): Promise<void>;
|
|
49
49
|
addNullifiedNote(note: ExtendedNote): Promise<void>;
|
|
@@ -55,8 +55,6 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
55
55
|
getBlockNumber(): Promise<number>;
|
|
56
56
|
getProvenBlockNumber(): Promise<number>;
|
|
57
57
|
getNodeInfo(): Promise<NodeInfo>;
|
|
58
|
-
isGlobalStateSynchronized(): Promise<boolean>;
|
|
59
|
-
getSyncStatus(): Promise<SyncStatus>;
|
|
60
58
|
addAuthWitness(authWitness: AuthWitness): Promise<void>;
|
|
61
59
|
getAuthWitness(messageHash: Fr): Promise<Fr[] | undefined>;
|
|
62
60
|
isContractClassPubliclyRegistered(id: Fr): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/base_wallet.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,uBAAuB,EAC5B,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAC/B,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,
|
|
1
|
+
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/base_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,9 +72,6 @@ export class BaseWallet {
|
|
|
72
72
|
getIncomingNotes(filter) {
|
|
73
73
|
return this.pxe.getIncomingNotes(filter);
|
|
74
74
|
}
|
|
75
|
-
getOutgoingNotes(filter) {
|
|
76
|
-
return this.pxe.getOutgoingNotes(filter);
|
|
77
|
-
}
|
|
78
75
|
getPublicStorageAt(contract, storageSlot) {
|
|
79
76
|
return this.pxe.getPublicStorageAt(contract, storageSlot);
|
|
80
77
|
}
|
|
@@ -108,12 +105,6 @@ export class BaseWallet {
|
|
|
108
105
|
getNodeInfo() {
|
|
109
106
|
return this.pxe.getNodeInfo();
|
|
110
107
|
}
|
|
111
|
-
isGlobalStateSynchronized() {
|
|
112
|
-
return this.pxe.isGlobalStateSynchronized();
|
|
113
|
-
}
|
|
114
|
-
getSyncStatus() {
|
|
115
|
-
return this.pxe.getSyncStatus();
|
|
116
|
-
}
|
|
117
108
|
addAuthWitness(authWitness) {
|
|
118
109
|
return this.pxe.addAuthWitness(authWitness);
|
|
119
110
|
}
|
|
@@ -132,10 +123,7 @@ export class BaseWallet {
|
|
|
132
123
|
getPXEInfo() {
|
|
133
124
|
return this.pxe.getPXEInfo();
|
|
134
125
|
}
|
|
135
|
-
getEncryptedEvents(event, from, limit, vpks = [
|
|
136
|
-
this.getCompleteAddress().publicKeys.masterIncomingViewingPublicKey,
|
|
137
|
-
this.getCompleteAddress().publicKeys.masterOutgoingViewingPublicKey,
|
|
138
|
-
]) {
|
|
126
|
+
getEncryptedEvents(event, from, limit, vpks = [this.getCompleteAddress().publicKeys.masterIncomingViewingPublicKey]) {
|
|
139
127
|
return this.pxe.getEncryptedEvents(event, from, limit, vpks);
|
|
140
128
|
}
|
|
141
129
|
getUnencryptedEvents(event, from, limit) {
|
|
@@ -145,4 +133,4 @@ export class BaseWallet {
|
|
|
145
133
|
return this.pxe.getL1ToL2MembershipWitness(contractAddress, messageHash, secret);
|
|
146
134
|
}
|
|
147
135
|
}
|
|
148
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV93YWxsZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2Jhc2Vfd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXNDQTs7R0FFRztBQUNILE1BQU0sT0FBZ0IsVUFBVTtJQUM5QixZQUErQixHQUFRLEVBQVUsTUFBdUI7UUFBekMsUUFBRyxHQUFILEdBQUcsQ0FBSztRQUFVLFdBQU0sR0FBTixNQUFNLENBQWlCO0lBQUcsQ0FBQztJQWM1RSxTQUFTLENBQUMsTUFBc0I7UUFDOUIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUVELFNBQVM7UUFDUCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDckIsQ0FBQztJQUVELFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLE9BQU8sQ0FBQztJQUMzQyxDQUFDO0lBQ0QsbUJBQW1CLENBQUMsT0FBcUI7UUFDdkMsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQy9DLENBQUM7SUFDRCxnQkFBZ0IsQ0FBQyxFQUFNO1FBQ3JCLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBQ0QsbUJBQW1CLENBQUMsRUFBTTtRQUN4QixPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsbUJBQW1CLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDMUMsQ0FBQztJQUNELFVBQVUsQ0FBQyxPQUFhO1FBQ3RCLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUNELGVBQWUsQ0FBQyxTQUFhLEVBQUUsY0FBOEI7UUFDM0QsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDN0QsQ0FB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
|
|
@@ -17,5 +17,6 @@ export declare class SignerlessWallet extends BaseWallet {
|
|
|
17
17
|
getPublicKeysHash(): Fr;
|
|
18
18
|
getCompleteAddress(): CompleteAddress;
|
|
19
19
|
createAuthWit(_intent: Fr | Buffer | IntentInnerHash | IntentAction): Promise<AuthWitness>;
|
|
20
|
+
isL1ToL2MessageSynced(l1ToL2Message: Fr): Promise<boolean>;
|
|
20
21
|
}
|
|
21
22
|
//# sourceMappingURL=signerless_wallet.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signerless_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/signerless_wallet.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,GAAG,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAGnE,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;IACxB,OAAO,CAAC,UAAU,CAAC;gBAA7B,GAAG,EAAE,GAAG,EAAU,UAAU,CAAC,iCAAqB;IAGxD,wBAAwB,CAAC,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAU5F,UAAU,IAAI,EAAE;IAIhB,UAAU,IAAI,EAAE;IAIhB,iBAAiB,IAAI,EAAE;IAIvB,kBAAkB,IAAI,eAAe;IAIrC,aAAa,CAAC,OAAO,EAAE,EAAE,GAAG,MAAM,GAAG,eAAe,GAAG,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"signerless_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/signerless_wallet.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,GAAG,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAGnE,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;IACxB,OAAO,CAAC,UAAU,CAAC;gBAA7B,GAAG,EAAE,GAAG,EAAU,UAAU,CAAC,iCAAqB;IAGxD,wBAAwB,CAAC,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAU5F,UAAU,IAAI,EAAE;IAIhB,UAAU,IAAI,EAAE;IAIhB,iBAAiB,IAAI,EAAE;IAIvB,kBAAkB,IAAI,eAAe;IAIrC,aAAa,CAAC,OAAO,EAAE,EAAE,GAAG,MAAM,GAAG,eAAe,GAAG,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAIjF,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAGpE"}
|
|
@@ -31,5 +31,8 @@ export class SignerlessWallet extends BaseWallet {
|
|
|
31
31
|
createAuthWit(_intent) {
|
|
32
32
|
throw new Error('SignerlessWallet: Method createAuthWit not implemented.');
|
|
33
33
|
}
|
|
34
|
+
isL1ToL2MessageSynced(l1ToL2Message) {
|
|
35
|
+
return this.pxe.isL1ToL2MessageSynced(l1ToL2Message);
|
|
36
|
+
}
|
|
34
37
|
}
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbmVybGVzc193YWxsZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L3NpZ25lcmxlc3Nfd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBR3hFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU5Qzs7R0FFRztBQUNILE1BQU0sT0FBTyxnQkFBaUIsU0FBUSxVQUFVO0lBQzlDLFlBQVksR0FBUSxFQUFVLFVBQWdDO1FBQzVELEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQURpQixlQUFVLEdBQVYsVUFBVSxDQUFzQjtJQUU5RCxDQUFDO0lBQ0QsS0FBSyxDQUFDLHdCQUF3QixDQUFDLFNBQStCO1FBQzVELElBQUksVUFBVSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUM7UUFDakMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ2hCLE1BQU0sRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUM3RSxVQUFVLEdBQUcsSUFBSSxpQkFBaUIsQ0FBQyxPQUFPLEVBQUUsZUFBZSxDQUFDLENBQUM7UUFDL0QsQ0FBQztRQUVELE9BQU8sVUFBVSxDQUFDLHdCQUF3QixDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUFFRCxVQUFVO1FBQ1IsTUFBTSxJQUFJLEtBQUssQ0FBQyxzREFBc0QsQ0FBQyxDQUFDO0lBQzFFLENBQUM7SUFFRCxVQUFVO1FBQ1IsTUFBTSxJQUFJLEtBQUssQ0FBQyxzREFBc0QsQ0FBQyxDQUFDO0lBQzFFLENBQUM7SUFFRCxpQkFBaUI7UUFDZixNQUFNLElBQUksS0FBSyxDQUFDLDZEQUE2RCxDQUFDLENBQUM7SUFDakYsQ0FBQztJQUVELGtCQUFrQjtRQUNoQixNQUFNLElBQUksS0FBSyxDQUFDLDhEQUE4RCxDQUFDLENBQUM7SUFDbEYsQ0FBQztJQUVELGFBQWEsQ0FBQyxPQUFxRDtRQUNqRSxNQUFNLElBQUksS0FBSyxDQUFDLHlEQUF5RCxDQUFDLENBQUM7SUFDN0UsQ0FBQztJQUVRLHFCQUFxQixDQUFDLGFBQWlCO1FBQzlDLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUN2RCxDQUFDO0NBQ0YifQ==
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec.js",
|
|
3
3
|
"homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.67.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": "./dest/index.js",
|
|
@@ -73,16 +73,20 @@
|
|
|
73
73
|
"summaryThreshold": 9999
|
|
74
74
|
}
|
|
75
75
|
]
|
|
76
|
+
],
|
|
77
|
+
"testTimeout": 30000,
|
|
78
|
+
"setupFiles": [
|
|
79
|
+
"../../foundation/src/jest/setup.mjs"
|
|
76
80
|
]
|
|
77
81
|
},
|
|
78
82
|
"dependencies": {
|
|
79
|
-
"@aztec/circuit-types": "0.
|
|
80
|
-
"@aztec/circuits.js": "0.
|
|
81
|
-
"@aztec/ethereum": "0.
|
|
82
|
-
"@aztec/foundation": "0.
|
|
83
|
-
"@aztec/l1-artifacts": "0.
|
|
84
|
-
"@aztec/protocol-contracts": "0.
|
|
85
|
-
"@aztec/types": "0.
|
|
83
|
+
"@aztec/circuit-types": "0.67.0",
|
|
84
|
+
"@aztec/circuits.js": "0.67.0",
|
|
85
|
+
"@aztec/ethereum": "0.67.0",
|
|
86
|
+
"@aztec/foundation": "0.67.0",
|
|
87
|
+
"@aztec/l1-artifacts": "0.67.0",
|
|
88
|
+
"@aztec/protocol-contracts": "0.67.0",
|
|
89
|
+
"@aztec/types": "0.67.0",
|
|
86
90
|
"axios": "^1.7.2",
|
|
87
91
|
"tslib": "^2.4.0",
|
|
88
92
|
"viem": "^2.7.15"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type TxExecutionRequest, type TxProvingResult } from '@aztec/circuit-types';
|
|
2
2
|
import { type Fr, GasSettings } from '@aztec/circuits.js';
|
|
3
|
-
import {
|
|
3
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
4
4
|
|
|
5
5
|
import { type Wallet } from '../account/wallet.js';
|
|
6
6
|
import { type ExecutionRequestInit } from '../entrypoint/entrypoint.js';
|
|
@@ -30,7 +30,7 @@ export type SendMethodOptions = {
|
|
|
30
30
|
* Implements the sequence create/simulate/send.
|
|
31
31
|
*/
|
|
32
32
|
export abstract class BaseContractInteraction {
|
|
33
|
-
protected log =
|
|
33
|
+
protected log = createLogger('aztecjs:contract_interaction');
|
|
34
34
|
|
|
35
35
|
constructor(protected wallet: Wallet) {}
|
|
36
36
|
|
|
@@ -89,6 +89,11 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
|
|
|
89
89
|
* it returns a promise for an array instead of a function call directly.
|
|
90
90
|
*/
|
|
91
91
|
public async request(options: DeployOptions = {}): Promise<ExecutionRequestInit> {
|
|
92
|
+
const deployment = await this.getDeploymentFunctionCalls(options);
|
|
93
|
+
|
|
94
|
+
// NOTE: MEGA HACK. Remove with #10007
|
|
95
|
+
// register the contract after generating deployment function calls in order to publicly register the class and (optioanlly) emit its bytecode
|
|
96
|
+
//
|
|
92
97
|
// TODO: Should we add the contracts to the DB here, or once the tx has been sent or mined?
|
|
93
98
|
// Note that we need to run this registerContract here so it's available when computeFeeOptionsFromEstimatedGas
|
|
94
99
|
// runs, since it needs the contract to have been registered in order to estimate gas for its initialization,
|
|
@@ -97,7 +102,6 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
|
|
|
97
102
|
// once this tx has gone through.
|
|
98
103
|
await this.wallet.registerContract({ artifact: this.artifact, instance: this.getInstance(options) });
|
|
99
104
|
|
|
100
|
-
const deployment = await this.getDeploymentFunctionCalls(options);
|
|
101
105
|
const bootstrap = await this.getInitializeFunctionCalls(options);
|
|
102
106
|
|
|
103
107
|
if (deployment.calls.length + bootstrap.calls.length === 0) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type PXE, type TxHash, type TxReceipt } from '@aztec/circuit-types';
|
|
2
2
|
import { type AztecAddress, type ContractInstanceWithAddress } from '@aztec/circuits.js';
|
|
3
|
-
import {
|
|
3
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { type FieldsOf } from '@aztec/foundation/types';
|
|
5
5
|
|
|
6
6
|
import { type Wallet } from '../account/index.js';
|
|
@@ -24,7 +24,7 @@ export type DeployTxReceipt<TContract extends ContractBase = Contract> = FieldsO
|
|
|
24
24
|
* A contract deployment transaction sent to the network, extending SentTx with methods to create a contract instance.
|
|
25
25
|
*/
|
|
26
26
|
export class DeploySentTx<TContract extends Contract = Contract> extends SentTx {
|
|
27
|
-
private log =
|
|
27
|
+
private log = createLogger('aztecjs:deploy_sent_tx');
|
|
28
28
|
|
|
29
29
|
constructor(
|
|
30
30
|
wallet: PXE | Wallet,
|
|
@@ -11,8 +11,6 @@ export class ProvenTx extends Tx {
|
|
|
11
11
|
super(
|
|
12
12
|
tx.data,
|
|
13
13
|
tx.clientIvcProof,
|
|
14
|
-
tx.noteEncryptedLogs,
|
|
15
|
-
tx.encryptedLogs,
|
|
16
14
|
tx.unencryptedLogs,
|
|
17
15
|
tx.contractClassLogs,
|
|
18
16
|
tx.enqueuedPublicFunctionCalls,
|
|
@@ -25,8 +23,6 @@ export class ProvenTx extends Tx {
|
|
|
25
23
|
return new Tx(
|
|
26
24
|
this.data,
|
|
27
25
|
this.clientIvcProof,
|
|
28
|
-
this.noteEncryptedLogs,
|
|
29
|
-
this.encryptedLogs,
|
|
30
26
|
this.unencryptedLogs,
|
|
31
27
|
this.contractClassLogs,
|
|
32
28
|
this.enqueuedPublicFunctionCalls,
|
package/src/contract/sent_tx.ts
CHANGED
|
@@ -14,11 +14,6 @@ export type WaitOpts = {
|
|
|
14
14
|
interval?: number;
|
|
15
15
|
/** Whether to wait for the tx to be proven. */
|
|
16
16
|
proven?: boolean;
|
|
17
|
-
/**
|
|
18
|
-
* Whether to wait for the node to notify that the block in which this tx was mined is available to fetch notes from.
|
|
19
|
-
* If false, then any queries that depend on state set by this transaction may return stale data. Defaults to true.
|
|
20
|
-
**/
|
|
21
|
-
waitForNotesAvailable?: boolean;
|
|
22
17
|
/** Whether to include information useful for debugging/testing in the receipt. */
|
|
23
18
|
debug?: boolean;
|
|
24
19
|
/** Whether to accept a revert as a status code for the tx when waiting for it. If false, will throw if the tx reverts. */
|
|
@@ -31,7 +26,6 @@ export const DefaultWaitOpts: WaitOpts = {
|
|
|
31
26
|
provenTimeout: 600,
|
|
32
27
|
interval: 1,
|
|
33
28
|
debug: false,
|
|
34
|
-
waitForNotesAvailable: true,
|
|
35
29
|
};
|
|
36
30
|
|
|
37
31
|
/**
|
|
@@ -124,16 +118,7 @@ export class SentTx {
|
|
|
124
118
|
}
|
|
125
119
|
return undefined;
|
|
126
120
|
}
|
|
127
|
-
|
|
128
|
-
const waitForNotesAvailable = opts?.waitForNotesAvailable ?? DefaultWaitOpts.waitForNotesAvailable;
|
|
129
|
-
if (!waitForNotesAvailable) {
|
|
130
|
-
return txReceipt;
|
|
131
|
-
}
|
|
132
|
-
// Check if all sync blocks on the PXE Service are greater or equal than the block in which the tx was mined
|
|
133
|
-
const { blocks } = await this.pxe.getSyncStatus();
|
|
134
|
-
const targetBlock = txReceipt.blockNumber!;
|
|
135
|
-
const areNotesAvailable = blocks >= targetBlock;
|
|
136
|
-
return areNotesAvailable ? txReceipt : undefined;
|
|
121
|
+
return txReceipt;
|
|
137
122
|
},
|
|
138
123
|
'isMined',
|
|
139
124
|
opts?.timeout ?? DefaultWaitOpts.timeout,
|
|
@@ -5,15 +5,22 @@ import { type ContractFunctionInteraction } from '../contract/contract_function_
|
|
|
5
5
|
import { type Wallet } from '../wallet/index.js';
|
|
6
6
|
import { getRegistererContract } from './protocol_contracts.js';
|
|
7
7
|
|
|
8
|
+
const defaultEmitPublicBytecode =
|
|
9
|
+
// guard against `process` not being defined (e.g. in the browser)
|
|
10
|
+
typeof process === 'object' && typeof process.env === 'object'
|
|
11
|
+
? ['1', 'true', 'yes', ''].includes(process.env.AZTEC_EMIT_PUBLIC_BYTECODE ?? '')
|
|
12
|
+
: true;
|
|
13
|
+
|
|
8
14
|
/** Sets up a call to register a contract class given its artifact. */
|
|
9
15
|
export async function registerContractClass(
|
|
10
16
|
wallet: Wallet,
|
|
11
17
|
artifact: ContractArtifact,
|
|
18
|
+
emitPublicBytecode = defaultEmitPublicBytecode,
|
|
12
19
|
): Promise<ContractFunctionInteraction> {
|
|
13
20
|
const { artifactHash, privateFunctionsRoot, publicBytecodeCommitment, packedBytecode } =
|
|
14
21
|
getContractClassFromArtifact(artifact);
|
|
15
22
|
const encodedBytecode = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
|
|
16
23
|
const registerer = getRegistererContract(wallet);
|
|
17
24
|
await wallet.addCapsule(encodedBytecode);
|
|
18
|
-
return registerer.methods.register(artifactHash, privateFunctionsRoot, publicBytecodeCommitment);
|
|
25
|
+
return registerer.methods.register(artifactHash, privateFunctionsRoot, publicBytecodeCommitment, emitPublicBytecode);
|
|
19
26
|
}
|