@aztec/cli-wallet 0.87.4 → 0.87.5
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/cmds/authorize_action.d.ts.map +1 -1
- package/dest/cmds/authorize_action.js +1 -4
- package/dest/cmds/cancel_tx.d.ts.map +1 -1
- package/dest/cmds/cancel_tx.js +1 -4
- package/dest/cmds/create_account.d.ts.map +1 -1
- package/dest/cmds/create_account.js +1 -4
- package/dest/cmds/deploy.d.ts.map +1 -1
- package/dest/cmds/deploy.js +1 -4
- package/dest/cmds/deploy_account.d.ts.map +1 -1
- package/dest/cmds/deploy_account.js +1 -4
- package/dest/cmds/send.d.ts.map +1 -1
- package/dest/cmds/send.js +1 -4
- package/dest/utils/profiling.d.ts.map +1 -1
- package/dest/utils/profiling.js +8 -24
- package/dest/utils/pxe_wrapper.d.ts +0 -1
- package/dest/utils/pxe_wrapper.d.ts.map +1 -1
- package/dest/utils/pxe_wrapper.js +0 -1
- package/package.json +12 -12
- package/src/cmds/authorize_action.ts +1 -3
- package/src/cmds/cancel_tx.ts +1 -3
- package/src/cmds/create_account.ts +1 -2
- package/src/cmds/deploy.ts +1 -2
- package/src/cmds/deploy_account.ts +1 -2
- package/src/cmds/send.ts +1 -2
- package/src/utils/profiling.ts +15 -63
- package/src/utils/pxe_wrapper.ts +0 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorize_action.d.ts","sourceRoot":"","sources":["../../src/cmds/authorize_action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE/F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"authorize_action.d.ts","sourceRoot":"","sources":["../../src/cmds/authorize_action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE/F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,eAAe,CACnC,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,KAAK,oFAwBX"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Contract } from '@aztec/aztec.js';
|
|
2
2
|
import { prepTx } from '@aztec/cli/utils';
|
|
3
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
4
3
|
export async function authorizeAction(wallet, functionName, caller, functionArgsIn, contractArtifactPath, contractAddress, log) {
|
|
5
4
|
const { functionArgs, contractArtifact, isPrivate } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
|
|
6
5
|
if (isPrivate) {
|
|
@@ -12,9 +11,7 @@ export async function authorizeAction(wallet, functionName, caller, functionArgs
|
|
|
12
11
|
caller,
|
|
13
12
|
action
|
|
14
13
|
}, true);
|
|
15
|
-
const witness = await setAuthwitnessInteraction.send().wait(
|
|
16
|
-
timeout: DEFAULT_TX_TIMEOUT_S
|
|
17
|
-
});
|
|
14
|
+
const witness = await setAuthwitnessInteraction.send().wait();
|
|
18
15
|
log(`Authorized action ${functionName} on contract ${contractAddress} for caller ${caller}`);
|
|
19
16
|
return witness;
|
|
20
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel_tx.d.ts","sourceRoot":"","sources":["../../src/cmds/cancel_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,gBAAgB,EAAU,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAGxH,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"cancel_tx.d.ts","sourceRoot":"","sources":["../../src/cmds/cancel_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,gBAAgB,EAAU,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAGxH,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEzD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,0BAA0B,EAClC,EACE,MAAM,EACN,WAAW,EAAE,iBAAiB,EAC9B,KAAK,EACL,WAAW,GACZ,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAChF,aAAa,EAAE,gBAAgB,EAC/B,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GAAG,SAAS,EAClC,GAAG,EAAE,KAAK,iBA0CX"}
|
package/dest/cmds/cancel_tx.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { SentTx, TxStatus } from '@aztec/aztec.js';
|
|
2
2
|
import { ExecutionPayload } from '@aztec/entrypoints/payload';
|
|
3
3
|
import { GasFees, GasSettings } from '@aztec/stdlib/gas';
|
|
4
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
5
4
|
export async function cancelTx(wallet, { txHash, gasSettings: prevTxGasSettings, nonce, cancellable }, paymentMethod, increasedFees, maxFeesPerGas, log) {
|
|
6
5
|
const receipt = await wallet.getTxReceipt(txHash);
|
|
7
6
|
if (receipt.status !== TxStatus.PENDING || !cancellable) {
|
|
@@ -25,9 +24,7 @@ export async function cancelTx(wallet, { txHash, gasSettings: prevTxGasSettings,
|
|
|
25
24
|
const txProvingResult = await wallet.proveTx(txRequest, txSimulationResult.privateExecutionResult);
|
|
26
25
|
const sentTx = new SentTx(wallet, wallet.sendTx(txProvingResult.toTx()));
|
|
27
26
|
try {
|
|
28
|
-
await sentTx.wait(
|
|
29
|
-
timeout: DEFAULT_TX_TIMEOUT_S
|
|
30
|
-
});
|
|
27
|
+
await sentTx.wait();
|
|
31
28
|
log('Transaction has been cancelled');
|
|
32
29
|
const cancelReceipt = await sentTx.getReceipt();
|
|
33
30
|
log(` Tx fee: ${cancelReceipt.transactionFee}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/cmds/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAwB,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/cmds/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAwB,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAG5E,wBAAsB,aAAa,CACjC,MAAM,EAAE,GAAG,EACX,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,EAAE,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;;GAsHX"}
|
|
@@ -3,7 +3,6 @@ import { Fr } from '@aztec/foundation/fields';
|
|
|
3
3
|
import { createOrRetrieveAccount } from '../utils/accounts.js';
|
|
4
4
|
import { printGasEstimates } from '../utils/options/fees.js';
|
|
5
5
|
import { printProfileResult } from '../utils/profiling.js';
|
|
6
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
7
6
|
export async function createAccount(client, accountType, secretKey, publicKey, alias, registerOnly, publicDeploy, skipInitialization, wait, feeOpts, json, verbose, debugLogger, log) {
|
|
8
7
|
secretKey ??= Fr.random();
|
|
9
8
|
const account = await createOrRetrieveAccount(client, undefined /* address, we don't have it yet */ , undefined /* db, as we want to create from scratch */ , secretKey, accountType, Fr.ZERO, publicKey);
|
|
@@ -93,9 +92,7 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
|
|
|
93
92
|
if (!json) {
|
|
94
93
|
log(`\nWaiting for account contract deployment...`);
|
|
95
94
|
}
|
|
96
|
-
txReceipt = await tx.wait(
|
|
97
|
-
timeout: DEFAULT_TX_TIMEOUT_S
|
|
98
|
-
});
|
|
95
|
+
txReceipt = await tx.wait();
|
|
99
96
|
out.txReceipt = {
|
|
100
97
|
status: txReceipt.status,
|
|
101
98
|
transactionFee: txReceipt.transactionFee
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAwC,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAE5G,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAwC,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAE5G,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAG5E,wBAAsB,MAAM,CAC1B,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,GAAG,EAAE,EACd,IAAI,EAAE,EAAE,GAAG,SAAS,EACpB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,oBAAoB,EAAE,OAAO,EAC7B,qBAAqB,EAAE,OAAO,EAC9B,kBAAkB,EAAE,OAAO,GAAG,SAAS,EACvC,eAAe,EAAE,OAAO,GAAG,SAAS,EACpC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,EACV,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,+DAuF/B"}
|
package/dest/cmds/deploy.js
CHANGED
|
@@ -4,7 +4,6 @@ import { getAllFunctionAbis, getInitializer } from '@aztec/stdlib/abi';
|
|
|
4
4
|
import { PublicKeys } from '@aztec/stdlib/keys';
|
|
5
5
|
import { printGasEstimates } from '../utils/options/fees.js';
|
|
6
6
|
import { printProfileResult } from '../utils/profiling.js';
|
|
7
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
8
7
|
export async function deploy(wallet, artifactPath, json, publicKeys, rawArgs, salt, initializer, skipPublicDeployment, skipClassRegistration, skipInitialization, universalDeploy, wait, feeOpts, verbose, debugLogger, log, logJson) {
|
|
9
8
|
salt ??= Fr.random();
|
|
10
9
|
const contractArtifact = await getContractArtifact(artifactPath, log);
|
|
@@ -43,9 +42,7 @@ export async function deploy(wallet, artifactPath, json, publicKeys, rawArgs, sa
|
|
|
43
42
|
const txHash = await tx.getTxHash();
|
|
44
43
|
debugLogger.debug(`Deploy tx sent with hash ${txHash}`);
|
|
45
44
|
if (wait) {
|
|
46
|
-
const deployed = await tx.wait(
|
|
47
|
-
timeout: DEFAULT_TX_TIMEOUT_S
|
|
48
|
-
});
|
|
45
|
+
const deployed = await tx.wait();
|
|
49
46
|
const { address, partialAddress, instance } = deployed.contract;
|
|
50
47
|
if (json) {
|
|
51
48
|
logJson({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,iBAAiB,CAAC;AAE5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,iBAAiB,CAAC;AAE5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAG5E,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,OAAO,EACrB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;GAqGX"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { prettyPrintJSON } from '@aztec/cli/cli-utils';
|
|
2
2
|
import { printGasEstimates } from '../utils/options/fees.js';
|
|
3
3
|
import { printProfileResult } from '../utils/profiling.js';
|
|
4
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
5
4
|
export async function deployAccount(account, wait, registerClass, publicDeploy, feeOpts, json, verbose, debugLogger, log) {
|
|
6
5
|
const out = {};
|
|
7
6
|
const { address, partialAddress, publicKeys } = await account.getCompleteAddress();
|
|
@@ -82,9 +81,7 @@ export async function deployAccount(account, wait, registerClass, publicDeploy,
|
|
|
82
81
|
if (!json) {
|
|
83
82
|
log(`\nWaiting for account contract deployment...`);
|
|
84
83
|
}
|
|
85
|
-
txReceipt = await tx.wait(
|
|
86
|
-
timeout: DEFAULT_TX_TIMEOUT_S
|
|
87
|
-
});
|
|
84
|
+
txReceipt = await tx.wait();
|
|
88
85
|
out.txReceipt = {
|
|
89
86
|
status: txReceipt.status,
|
|
90
87
|
transactionFee: txReceipt.transactionFee
|
package/dest/cmds/send.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/cmds/send.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,0BAA0B,EAC/B,WAAW,EACX,KAAK,YAAY,EAEjB,EAAE,EAEH,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/cmds/send.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,0BAA0B,EAC/B,WAAW,EACX,KAAK,YAAY,EAEjB,EAAE,EAEH,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAG5E,wBAAsB,IAAI,CACxB,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,WAAW,EAAE,EAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK;;;;;eA0DX"}
|
package/dest/cmds/send.js
CHANGED
|
@@ -3,7 +3,6 @@ import { prepTx } from '@aztec/cli/utils';
|
|
|
3
3
|
import { GasSettings } from '@aztec/stdlib/gas';
|
|
4
4
|
import { printGasEstimates } from '../utils/options/fees.js';
|
|
5
5
|
import { printProfileResult } from '../utils/profiling.js';
|
|
6
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
7
6
|
export async function send(wallet, functionName, functionArgsIn, contractArtifactPath, contractAddress, wait, cancellable, feeOpts, authWitnesses, verbose, log) {
|
|
8
7
|
const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
|
|
9
8
|
const contract = await Contract.at(contractAddress, contractArtifact, wallet);
|
|
@@ -29,9 +28,7 @@ export async function send(wallet, functionName, functionArgsIn, contractArtifac
|
|
|
29
28
|
log(`\nTransaction hash: ${txHash.toString()}`);
|
|
30
29
|
if (wait) {
|
|
31
30
|
try {
|
|
32
|
-
await tx.wait(
|
|
33
|
-
timeout: DEFAULT_TX_TIMEOUT_S
|
|
34
|
-
});
|
|
31
|
+
await tx.wait();
|
|
35
32
|
log('Transaction has been mined');
|
|
36
33
|
const receipt = await tx.getReceipt();
|
|
37
34
|
log(` Tx fee: ${receipt.transactionFee}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profiling.d.ts","sourceRoot":"","sources":["../../src/utils/profiling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"profiling.d.ts","sourceRoot":"","sources":["../../src/utils/profiling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAI1E,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,cAAc,GAAG,iBAAiB,EAC3C,GAAG,EAAE,KAAK,EACV,cAAc,CAAC,EAAE,oBAAoB,EAAE,QA6ExC"}
|
package/dest/utils/profiling.js
CHANGED
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
import { format } from 'util';
|
|
2
|
-
const FN_NAME_PADDING = 50;
|
|
3
|
-
const COLUMN_MIN_WIDTH = 13;
|
|
4
|
-
const COLUMN_MAX_WIDTH = 15;
|
|
5
|
-
const ORACLE_NAME_PADDING = 50;
|
|
6
2
|
export function printProfileResult(timings, log, executionSteps) {
|
|
7
3
|
log(format('\nPer circuit breakdown:\n'));
|
|
8
|
-
log(format(' ', 'Function name'.padEnd(
|
|
9
|
-
log(format(''.padEnd(
|
|
4
|
+
log(format(' ', 'Function name'.padEnd(50), 'Time'.padStart(13).padEnd(15), executionSteps ? 'Gates'.padStart(13).padEnd(15) : '', executionSteps ? 'Subtotal'.padStart(13).padEnd(15) : ''));
|
|
5
|
+
log(format(''.padEnd(50 + 15 + 15 + (executionSteps ? 15 + 15 : 0), '-')));
|
|
10
6
|
let acc = 0;
|
|
11
7
|
let biggest = executionSteps?.[0];
|
|
12
8
|
timings.perFunction.forEach((fn, i)=>{
|
|
@@ -15,34 +11,22 @@ export function printProfileResult(timings, log, executionSteps) {
|
|
|
15
11
|
biggest = currentExecutionStep;
|
|
16
12
|
}
|
|
17
13
|
acc += currentExecutionStep ? currentExecutionStep.gateCount : 0;
|
|
18
|
-
log(format('
|
|
19
|
-
if (fn.oracles) {
|
|
20
|
-
log('');
|
|
21
|
-
for (const [oracleName, { times }] of Object.entries(fn.oracles)){
|
|
22
|
-
const calls = times.length;
|
|
23
|
-
const min = Math.min(...times);
|
|
24
|
-
const max = Math.max(...times);
|
|
25
|
-
const total = times.reduce((acc, time)=>acc + time, 0);
|
|
26
|
-
const avg = total / calls;
|
|
27
|
-
log(format(' ', oracleName.padEnd(ORACLE_NAME_PADDING), `${calls} calls`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `${total.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `min: ${min.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `avg: ${avg.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `max: ${max.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH)));
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
log('');
|
|
14
|
+
log(format(' ', fn.functionName.padEnd(50), `${fn.time.toFixed(2)}ms`.padStart(13).padEnd(15), currentExecutionStep ? currentExecutionStep.gateCount.toLocaleString().padStart(13).padEnd(15) : '', currentExecutionStep ? acc.toLocaleString().padStart(15) : ''));
|
|
31
15
|
});
|
|
32
16
|
if (biggest) {
|
|
33
17
|
log(format('\nTotal gates:', acc.toLocaleString(), `(Biggest circuit: ${biggest.functionName} -> ${biggest.gateCount.toLocaleString()})`));
|
|
34
18
|
}
|
|
35
19
|
log(format('\nSync time:'.padEnd(25), `${timings.sync?.toFixed(2)}ms`.padStart(16)));
|
|
36
|
-
log(format('Private simulation time:'.padEnd(25), `${timings.perFunction.reduce((acc, { time })=>acc + time, 0).toFixed(2)}ms`.padStart(
|
|
20
|
+
log(format('Private simulation time:'.padEnd(25), `${timings.perFunction.reduce((acc, { time })=>acc + time, 0).toFixed(2)}ms`.padStart(15)));
|
|
37
21
|
if (timings.proving) {
|
|
38
|
-
log(format('Proving time:'.padEnd(25), `${timings.proving?.toFixed(2)}ms`.padStart(
|
|
22
|
+
log(format('Proving time:'.padEnd(25), `${timings.proving?.toFixed(2)}ms`.padStart(15)));
|
|
39
23
|
}
|
|
40
24
|
if (timings.publicSimulation) {
|
|
41
|
-
log(format('Public simulation time:'.padEnd(25), `${timings.publicSimulation?.toFixed(2)}ms`.padStart(
|
|
25
|
+
log(format('Public simulation time:'.padEnd(25), `${timings.publicSimulation?.toFixed(2)}ms`.padStart(15)));
|
|
42
26
|
}
|
|
43
27
|
if (timings.validation) {
|
|
44
|
-
log(format('Validation time:'.padEnd(25), `${timings.validation?.toFixed(2)}ms`.padStart(
|
|
28
|
+
log(format('Validation time:'.padEnd(25), `${timings.validation?.toFixed(2)}ms`.padStart(15)));
|
|
45
29
|
}
|
|
46
|
-
log(format('Total time:'.padEnd(25), `${timings.total.toFixed(2)}ms`.padStart(
|
|
30
|
+
log(format('Total time:'.padEnd(25), `${timings.total.toFixed(2)}ms`.padStart(15), `(${timings.unaccounted.toFixed(2)}ms unaccounted)`));
|
|
47
31
|
log('\n');
|
|
48
32
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { type PXEServiceConfig } from '@aztec/pxe/server';
|
|
2
2
|
import { type AztecNode, type PXE } from '@aztec/stdlib/interfaces/client';
|
|
3
|
-
export declare const DEFAULT_TX_TIMEOUT_S = 180;
|
|
4
3
|
export declare class PXEWrapper {
|
|
5
4
|
private static pxeConfig;
|
|
6
5
|
private static pxe;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pxe_wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/pxe_wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,GAAG,EAAyB,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"pxe_wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/pxe_wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,GAAG,EAAyB,MAAM,iCAAiC,CAAC;AAMlG,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAC,SAAS,CAA+B;IACvD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAwB;IAErC,MAAM;IAOZ,OAAO,IAAI,SAAS,GAAG,SAAS;IAIhC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC;CAM/F"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
|
|
2
2
|
import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
|
|
3
|
-
export const DEFAULT_TX_TIMEOUT_S = 180;
|
|
4
3
|
/*
|
|
5
4
|
* Wrapper class for PXE service, avoids initialization issues due to
|
|
6
5
|
* closures when providing PXE service to injected commander.js commands
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli-wallet",
|
|
3
|
-
"version": "0.87.
|
|
3
|
+
"version": "0.87.5",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/cmds/index.js",
|
|
@@ -63,17 +63,17 @@
|
|
|
63
63
|
]
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@aztec/accounts": "0.87.
|
|
67
|
-
"@aztec/aztec.js": "0.87.
|
|
68
|
-
"@aztec/cli": "0.87.
|
|
69
|
-
"@aztec/entrypoints": "0.87.
|
|
70
|
-
"@aztec/ethereum": "0.87.
|
|
71
|
-
"@aztec/foundation": "0.87.
|
|
72
|
-
"@aztec/kv-store": "0.87.
|
|
73
|
-
"@aztec/noir-contracts.js": "0.87.
|
|
74
|
-
"@aztec/noir-noirc_abi": "0.87.
|
|
75
|
-
"@aztec/pxe": "0.87.
|
|
76
|
-
"@aztec/stdlib": "0.87.
|
|
66
|
+
"@aztec/accounts": "0.87.5",
|
|
67
|
+
"@aztec/aztec.js": "0.87.5",
|
|
68
|
+
"@aztec/cli": "0.87.5",
|
|
69
|
+
"@aztec/entrypoints": "0.87.5",
|
|
70
|
+
"@aztec/ethereum": "0.87.5",
|
|
71
|
+
"@aztec/foundation": "0.87.5",
|
|
72
|
+
"@aztec/kv-store": "0.87.5",
|
|
73
|
+
"@aztec/noir-contracts.js": "0.87.5",
|
|
74
|
+
"@aztec/noir-noirc_abi": "0.87.5",
|
|
75
|
+
"@aztec/pxe": "0.87.5",
|
|
76
|
+
"@aztec/stdlib": "0.87.5",
|
|
77
77
|
"commander": "^12.1.0",
|
|
78
78
|
"inquirer": "^10.1.8",
|
|
79
79
|
"source-map-support": "^0.5.21",
|
|
@@ -2,8 +2,6 @@ import { type AccountWalletWithSecretKey, type AztecAddress, Contract } from '@a
|
|
|
2
2
|
import { prepTx } from '@aztec/cli/utils';
|
|
3
3
|
import type { LogFn } from '@aztec/foundation/log';
|
|
4
4
|
|
|
5
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
6
|
-
|
|
7
5
|
export async function authorizeAction(
|
|
8
6
|
wallet: AccountWalletWithSecretKey,
|
|
9
7
|
functionName: string,
|
|
@@ -30,7 +28,7 @@ export async function authorizeAction(
|
|
|
30
28
|
const action = contract.methods[functionName](...functionArgs);
|
|
31
29
|
|
|
32
30
|
const setAuthwitnessInteraction = await wallet.setPublicAuthWit({ caller, action }, true);
|
|
33
|
-
const witness = await setAuthwitnessInteraction.send().wait(
|
|
31
|
+
const witness = await setAuthwitnessInteraction.send().wait();
|
|
34
32
|
|
|
35
33
|
log(`Authorized action ${functionName} on contract ${contractAddress} for caller ${caller}`);
|
|
36
34
|
|
package/src/cmds/cancel_tx.ts
CHANGED
|
@@ -5,8 +5,6 @@ import { Fr } from '@aztec/foundation/fields';
|
|
|
5
5
|
import type { LogFn } from '@aztec/foundation/log';
|
|
6
6
|
import { GasFees, GasSettings } from '@aztec/stdlib/gas';
|
|
7
7
|
|
|
8
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
9
|
-
|
|
10
8
|
export async function cancelTx(
|
|
11
9
|
wallet: AccountWalletWithSecretKey,
|
|
12
10
|
{
|
|
@@ -48,7 +46,7 @@ export async function cancelTx(
|
|
|
48
46
|
const txProvingResult = await wallet.proveTx(txRequest, txSimulationResult.privateExecutionResult);
|
|
49
47
|
const sentTx = new SentTx(wallet, wallet.sendTx(txProvingResult.toTx()));
|
|
50
48
|
try {
|
|
51
|
-
await sentTx.wait(
|
|
49
|
+
await sentTx.wait();
|
|
52
50
|
|
|
53
51
|
log('Transaction has been cancelled');
|
|
54
52
|
|
|
@@ -6,7 +6,6 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
|
6
6
|
import { type AccountType, createOrRetrieveAccount } from '../utils/accounts.js';
|
|
7
7
|
import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
|
|
8
8
|
import { printProfileResult } from '../utils/profiling.js';
|
|
9
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
10
9
|
|
|
11
10
|
export async function createAccount(
|
|
12
11
|
client: PXE,
|
|
@@ -119,7 +118,7 @@ export async function createAccount(
|
|
|
119
118
|
if (!json) {
|
|
120
119
|
log(`\nWaiting for account contract deployment...`);
|
|
121
120
|
}
|
|
122
|
-
txReceipt = await tx.wait(
|
|
121
|
+
txReceipt = await tx.wait();
|
|
123
122
|
out.txReceipt = {
|
|
124
123
|
status: txReceipt.status,
|
|
125
124
|
transactionFee: txReceipt.transactionFee,
|
package/src/cmds/deploy.ts
CHANGED
|
@@ -6,7 +6,6 @@ import { PublicKeys } from '@aztec/stdlib/keys';
|
|
|
6
6
|
|
|
7
7
|
import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
|
|
8
8
|
import { printProfileResult } from '../utils/profiling.js';
|
|
9
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
10
9
|
|
|
11
10
|
export async function deploy(
|
|
12
11
|
wallet: AccountWalletWithSecretKey,
|
|
@@ -72,7 +71,7 @@ export async function deploy(
|
|
|
72
71
|
const txHash = await tx.getTxHash();
|
|
73
72
|
debugLogger.debug(`Deploy tx sent with hash ${txHash}`);
|
|
74
73
|
if (wait) {
|
|
75
|
-
const deployed = await tx.wait(
|
|
74
|
+
const deployed = await tx.wait();
|
|
76
75
|
const { address, partialAddress, instance } = deployed.contract;
|
|
77
76
|
if (json) {
|
|
78
77
|
logJson({
|
|
@@ -4,7 +4,6 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
|
4
4
|
|
|
5
5
|
import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
|
|
6
6
|
import { printProfileResult } from '../utils/profiling.js';
|
|
7
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
8
7
|
|
|
9
8
|
export async function deployAccount(
|
|
10
9
|
account: AccountManager,
|
|
@@ -96,7 +95,7 @@ export async function deployAccount(
|
|
|
96
95
|
if (!json) {
|
|
97
96
|
log(`\nWaiting for account contract deployment...`);
|
|
98
97
|
}
|
|
99
|
-
txReceipt = await tx.wait(
|
|
98
|
+
txReceipt = await tx.wait();
|
|
100
99
|
out.txReceipt = {
|
|
101
100
|
status: txReceipt.status,
|
|
102
101
|
transactionFee: txReceipt.transactionFee,
|
package/src/cmds/send.ts
CHANGED
|
@@ -12,7 +12,6 @@ import { GasSettings } from '@aztec/stdlib/gas';
|
|
|
12
12
|
|
|
13
13
|
import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
|
|
14
14
|
import { printProfileResult } from '../utils/profiling.js';
|
|
15
|
-
import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
|
|
16
15
|
|
|
17
16
|
export async function send(
|
|
18
17
|
wallet: AccountWalletWithSecretKey,
|
|
@@ -58,7 +57,7 @@ export async function send(
|
|
|
58
57
|
log(`\nTransaction hash: ${txHash.toString()}`);
|
|
59
58
|
if (wait) {
|
|
60
59
|
try {
|
|
61
|
-
await tx.wait(
|
|
60
|
+
await tx.wait();
|
|
62
61
|
|
|
63
62
|
log('Transaction has been mined');
|
|
64
63
|
|
package/src/utils/profiling.ts
CHANGED
|
@@ -4,12 +4,6 @@ import type { ProvingTimings, SimulationTimings } from '@aztec/stdlib/tx';
|
|
|
4
4
|
|
|
5
5
|
import { format } from 'util';
|
|
6
6
|
|
|
7
|
-
const FN_NAME_PADDING = 50;
|
|
8
|
-
const COLUMN_MIN_WIDTH = 13;
|
|
9
|
-
const COLUMN_MAX_WIDTH = 15;
|
|
10
|
-
|
|
11
|
-
const ORACLE_NAME_PADDING = 50;
|
|
12
|
-
|
|
13
7
|
export function printProfileResult(
|
|
14
8
|
timings: ProvingTimings | SimulationTimings,
|
|
15
9
|
log: LogFn,
|
|
@@ -19,23 +13,13 @@ export function printProfileResult(
|
|
|
19
13
|
log(
|
|
20
14
|
format(
|
|
21
15
|
' ',
|
|
22
|
-
'Function name'.padEnd(
|
|
23
|
-
'Time'.padStart(
|
|
24
|
-
executionSteps ? 'Gates'.padStart(
|
|
25
|
-
executionSteps ? 'Subtotal'.padStart(
|
|
26
|
-
),
|
|
27
|
-
);
|
|
28
|
-
log(
|
|
29
|
-
format(
|
|
30
|
-
''.padEnd(
|
|
31
|
-
FN_NAME_PADDING +
|
|
32
|
-
COLUMN_MAX_WIDTH +
|
|
33
|
-
COLUMN_MAX_WIDTH +
|
|
34
|
-
(executionSteps ? COLUMN_MAX_WIDTH + COLUMN_MAX_WIDTH : 0),
|
|
35
|
-
'-',
|
|
36
|
-
),
|
|
16
|
+
'Function name'.padEnd(50),
|
|
17
|
+
'Time'.padStart(13).padEnd(15),
|
|
18
|
+
executionSteps ? 'Gates'.padStart(13).padEnd(15) : '',
|
|
19
|
+
executionSteps ? 'Subtotal'.padStart(13).padEnd(15) : '',
|
|
37
20
|
),
|
|
38
21
|
);
|
|
22
|
+
log(format(''.padEnd(50 + 15 + 15 + (executionSteps ? 15 + 15 : 0), '-')));
|
|
39
23
|
let acc = 0;
|
|
40
24
|
let biggest: PrivateExecutionStep | undefined = executionSteps?.[0];
|
|
41
25
|
|
|
@@ -48,37 +32,13 @@ export function printProfileResult(
|
|
|
48
32
|
|
|
49
33
|
log(
|
|
50
34
|
format(
|
|
51
|
-
'
|
|
52
|
-
fn.functionName.padEnd(
|
|
53
|
-
`${fn.time.toFixed(2)}ms`.padStart(
|
|
54
|
-
currentExecutionStep
|
|
55
|
-
|
|
56
|
-
: '',
|
|
57
|
-
currentExecutionStep ? acc.toLocaleString().padStart(COLUMN_MAX_WIDTH) : '',
|
|
35
|
+
' ',
|
|
36
|
+
fn.functionName.padEnd(50),
|
|
37
|
+
`${fn.time.toFixed(2)}ms`.padStart(13).padEnd(15),
|
|
38
|
+
currentExecutionStep ? currentExecutionStep.gateCount!.toLocaleString().padStart(13).padEnd(15) : '',
|
|
39
|
+
currentExecutionStep ? acc.toLocaleString().padStart(15) : '',
|
|
58
40
|
),
|
|
59
41
|
);
|
|
60
|
-
if (fn.oracles) {
|
|
61
|
-
log('');
|
|
62
|
-
for (const [oracleName, { times }] of Object.entries(fn.oracles)) {
|
|
63
|
-
const calls = times.length;
|
|
64
|
-
const min = Math.min(...times);
|
|
65
|
-
const max = Math.max(...times);
|
|
66
|
-
const total = times.reduce((acc, time) => acc + time, 0);
|
|
67
|
-
const avg = total / calls;
|
|
68
|
-
log(
|
|
69
|
-
format(
|
|
70
|
-
' ',
|
|
71
|
-
oracleName.padEnd(ORACLE_NAME_PADDING),
|
|
72
|
-
`${calls} calls`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
|
|
73
|
-
`${total.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
|
|
74
|
-
`min: ${min.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
|
|
75
|
-
`avg: ${avg.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
|
|
76
|
-
`max: ${max.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
|
|
77
|
-
),
|
|
78
|
-
);
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
log('');
|
|
82
42
|
});
|
|
83
43
|
|
|
84
44
|
if (biggest) {
|
|
@@ -95,39 +55,31 @@ export function printProfileResult(
|
|
|
95
55
|
log(
|
|
96
56
|
format(
|
|
97
57
|
'Private simulation time:'.padEnd(25),
|
|
98
|
-
`${timings.perFunction.reduce((acc, { time }) => acc + time, 0).toFixed(2)}ms`.padStart(
|
|
58
|
+
`${timings.perFunction.reduce((acc, { time }) => acc + time, 0).toFixed(2)}ms`.padStart(15),
|
|
99
59
|
),
|
|
100
60
|
);
|
|
101
61
|
if ((timings as ProvingTimings).proving) {
|
|
102
|
-
log(
|
|
103
|
-
format(
|
|
104
|
-
'Proving time:'.padEnd(25),
|
|
105
|
-
`${(timings as ProvingTimings).proving?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH),
|
|
106
|
-
),
|
|
107
|
-
);
|
|
62
|
+
log(format('Proving time:'.padEnd(25), `${(timings as ProvingTimings).proving?.toFixed(2)}ms`.padStart(15)));
|
|
108
63
|
}
|
|
109
64
|
if ((timings as SimulationTimings).publicSimulation) {
|
|
110
65
|
log(
|
|
111
66
|
format(
|
|
112
67
|
'Public simulation time:'.padEnd(25),
|
|
113
|
-
`${(timings as SimulationTimings).publicSimulation?.toFixed(2)}ms`.padStart(
|
|
68
|
+
`${(timings as SimulationTimings).publicSimulation?.toFixed(2)}ms`.padStart(15),
|
|
114
69
|
),
|
|
115
70
|
);
|
|
116
71
|
}
|
|
117
72
|
|
|
118
73
|
if ((timings as SimulationTimings).validation) {
|
|
119
74
|
log(
|
|
120
|
-
format(
|
|
121
|
-
'Validation time:'.padEnd(25),
|
|
122
|
-
`${(timings as SimulationTimings).validation?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH),
|
|
123
|
-
),
|
|
75
|
+
format('Validation time:'.padEnd(25), `${(timings as SimulationTimings).validation?.toFixed(2)}ms`.padStart(15)),
|
|
124
76
|
);
|
|
125
77
|
}
|
|
126
78
|
|
|
127
79
|
log(
|
|
128
80
|
format(
|
|
129
81
|
'Total time:'.padEnd(25),
|
|
130
|
-
`${timings.total.toFixed(2)}ms`.padStart(
|
|
82
|
+
`${timings.total.toFixed(2)}ms`.padStart(15),
|
|
131
83
|
`(${timings.unaccounted.toFixed(2)}ms unaccounted)`,
|
|
132
84
|
),
|
|
133
85
|
);
|
package/src/utils/pxe_wrapper.ts
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { type PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
|
|
2
2
|
import { type AztecNode, type PXE, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
|
|
3
3
|
|
|
4
|
-
export const DEFAULT_TX_TIMEOUT_S = 180;
|
|
5
|
-
|
|
6
4
|
/*
|
|
7
5
|
* Wrapper class for PXE service, avoids initialization issues due to
|
|
8
6
|
* closures when providing PXE service to injected commander.js commands
|