@aztec/aztec.js 0.38.0 → 0.40.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/account/contract.d.ts +1 -3
- package/dest/account/contract.d.ts.map +1 -1
- package/dest/account/contract.js +1 -1
- package/dest/account/interface.d.ts +0 -2
- package/dest/account/interface.d.ts.map +1 -1
- package/dest/account/interface.js +1 -1
- package/dest/account_manager/index.d.ts.map +1 -1
- package/dest/account_manager/index.js +4 -5
- package/dest/contract/base_contract_interaction.d.ts +25 -10
- package/dest/contract/base_contract_interaction.d.ts.map +1 -1
- package/dest/contract/base_contract_interaction.js +33 -6
- package/dest/contract/batch_call.d.ts +0 -1
- package/dest/contract/batch_call.d.ts.map +1 -1
- package/dest/contract/batch_call.js +4 -6
- package/dest/contract/contract_function_interaction.d.ts +0 -1
- package/dest/contract/contract_function_interaction.d.ts.map +1 -1
- package/dest/contract/contract_function_interaction.js +6 -8
- package/dest/contract/deploy_method.d.ts +0 -1
- package/dest/contract/deploy_method.d.ts.map +1 -1
- package/dest/contract/deploy_method.js +11 -6
- package/dest/contract/get_gas_limits.d.ts +12 -0
- package/dest/contract/get_gas_limits.d.ts.map +1 -0
- package/dest/contract/get_gas_limits.js +22 -0
- package/dest/index.d.ts +1 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +2 -2
- package/dest/utils/account.js +2 -2
- package/dest/wallet/account_wallet.d.ts +0 -1
- package/dest/wallet/account_wallet.d.ts.map +1 -1
- package/dest/wallet/account_wallet.js +1 -4
- package/dest/wallet/base_wallet.d.ts +0 -2
- package/dest/wallet/base_wallet.d.ts.map +1 -1
- package/dest/wallet/base_wallet.js +1 -4
- package/dest/wallet/index.d.ts.map +1 -1
- package/dest/wallet/index.js +2 -6
- package/package.json +7 -7
- package/src/account/contract.ts +1 -3
- package/src/account/interface.ts +0 -3
- package/src/account_manager/index.ts +3 -4
- package/src/contract/base_contract_interaction.ts +40 -13
- package/src/contract/batch_call.ts +4 -5
- package/src/contract/contract_function_interaction.ts +6 -7
- package/src/contract/deploy_method.ts +15 -5
- package/src/contract/get_gas_limits.ts +24 -0
- package/src/index.ts +1 -0
- package/src/utils/account.ts +1 -1
- package/src/wallet/account_wallet.ts +0 -4
- package/src/wallet/base_wallet.ts +0 -5
- package/src/wallet/index.ts +1 -5
package/dest/utils/account.js
CHANGED
|
@@ -7,7 +7,7 @@ import { DefaultWaitOpts } from '../contract/index.js';
|
|
|
7
7
|
* @param opts - Wait options
|
|
8
8
|
*/
|
|
9
9
|
export async function waitForAccountSynch(pxe, address, { interval, timeout } = DefaultWaitOpts) {
|
|
10
|
-
const publicKey = address.
|
|
10
|
+
const publicKey = address.publicKeys.masterIncomingViewingPublicKey.toString();
|
|
11
11
|
await retryUntil(async () => {
|
|
12
12
|
const status = await pxe.getSyncStatus();
|
|
13
13
|
const accountSynchedToBlock = status.notes[publicKey];
|
|
@@ -19,4 +19,4 @@ export async function waitForAccountSynch(pxe, address, { interval, timeout } =
|
|
|
19
19
|
}
|
|
20
20
|
}, 'waitForAccountSynch', timeout, interval);
|
|
21
21
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9hY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVyRCxPQUFPLEVBQUUsZUFBZSxFQUFpQixNQUFNLHNCQUFzQixDQUFDO0FBRXRFOzs7OztHQUtHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxtQkFBbUIsQ0FDdkMsR0FBUSxFQUNSLE9BQXdCLEVBQ3hCLEVBQUUsUUFBUSxFQUFFLE9BQU8sS0FBZSxlQUFlO0lBRWpELE1BQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsOEJBQThCLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDL0UsTUFBTSxVQUFVLENBQ2QsS0FBSyxJQUFJLEVBQUU7UUFDVCxNQUFNLE1BQU0sR0FBRyxNQUFNLEdBQUcsQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUN6QyxNQUFNLHFCQUFxQixHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDdEQsSUFBSSxPQUFPLHFCQUFxQixLQUFLLFdBQVcsRUFBRSxDQUFDO1lBQ2pELE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQzthQUFNLENBQUM7WUFDTixPQUFPLHFCQUFxQixJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUM7UUFDaEQsQ0FBQztJQUNILENBQUMsRUFDRCxxQkFBcUIsRUFDckIsT0FBTyxFQUNQLFFBQVEsQ0FDVCxDQUFDO0FBQ0osQ0FBQyJ9
|
|
@@ -11,7 +11,6 @@ import { BaseWallet } from './base_wallet.js';
|
|
|
11
11
|
export declare class AccountWallet extends BaseWallet {
|
|
12
12
|
protected account: AccountInterface;
|
|
13
13
|
constructor(pxe: PXE, account: AccountInterface);
|
|
14
|
-
getPublicKeysHash(): Fr;
|
|
15
14
|
createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest>;
|
|
16
15
|
getChainId(): Fr;
|
|
17
16
|
getVersion(): Fr;
|
|
@@ -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,YAAY,EAAE,KAAK,GAAG,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC9G,OAAO,EAAE,KAAK,YAAY,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAG3D,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;AAExE,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,
|
|
1
|
+
{"version":3,"file":"account_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/account_wallet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,KAAK,GAAG,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC9G,OAAO,EAAE,KAAK,YAAY,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAG3D,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;AAExE,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;IAIhB;;;;;;OAMG;IACG,aAAa,CACjB,mBAAmB,EACf,EAAE,GACF,MAAM,GACN;QACE,6BAA6B;QAC7B,MAAM,EAAE,YAAY,CAAC;QACrB,4BAA4B;QAC5B,MAAM,EAAE,2BAA2B,GAAG,YAAY,CAAC;QACnD,8BAA8B;QAC9B,OAAO,CAAC,EAAE,EAAE,CAAC;QACb,8BAA8B;QAC9B,OAAO,CAAC,EAAE,EAAE,CAAC;KACd,GACJ,OAAO,CAAC,WAAW,CAAC;IAOvB;;;;;;OAMG;IACI,gBAAgB,CACrB,mBAAmB,EACf,EAAE,GACF,MAAM,GACN;QACE,6BAA6B;QAC7B,MAAM,EAAE,YAAY,CAAC;QACrB,4BAA4B;QAC5B,MAAM,EAAE,2BAA2B,GAAG,YAAY,CAAC;QACnD,8BAA8B;QAC9B,OAAO,CAAC,EAAE,EAAE,CAAC;QACb,8BAA8B;QAC9B,OAAO,CAAC,EAAE,EAAE,CAAC;KACd,EACL,UAAU,EAAE,OAAO,GAClB,2BAA2B;IAS9B;;;;OAIG;IACH,OAAO,CAAC,cAAc;IA+BtB;;;;;;OAMG;IACG,cAAc,CAClB,MAAM,EAAE,YAAY,EACpB,mBAAmB,EACf,EAAE,GACF,MAAM,GACN;QACE,6BAA6B;QAC7B,MAAM,EAAE,YAAY,CAAC;QACrB,4BAA4B;QAC5B,MAAM,EAAE,2BAA2B,GAAG,YAAY,CAAC;QACnD,8BAA8B;QAC9B,OAAO,CAAC,EAAE,EAAE,CAAC;QACb,8BAA8B;QAC9B,OAAO,CAAC,EAAE,EAAE,CAAC;KACd,GACJ,OAAO,CAAC;QACT,yEAAyE;QACzE,gBAAgB,EAAE,OAAO,CAAC;QAC1B,wEAAwE;QACxE,eAAe,EAAE,OAAO,CAAC;KAC1B,CAAC;IAeF;;;;OAIG;IACI,aAAa,CAClB,mBAAmB,EACf,EAAE,GACF,MAAM,GACN;QACE,6BAA6B;QAC7B,MAAM,EAAE,YAAY,CAAC;QACrB,4BAA4B;QAC5B,MAAM,EAAE,2BAA2B,GAAG,YAAY,CAAC;QACnD,8BAA8B;QAC9B,OAAO,CAAC,EAAE,EAAE,CAAC;QACb,8BAA8B;QAC9B,OAAO,CAAC,EAAE,EAAE,CAAC;KACd,GACJ,2BAA2B;IAM9B,+EAA+E;IACxE,kBAAkB;IAIzB,sEAAsE;IACtD,UAAU;IAI1B,OAAO,CAAC,0BAA0B;IAiBlC,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,oBAAoB;CA+B7B"}
|
|
@@ -11,9 +11,6 @@ export class AccountWallet extends BaseWallet {
|
|
|
11
11
|
super(pxe);
|
|
12
12
|
this.account = account;
|
|
13
13
|
}
|
|
14
|
-
getPublicKeysHash() {
|
|
15
|
-
return this.account.getPublicKeysHash();
|
|
16
|
-
}
|
|
17
14
|
createTxExecutionRequest(exec) {
|
|
18
15
|
return this.account.createTxExecutionRequest(exec);
|
|
19
16
|
}
|
|
@@ -172,4 +169,4 @@ export class AccountWallet extends BaseWallet {
|
|
|
172
169
|
};
|
|
173
170
|
}
|
|
174
171
|
}
|
|
175
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
172
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF93YWxsZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2FjY291bnRfd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBcUIsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDM0QsT0FBTyxFQUFpRCxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRyxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUUzRixPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFOUM7O0dBRUc7QUFDSCxNQUFNLE9BQU8sYUFBYyxTQUFRLFVBQVU7SUFDM0MsWUFBWSxHQUFRLEVBQVksT0FBeUI7UUFDdkQsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRG1CLFlBQU8sR0FBUCxPQUFPLENBQWtCO0lBRXpELENBQUM7SUFFRCx3QkFBd0IsQ0FBQyxJQUEwQjtRQUNqRCxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsd0JBQXdCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDckQsQ0FBQztJQUVELFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDbkMsQ0FBQztJQUVELFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDbkMsQ0FBQztJQUVEOzs7Ozs7T0FNRztJQUNILEtBQUssQ0FBQyxhQUFhLENBQ2pCLG1CQVlLO1FBRUwsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO1FBQzdELE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDOUQsTUFBTSxJQUFJ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
|
|
@@ -14,7 +14,6 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
14
14
|
protected readonly pxe: PXE;
|
|
15
15
|
constructor(pxe: PXE);
|
|
16
16
|
abstract getCompleteAddress(): CompleteAddress;
|
|
17
|
-
abstract getPublicKeysHash(): Fr;
|
|
18
17
|
abstract getChainId(): Fr;
|
|
19
18
|
abstract getVersion(): Fr;
|
|
20
19
|
abstract createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest>;
|
|
@@ -36,7 +35,6 @@ export declare abstract class BaseWallet implements Wallet {
|
|
|
36
35
|
registerRecipient(account: CompleteAddress): Promise<void>;
|
|
37
36
|
getRegisteredAccounts(): Promise<CompleteAddress[]>;
|
|
38
37
|
getRegisteredAccount(address: AztecAddress): Promise<CompleteAddress | undefined>;
|
|
39
|
-
getRegisteredAccountPublicKeysHash(address: AztecAddress): Promise<Fr | undefined>;
|
|
40
38
|
getRecipients(): Promise<CompleteAddress[]>;
|
|
41
39
|
getRecipient(address: AztecAddress): Promise<CompleteAddress | undefined>;
|
|
42
40
|
registerContract(contract: {
|
|
@@ -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,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAC/B,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,UAAU,EACf,KAAK,GAAG,EACR,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,EAAE,EACP,KAAK,QAAQ,EACb,KAAK,kBAAkB,EACvB,KAAK,MAAM,EACX,KAAK,SAAS,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,KAAK,EAAE,EAAE,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3G,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AACpG,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAChG,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExE;;GAEG;AACH,8BAAsB,UAAW,YAAW,MAAM;IACpC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG;gBAAR,GAAG,EAAE,GAAG;IAEvC,QAAQ,CAAC,kBAAkB,IAAI,eAAe;IAE9C,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/base_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,9 +29,6 @@ export class BaseWallet {
|
|
|
29
29
|
getRegisteredAccount(address) {
|
|
30
30
|
return this.pxe.getRegisteredAccount(address);
|
|
31
31
|
}
|
|
32
|
-
getRegisteredAccountPublicKeysHash(address) {
|
|
33
|
-
return this.pxe.getRegisteredAccountPublicKeysHash(address);
|
|
34
|
-
}
|
|
35
32
|
getRecipients() {
|
|
36
33
|
return this.pxe.getRecipients();
|
|
37
34
|
}
|
|
@@ -112,4 +109,4 @@ export class BaseWallet {
|
|
|
112
109
|
return this.pxe.isContractPubliclyDeployed(address);
|
|
113
110
|
}
|
|
114
111
|
}
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV93YWxsZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2Jhc2Vfd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQTBCQTs7R0FFRztBQUNILE1BQU0sT0FBZ0IsVUFBVTtJQUM5QixZQUErQixHQUFRO1FBQVIsUUFBRyxHQUFILEdBQUcsQ0FBSztJQUFHLENBQUM7SUEwQjNDLFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLE9BQU8sQ0FBQztJQUMzQyxDQUFDO0lBQ0QsbUJBQW1CLENBQUMsT0FBcUI7UUFDdkMsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQy9DLENBQUM7SUFDRCxnQkFBZ0IsQ0FBQyxFQUFNO1FBQ3JCLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBQ0QsVUFBVSxDQUFDLE9BQWE7UUFDdEIsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN0QyxDQUFDO0lBQ0QsZUFBZSxDQUFDLFNBQWEsRUFBRSxjQUE4QjtRQUMzRCxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxjQUFjLENBQUMsQ0FBQztJQUM3RCxDQUFDO0lBQ0QsaUJBQWlCLENBQUMsT0FBd0I7UUFDeEMsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFDRCxxQkFBcUI7UUFDbkIsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLHFCQUFxQixFQUFFLENBQUM7SUFDMUMsQ0FBQztJQUNELG9CQUFvQixDQUFDLE9BQXFCO1FBQ3hDLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxPQUFPLENBQUMsQ0FBQztJ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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sCAAsC,CAAC;AACrD,cAAc,wBAAwB,CAAC;AAEvC;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC7B,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,YAAY,EACrB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sCAAsC,CAAC;AACrD,cAAc,wBAAwB,CAAC;AAEvC;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC7B,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,YAAY,EACrB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,aAAa,CAAC,CAQxB"}
|
package/dest/wallet/index.js
CHANGED
|
@@ -15,12 +15,8 @@ export async function getWallet(pxe, address, accountContract) {
|
|
|
15
15
|
if (!completeAddress) {
|
|
16
16
|
throw new Error(`Account ${address} not found`);
|
|
17
17
|
}
|
|
18
|
-
const publicKeysHash = await pxe.getRegisteredAccountPublicKeysHash(address);
|
|
19
|
-
if (!publicKeysHash) {
|
|
20
|
-
throw new Error(`Public keys hash for account ${address} not found`);
|
|
21
|
-
}
|
|
22
18
|
const nodeInfo = await pxe.getNodeInfo();
|
|
23
|
-
const entrypoint = accountContract.getInterface(completeAddress,
|
|
19
|
+
const entrypoint = accountContract.getInterface(completeAddress, nodeInfo);
|
|
24
20
|
return new AccountWallet(pxe, entrypoint);
|
|
25
21
|
}
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVwRCxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxzQ0FBc0MsQ0FBQztBQUNyRCxjQUFjLHdCQUF3QixDQUFDO0FBRXZDOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsU0FBUyxDQUM3QixHQUFRLEVBQ1IsT0FBcUIsRUFDckIsZUFBZ0M7SUFFaEMsTUFBTSxlQUFlLEdBQUcsTUFBTSxHQUFHLENBQUMsb0JBQW9CLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDaEUsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1FBQ3JCLE1BQU0sSUFBSSxLQUFLLENBQUMsV0FBVyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFDRCxNQUFNLFFBQVEsR0FBRyxNQUFNLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUN6QyxNQUFNLFVBQVUsR0FBRyxlQUFlLENBQUMsWUFBWSxDQUFDLGVBQWUsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUMzRSxPQUFPLElBQUksYUFBYSxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsQ0FBQztBQUM1QyxDQUFDIn0=
|
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.40.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": "./dest/index.js",
|
|
@@ -65,12 +65,12 @@
|
|
|
65
65
|
]
|
|
66
66
|
},
|
|
67
67
|
"dependencies": {
|
|
68
|
-
"@aztec/circuit-types": "0.
|
|
69
|
-
"@aztec/circuits.js": "0.
|
|
70
|
-
"@aztec/ethereum": "0.
|
|
71
|
-
"@aztec/foundation": "0.
|
|
72
|
-
"@aztec/protocol-contracts": "0.
|
|
73
|
-
"@aztec/types": "0.
|
|
68
|
+
"@aztec/circuit-types": "0.40.0",
|
|
69
|
+
"@aztec/circuits.js": "0.40.0",
|
|
70
|
+
"@aztec/ethereum": "0.40.0",
|
|
71
|
+
"@aztec/foundation": "0.40.0",
|
|
72
|
+
"@aztec/protocol-contracts": "0.40.0",
|
|
73
|
+
"@aztec/types": "0.40.0",
|
|
74
74
|
"tslib": "^2.4.0"
|
|
75
75
|
},
|
|
76
76
|
"devDependencies": {
|
package/src/account/contract.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { type CompleteAddress } from '@aztec/circuit-types';
|
|
2
|
-
import { type Fr } from '@aztec/circuits.js';
|
|
3
2
|
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
4
3
|
import { type NodeInfo } from '@aztec/types/interfaces';
|
|
5
4
|
|
|
@@ -26,11 +25,10 @@ export interface AccountContract {
|
|
|
26
25
|
* The account interface is responsible for assembling tx requests given requested function calls, and
|
|
27
26
|
* for creating signed auth witnesses given action identifiers (message hashes).
|
|
28
27
|
* @param address - Address where this account contract is deployed.
|
|
29
|
-
* @param publicKeysHash - Hash of the public keys used to authorize actions.
|
|
30
28
|
* @param nodeInfo - Info on the chain where it is deployed.
|
|
31
29
|
* @returns An account interface instance for creating tx requests and authorizing actions.
|
|
32
30
|
*/
|
|
33
|
-
getInterface(address: CompleteAddress,
|
|
31
|
+
getInterface(address: CompleteAddress, nodeInfo: NodeInfo): AccountInterface;
|
|
34
32
|
|
|
35
33
|
/**
|
|
36
34
|
* Returns the auth witness provider for the given address.
|
package/src/account/interface.ts
CHANGED
|
@@ -42,9 +42,6 @@ export interface AccountInterface extends AuthWitnessProvider, EntrypointInterfa
|
|
|
42
42
|
/** Returns the complete address for this account. */
|
|
43
43
|
getCompleteAddress(): CompleteAddress;
|
|
44
44
|
|
|
45
|
-
/** Returns the public keys hash for this account. */
|
|
46
|
-
getPublicKeysHash(): Fr;
|
|
47
|
-
|
|
48
45
|
/** Returns the address for this account. */
|
|
49
46
|
getAddress(): AztecAddress;
|
|
50
47
|
|
|
@@ -39,7 +39,7 @@ export class AccountManager {
|
|
|
39
39
|
|
|
40
40
|
protected getPublicKeysHash() {
|
|
41
41
|
if (!this.publicKeysHash) {
|
|
42
|
-
this.publicKeysHash = deriveKeys(this.secretKey).
|
|
42
|
+
this.publicKeysHash = deriveKeys(this.secretKey).publicKeys.hash();
|
|
43
43
|
}
|
|
44
44
|
return this.publicKeysHash;
|
|
45
45
|
}
|
|
@@ -51,7 +51,7 @@ export class AccountManager {
|
|
|
51
51
|
public async getAccount(): Promise<AccountInterface> {
|
|
52
52
|
const nodeInfo = await this.pxe.getNodeInfo();
|
|
53
53
|
const completeAddress = this.getCompleteAddress();
|
|
54
|
-
return this.accountContract.getInterface(completeAddress,
|
|
54
|
+
return this.accountContract.getInterface(completeAddress, nodeInfo);
|
|
55
55
|
}
|
|
56
56
|
|
|
57
57
|
/**
|
|
@@ -125,7 +125,6 @@ export class AccountManager {
|
|
|
125
125
|
);
|
|
126
126
|
}
|
|
127
127
|
await this.#register();
|
|
128
|
-
const encryptionPublicKey = this.getPublicKeysHash();
|
|
129
128
|
const { chainId, protocolVersion } = await this.pxe.getNodeInfo();
|
|
130
129
|
const deployWallet = new SignerlessWallet(this.pxe, new DefaultMultiCallEntrypoint(chainId, protocolVersion));
|
|
131
130
|
|
|
@@ -135,7 +134,7 @@ export class AccountManager {
|
|
|
135
134
|
const args = this.accountContract.getDeploymentArgs() ?? [];
|
|
136
135
|
this.deployMethod = new DeployAccountMethod(
|
|
137
136
|
this.accountContract.getAuthWitnessProvider(this.getCompleteAddress()),
|
|
138
|
-
|
|
137
|
+
this.getPublicKeysHash(),
|
|
139
138
|
deployWallet,
|
|
140
139
|
this.accountContract.getContractArtifact(),
|
|
141
140
|
args,
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type Tx, type TxExecutionRequest } from '@aztec/circuit-types';
|
|
2
|
+
import { GasSettings } from '@aztec/circuits.js';
|
|
2
3
|
|
|
3
|
-
import { type
|
|
4
|
+
import { type Wallet } from '../account/wallet.js';
|
|
5
|
+
import { type ExecutionRequestInit, type FeeOptions } from '../entrypoint/entrypoint.js';
|
|
6
|
+
import { getGasLimits } from './get_gas_limits.js';
|
|
4
7
|
import { SentTx } from './sent_tx.js';
|
|
5
8
|
|
|
6
9
|
/**
|
|
@@ -8,15 +11,12 @@ import { SentTx } from './sent_tx.js';
|
|
|
8
11
|
* Allows the user to specify the sender address and nonce for a transaction.
|
|
9
12
|
*/
|
|
10
13
|
export type SendMethodOptions = {
|
|
11
|
-
/**
|
|
12
|
-
* Wether to skip the simulation of the public part of the transaction.
|
|
13
|
-
*/
|
|
14
|
+
/** Wether to skip the simulation of the public part of the transaction. */
|
|
14
15
|
skipPublicSimulation?: boolean;
|
|
15
|
-
|
|
16
|
-
/**
|
|
17
|
-
* The fee options for the transaction.
|
|
18
|
-
*/
|
|
16
|
+
/** The fee options for the transaction. */
|
|
19
17
|
fee?: FeeOptions;
|
|
18
|
+
/** Whether to run an initial simulation of the tx with high gas limit to figure out actual gas settings (will default to true later down the road). */
|
|
19
|
+
estimateGas?: boolean;
|
|
20
20
|
};
|
|
21
21
|
|
|
22
22
|
/**
|
|
@@ -27,7 +27,7 @@ export abstract class BaseContractInteraction {
|
|
|
27
27
|
protected tx?: Tx;
|
|
28
28
|
protected txRequest?: TxExecutionRequest;
|
|
29
29
|
|
|
30
|
-
constructor(protected
|
|
30
|
+
constructor(protected wallet: Wallet) {}
|
|
31
31
|
|
|
32
32
|
/**
|
|
33
33
|
* Create a transaction execution request ready to be simulated.
|
|
@@ -43,7 +43,7 @@ export abstract class BaseContractInteraction {
|
|
|
43
43
|
*/
|
|
44
44
|
public async prove(options: SendMethodOptions = {}): Promise<Tx> {
|
|
45
45
|
const txRequest = this.txRequest ?? (await this.create(options));
|
|
46
|
-
this.tx = await this.
|
|
46
|
+
this.tx = await this.wallet.proveTx(txRequest, !options.skipPublicSimulation);
|
|
47
47
|
return this.tx;
|
|
48
48
|
}
|
|
49
49
|
|
|
@@ -59,9 +59,36 @@ export abstract class BaseContractInteraction {
|
|
|
59
59
|
public send(options: SendMethodOptions = {}) {
|
|
60
60
|
const promise = (async () => {
|
|
61
61
|
const tx = this.tx ?? (await this.prove(options));
|
|
62
|
-
return this.
|
|
62
|
+
return this.wallet.sendTx(tx);
|
|
63
63
|
})();
|
|
64
64
|
|
|
65
|
-
return new SentTx(this.
|
|
65
|
+
return new SentTx(this.wallet, promise);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Estimates gas for a given tx request and returns defaults gas settings for it.
|
|
70
|
+
* @param txRequest - Transaction execution request to process.
|
|
71
|
+
* @returns Gas settings.
|
|
72
|
+
*/
|
|
73
|
+
protected async estimateGas(txRequest: TxExecutionRequest) {
|
|
74
|
+
const simulationResult = await this.wallet.simulateTx(txRequest, true);
|
|
75
|
+
const { totalGas: gasLimits, teardownGas: teardownGasLimits } = getGasLimits(simulationResult);
|
|
76
|
+
return GasSettings.default({ gasLimits, teardownGasLimits });
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* Helper method to return fee options based on the user opts, estimating tx gas if needed.
|
|
81
|
+
* @param request - Request to execute for this interaction.
|
|
82
|
+
* @returns Fee options for the actual transaction.
|
|
83
|
+
*/
|
|
84
|
+
protected async getFeeOptions(request: ExecutionRequestInit) {
|
|
85
|
+
const fee = request.fee;
|
|
86
|
+
if (fee) {
|
|
87
|
+
const txRequest = await this.wallet.createTxExecutionRequest(request);
|
|
88
|
+
const { gasLimits, teardownGasLimits } = await this.estimateGas(txRequest);
|
|
89
|
+
const gasSettings = GasSettings.default({ ...fee.gasSettings, gasLimits, teardownGasLimits });
|
|
90
|
+
return { ...fee, gasSettings };
|
|
91
|
+
}
|
|
92
|
+
return fee;
|
|
66
93
|
}
|
|
67
94
|
}
|
|
@@ -5,7 +5,7 @@ import { BaseContractInteraction, type SendMethodOptions } from './base_contract
|
|
|
5
5
|
|
|
6
6
|
/** A batch of function calls to be sent as a single transaction through a wallet. */
|
|
7
7
|
export class BatchCall extends BaseContractInteraction {
|
|
8
|
-
constructor(
|
|
8
|
+
constructor(wallet: Wallet, protected calls: FunctionCall[]) {
|
|
9
9
|
super(wallet);
|
|
10
10
|
}
|
|
11
11
|
|
|
@@ -17,10 +17,9 @@ export class BatchCall extends BaseContractInteraction {
|
|
|
17
17
|
*/
|
|
18
18
|
public async create(opts?: SendMethodOptions): Promise<TxExecutionRequest> {
|
|
19
19
|
if (!this.txRequest) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
});
|
|
20
|
+
const calls = this.calls;
|
|
21
|
+
const fee = opts?.estimateGas ? await this.getFeeOptions({ calls, fee: opts?.fee }) : opts?.fee;
|
|
22
|
+
this.txRequest = await this.wallet.createTxExecutionRequest({ calls, fee });
|
|
24
23
|
}
|
|
25
24
|
return this.txRequest;
|
|
26
25
|
}
|
|
@@ -25,7 +25,7 @@ export type SimulateMethodOptions = {
|
|
|
25
25
|
*/
|
|
26
26
|
export class ContractFunctionInteraction extends BaseContractInteraction {
|
|
27
27
|
constructor(
|
|
28
|
-
|
|
28
|
+
wallet: Wallet,
|
|
29
29
|
protected contractAddress: AztecAddress,
|
|
30
30
|
protected functionDao: FunctionAbi,
|
|
31
31
|
protected args: any[],
|
|
@@ -47,10 +47,9 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
|
|
|
47
47
|
throw new Error("Can't call `create` on an unconstrained function.");
|
|
48
48
|
}
|
|
49
49
|
if (!this.txRequest) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
});
|
|
50
|
+
const calls = [this.request()];
|
|
51
|
+
const fee = opts?.estimateGas ? await this.getFeeOptions({ calls, fee: opts?.fee }) : opts?.fee;
|
|
52
|
+
this.txRequest = await this.wallet.createTxExecutionRequest({ calls, fee });
|
|
54
53
|
}
|
|
55
54
|
return this.txRequest;
|
|
56
55
|
}
|
|
@@ -98,12 +97,12 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
|
|
|
98
97
|
argsOfCalls: [packedArgs],
|
|
99
98
|
authWitnesses: [],
|
|
100
99
|
});
|
|
101
|
-
const simulatedTx = await this.
|
|
100
|
+
const simulatedTx = await this.wallet.simulateTx(txRequest, true, options.from ?? this.wallet.getAddress());
|
|
102
101
|
const flattened = simulatedTx.privateReturnValues;
|
|
103
102
|
return flattened ? decodeReturnValues(this.functionDao, flattened) : [];
|
|
104
103
|
} else {
|
|
105
104
|
const txRequest = await this.create();
|
|
106
|
-
const simulatedTx = await this.
|
|
105
|
+
const simulatedTx = await this.wallet.simulateTx(txRequest, true);
|
|
107
106
|
this.txRequest = undefined;
|
|
108
107
|
const flattened = simulatedTx.publicOutput?.publicReturnValues;
|
|
109
108
|
return flattened ? decodeReturnValues(this.functionDao, flattened) : [];
|
|
@@ -57,7 +57,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
|
|
|
57
57
|
|
|
58
58
|
constructor(
|
|
59
59
|
private publicKeysHash: Fr,
|
|
60
|
-
|
|
60
|
+
wallet: Wallet,
|
|
61
61
|
private artifact: ContractArtifact,
|
|
62
62
|
private postDeployCtor: (address: AztecAddress, wallet: Wallet) => Promise<TContract>,
|
|
63
63
|
private args: any[] = [],
|
|
@@ -80,11 +80,14 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
|
|
|
80
80
|
if (!this.txRequest) {
|
|
81
81
|
this.txRequest = await this.wallet.createTxExecutionRequest(await this.request(options));
|
|
82
82
|
// TODO: Should we add the contracts to the DB here, or once the tx has been sent or mined?
|
|
83
|
-
await this.
|
|
83
|
+
await this.wallet.registerContract({ artifact: this.artifact, instance: this.instance! });
|
|
84
84
|
}
|
|
85
85
|
return this.txRequest;
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
+
// REFACTOR: Having a `request` method with different semantics than the ones in the other
|
|
89
|
+
// derived ContractInteractions is confusing. We should unify the flow of all ContractInteractions.
|
|
90
|
+
|
|
88
91
|
/**
|
|
89
92
|
* Returns an array of function calls that represent this operation. Useful as a building
|
|
90
93
|
* block for constructing batch requests.
|
|
@@ -102,13 +105,20 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
|
|
|
102
105
|
throw new Error(`No function calls needed to deploy contract ${this.artifact.name}`);
|
|
103
106
|
}
|
|
104
107
|
|
|
105
|
-
|
|
108
|
+
const request = {
|
|
106
109
|
calls: [...deployment.calls, ...bootstrap.calls],
|
|
107
110
|
authWitnesses: [...(deployment.authWitnesses ?? []), ...(bootstrap.authWitnesses ?? [])],
|
|
108
111
|
packedArguments: [...(deployment.packedArguments ?? []), ...(bootstrap.packedArguments ?? [])],
|
|
109
112
|
fee: options.fee,
|
|
110
113
|
};
|
|
114
|
+
|
|
115
|
+
if (options.estimateGas) {
|
|
116
|
+
request.fee = await this.getFeeOptions(request);
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
this.functionCalls = request;
|
|
111
120
|
}
|
|
121
|
+
|
|
112
122
|
return this.functionCalls;
|
|
113
123
|
}
|
|
114
124
|
|
|
@@ -134,7 +144,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
|
|
|
134
144
|
|
|
135
145
|
// Register the contract class if it hasn't been published already.
|
|
136
146
|
if (!options.skipClassRegistration) {
|
|
137
|
-
if (await this.
|
|
147
|
+
if (await this.wallet.isContractClassPubliclyRegistered(contractClass.id)) {
|
|
138
148
|
this.log.debug(
|
|
139
149
|
`Skipping registration of already registered contract class ${contractClass.id.toString()} for ${instance.address.toString()}`,
|
|
140
150
|
);
|
|
@@ -192,7 +202,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
|
|
|
192
202
|
this.log.debug(
|
|
193
203
|
`Sent deployment tx of ${this.artifact.name} contract with deployment address ${instance.address.toString()}`,
|
|
194
204
|
);
|
|
195
|
-
return new DeploySentTx(this.
|
|
205
|
+
return new DeploySentTx(this.wallet, txHashPromise, this.postDeployCtor, instance);
|
|
196
206
|
}
|
|
197
207
|
|
|
198
208
|
/**
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { PublicKernelType, type SimulatedTx } from '@aztec/circuit-types';
|
|
2
|
+
import { Gas } from '@aztec/circuits.js';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Returns suggested total and teardown gas limits for a simulated tx.
|
|
6
|
+
* Note that public gas usage is only accounted for if the publicOutput is present.
|
|
7
|
+
* @param pad - Percentage to pad the suggested gas limits by, defaults to 10%.
|
|
8
|
+
*/
|
|
9
|
+
export function getGasLimits(simulatedTx: SimulatedTx, pad = 0.1) {
|
|
10
|
+
const privateGasUsed = simulatedTx.tx.data.publicInputs.end.gasUsed;
|
|
11
|
+
if (simulatedTx.publicOutput) {
|
|
12
|
+
const publicGasUsed = Object.values(simulatedTx.publicOutput.gasUsed)
|
|
13
|
+
.filter(Boolean)
|
|
14
|
+
.reduce((total, current) => total.add(current), Gas.empty());
|
|
15
|
+
const teardownGas = simulatedTx.publicOutput.gasUsed[PublicKernelType.TEARDOWN] ?? Gas.empty();
|
|
16
|
+
|
|
17
|
+
return {
|
|
18
|
+
totalGas: privateGasUsed.add(publicGasUsed).mul(1 + pad),
|
|
19
|
+
teardownGas: teardownGas.mul(1 + pad),
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
return { totalGas: privateGasUsed.mul(1 + pad), teardownGas: Gas.empty() };
|
|
24
|
+
}
|
package/src/index.ts
CHANGED
package/src/utils/account.ts
CHANGED
|
@@ -14,7 +14,7 @@ export async function waitForAccountSynch(
|
|
|
14
14
|
address: CompleteAddress,
|
|
15
15
|
{ interval, timeout }: WaitOpts = DefaultWaitOpts,
|
|
16
16
|
): Promise<void> {
|
|
17
|
-
const publicKey = address.
|
|
17
|
+
const publicKey = address.publicKeys.masterIncomingViewingPublicKey.toString();
|
|
18
18
|
await retryUntil(
|
|
19
19
|
async () => {
|
|
20
20
|
const status = await pxe.getSyncStatus();
|
|
@@ -16,10 +16,6 @@ export class AccountWallet extends BaseWallet {
|
|
|
16
16
|
super(pxe);
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
getPublicKeysHash(): Fr {
|
|
20
|
-
return this.account.getPublicKeysHash();
|
|
21
|
-
}
|
|
22
|
-
|
|
23
19
|
createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest> {
|
|
24
20
|
return this.account.createTxExecutionRequest(exec);
|
|
25
21
|
}
|
|
@@ -32,8 +32,6 @@ export abstract class BaseWallet implements Wallet {
|
|
|
32
32
|
|
|
33
33
|
abstract getCompleteAddress(): CompleteAddress;
|
|
34
34
|
|
|
35
|
-
abstract getPublicKeysHash(): Fr;
|
|
36
|
-
|
|
37
35
|
abstract getChainId(): Fr;
|
|
38
36
|
|
|
39
37
|
abstract getVersion(): Fr;
|
|
@@ -80,9 +78,6 @@ export abstract class BaseWallet implements Wallet {
|
|
|
80
78
|
getRegisteredAccount(address: AztecAddress): Promise<CompleteAddress | undefined> {
|
|
81
79
|
return this.pxe.getRegisteredAccount(address);
|
|
82
80
|
}
|
|
83
|
-
getRegisteredAccountPublicKeysHash(address: AztecAddress): Promise<Fr | undefined> {
|
|
84
|
-
return this.pxe.getRegisteredAccountPublicKeysHash(address);
|
|
85
|
-
}
|
|
86
81
|
getRecipients(): Promise<CompleteAddress[]> {
|
|
87
82
|
return this.pxe.getRecipients();
|
|
88
83
|
}
|
package/src/wallet/index.ts
CHANGED
|
@@ -25,11 +25,7 @@ export async function getWallet(
|
|
|
25
25
|
if (!completeAddress) {
|
|
26
26
|
throw new Error(`Account ${address} not found`);
|
|
27
27
|
}
|
|
28
|
-
const publicKeysHash = await pxe.getRegisteredAccountPublicKeysHash(address);
|
|
29
|
-
if (!publicKeysHash) {
|
|
30
|
-
throw new Error(`Public keys hash for account ${address} not found`);
|
|
31
|
-
}
|
|
32
28
|
const nodeInfo = await pxe.getNodeInfo();
|
|
33
|
-
const entrypoint = accountContract.getInterface(completeAddress,
|
|
29
|
+
const entrypoint = accountContract.getInterface(completeAddress, nodeInfo);
|
|
34
30
|
return new AccountWallet(pxe, entrypoint);
|
|
35
31
|
}
|