@aztec/cli-wallet 0.0.1-commit.3469e52 → 0.0.1-commit.35158ae7e
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 +2 -2
- package/dest/cmds/authorize_action.d.ts.map +1 -1
- package/dest/cmds/authorize_action.js +4 -2
- package/dest/cmds/check_tx.d.ts +1 -1
- package/dest/cmds/check_tx.d.ts.map +1 -1
- package/dest/cmds/check_tx.js +40 -10
- package/dest/cmds/create_account.d.ts +4 -3
- package/dest/cmds/create_account.d.ts.map +1 -1
- package/dest/cmds/create_account.js +42 -25
- package/dest/cmds/deploy.d.ts +4 -3
- package/dest/cmds/deploy.d.ts.map +1 -1
- package/dest/cmds/deploy.js +56 -29
- package/dest/cmds/deploy_account.d.ts +4 -3
- package/dest/cmds/deploy_account.d.ts.map +1 -1
- package/dest/cmds/deploy_account.js +37 -20
- package/dest/cmds/get_fee_juice_balance.d.ts +5 -0
- package/dest/cmds/get_fee_juice_balance.d.ts.map +1 -0
- package/dest/cmds/get_fee_juice_balance.js +27 -0
- package/dest/cmds/index.d.ts +1 -1
- package/dest/cmds/index.d.ts.map +1 -1
- package/dest/cmds/index.js +30 -14
- package/dest/cmds/send.d.ts +4 -3
- package/dest/cmds/send.d.ts.map +1 -1
- package/dest/cmds/send.js +32 -16
- package/dest/storage/wallet_db.d.ts +1 -1
- package/dest/storage/wallet_db.d.ts.map +1 -1
- package/dest/storage/wallet_db.js +46 -31
- package/dest/utils/options/fees.d.ts +1 -1
- package/dest/utils/options/fees.d.ts.map +1 -1
- package/dest/utils/options/fees.js +2 -0
- package/dest/utils/wallet.d.ts +8 -3
- package/dest/utils/wallet.d.ts.map +1 -1
- package/dest/utils/wallet.js +45 -40
- package/package.json +14 -14
- package/src/cmds/authorize_action.ts +1 -1
- package/src/cmds/check_tx.ts +45 -11
- package/src/cmds/create_account.ts +44 -24
- package/src/cmds/deploy.ts +55 -27
- package/src/cmds/deploy_account.ts +38 -19
- package/src/cmds/get_fee_juice_balance.ts +37 -0
- package/src/cmds/index.ts +57 -4
- package/src/cmds/send.ts +32 -12
- package/src/cmds/simulate.ts +1 -1
- package/src/storage/wallet_db.ts +49 -36
- package/src/utils/options/fees.ts +6 -0
- package/src/utils/wallet.ts +53 -56
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
import { NO_FROM } from '@aztec/aztec.js/account';
|
|
1
2
|
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
-
import
|
|
3
|
+
import { NO_WAIT } from '@aztec/aztec.js/contracts';
|
|
4
|
+
import { type AztecNode, waitForTx } from '@aztec/aztec.js/node';
|
|
3
5
|
import type { DeployAccountOptions } from '@aztec/aztec.js/wallet';
|
|
4
6
|
import { prettyPrintJSON } from '@aztec/cli/cli-utils';
|
|
5
7
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
8
|
+
import type { TxHash, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
|
|
6
9
|
|
|
7
10
|
import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
|
|
8
11
|
import type { CLIFeeArgs } from '../utils/options/fees.js';
|
|
@@ -19,6 +22,7 @@ export async function deployAccount(
|
|
|
19
22
|
publicDeploy: boolean,
|
|
20
23
|
skipInitialization: boolean,
|
|
21
24
|
feeOpts: CLIFeeArgs,
|
|
25
|
+
waitForStatus: TxStatus,
|
|
22
26
|
json: boolean,
|
|
23
27
|
verbose: boolean,
|
|
24
28
|
debugLogger: Logger,
|
|
@@ -45,12 +49,12 @@ export async function deployAccount(
|
|
|
45
49
|
log(`Init hash: ${initializationHash.toString()}`);
|
|
46
50
|
}
|
|
47
51
|
|
|
48
|
-
let
|
|
49
|
-
let txReceipt;
|
|
52
|
+
let txHash: TxHash | undefined;
|
|
53
|
+
let txReceipt: TxReceipt | undefined;
|
|
50
54
|
const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
|
|
51
55
|
|
|
52
56
|
const delegatedDeployment = deployer && !account.address.equals(deployer);
|
|
53
|
-
const from = delegatedDeployment ? deployer :
|
|
57
|
+
const from = delegatedDeployment ? deployer : NO_FROM;
|
|
54
58
|
|
|
55
59
|
const deployAccountOpts: DeployAccountOptions = {
|
|
56
60
|
skipClassPublication: !registerClass,
|
|
@@ -60,11 +64,15 @@ export async function deployAccount(
|
|
|
60
64
|
fee: { paymentMethod, gasSettings },
|
|
61
65
|
};
|
|
62
66
|
|
|
67
|
+
const localStart = performance.now();
|
|
63
68
|
const deployMethod = await account.getDeployMethod();
|
|
64
|
-
const
|
|
69
|
+
const sim = await deployMethod.simulate({
|
|
65
70
|
...deployAccountOpts,
|
|
66
71
|
fee: { ...deployAccountOpts.fee, estimateGas: true },
|
|
67
72
|
});
|
|
73
|
+
// estimateGas: true guarantees these fields are present
|
|
74
|
+
const estimatedGas = sim.estimatedGas!;
|
|
75
|
+
const stats = sim.stats!;
|
|
68
76
|
|
|
69
77
|
if (feeOpts.estimateOnly) {
|
|
70
78
|
if (json) {
|
|
@@ -80,7 +88,14 @@ export async function deployAccount(
|
|
|
80
88
|
};
|
|
81
89
|
}
|
|
82
90
|
} else {
|
|
83
|
-
|
|
91
|
+
if (verbose) {
|
|
92
|
+
printProfileResult(stats, log);
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
if (!json) {
|
|
96
|
+
log(`\nWaiting for account contract deployment...`);
|
|
97
|
+
}
|
|
98
|
+
const sendOpts = {
|
|
84
99
|
...deployAccountOpts,
|
|
85
100
|
fee: deployAccountOpts.fee
|
|
86
101
|
? {
|
|
@@ -88,31 +103,35 @@ export async function deployAccount(
|
|
|
88
103
|
gasSettings: estimatedGas,
|
|
89
104
|
}
|
|
90
105
|
: undefined,
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
106
|
+
};
|
|
107
|
+
|
|
108
|
+
({ txHash } = await deployMethod.send({ ...sendOpts, wait: NO_WAIT }));
|
|
109
|
+
const localTimeMs = performance.now() - localStart;
|
|
95
110
|
|
|
96
|
-
const txHash = await tx.getTxHash();
|
|
97
|
-
debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
|
|
98
|
-
out.txHash = txHash;
|
|
99
111
|
if (wait) {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
112
|
+
const nodeStart = performance.now();
|
|
113
|
+
txReceipt = await waitForTx(aztecNode, txHash, { timeout: DEFAULT_TX_TIMEOUT_S, waitForStatus });
|
|
114
|
+
const nodeTimeMs = performance.now() - nodeStart;
|
|
115
|
+
|
|
104
116
|
out.txReceipt = {
|
|
105
117
|
status: txReceipt.status,
|
|
106
118
|
transactionFee: txReceipt.transactionFee,
|
|
107
119
|
};
|
|
120
|
+
|
|
121
|
+
if (!json) {
|
|
122
|
+
log(` Local processing time: ${(localTimeMs / 1000).toFixed(1)}s`);
|
|
123
|
+
log(` Node inclusion time: ${(nodeTimeMs / 1000).toFixed(1)}s`);
|
|
124
|
+
}
|
|
108
125
|
}
|
|
126
|
+
debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
|
|
127
|
+
out.txHash = txHash;
|
|
109
128
|
}
|
|
110
129
|
|
|
111
130
|
if (json) {
|
|
112
131
|
log(prettyPrintJSON(out));
|
|
113
132
|
} else {
|
|
114
|
-
if (
|
|
115
|
-
log(`Deploy tx hash: ${
|
|
133
|
+
if (txHash) {
|
|
134
|
+
log(`Deploy tx hash: ${txHash.toString()}`);
|
|
116
135
|
}
|
|
117
136
|
if (txReceipt) {
|
|
118
137
|
log(`Deploy tx fee: ${txReceipt.transactionFee}`);
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
3
|
+
import { getFeeJuiceBalance } from '@aztec/aztec.js/utils';
|
|
4
|
+
import { prettyPrintJSON } from '@aztec/cli/cli-utils';
|
|
5
|
+
import type { LogFn } from '@aztec/foundation/log';
|
|
6
|
+
|
|
7
|
+
const FEE_JUICE_DECIMALS = 18;
|
|
8
|
+
const FEE_JUICE_UNIT = 10n ** BigInt(FEE_JUICE_DECIMALS);
|
|
9
|
+
|
|
10
|
+
/** Formats a raw FeeJuice balance (18 decimals) for human-readable display. */
|
|
11
|
+
function formatFeeJuice(raw: bigint, exact: boolean): string {
|
|
12
|
+
const whole = raw / FEE_JUICE_UNIT;
|
|
13
|
+
const fractional = raw % FEE_JUICE_UNIT;
|
|
14
|
+
const fracStr = fractional.toString().padStart(FEE_JUICE_DECIMALS, '0');
|
|
15
|
+
if (exact) {
|
|
16
|
+
return `${whole}.${fracStr} FJ`;
|
|
17
|
+
}
|
|
18
|
+
if (fractional === 0n) {
|
|
19
|
+
return `${whole} FJ`;
|
|
20
|
+
}
|
|
21
|
+
return `${whole}.${fracStr.replace(/0+$/, '')} FJ`;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export async function getFeeJuiceBalanceCmd(
|
|
25
|
+
node: AztecNode,
|
|
26
|
+
address: AztecAddress,
|
|
27
|
+
json: boolean,
|
|
28
|
+
exact: boolean,
|
|
29
|
+
log: LogFn,
|
|
30
|
+
) {
|
|
31
|
+
const balance = await getFeeJuiceBalance(address, node);
|
|
32
|
+
if (json) {
|
|
33
|
+
log(prettyPrintJSON({ address: address.toString(), balance: balance.toString() }));
|
|
34
|
+
} else {
|
|
35
|
+
log(`Fee Juice balance for ${address.toString()}: ${formatFeeJuice(balance, exact)}`);
|
|
36
|
+
}
|
|
37
|
+
}
|
package/src/cmds/index.ts
CHANGED
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
} from '@aztec/cli/utils';
|
|
13
13
|
import { randomBytes } from '@aztec/foundation/crypto/random';
|
|
14
14
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
15
|
+
import { TxStatus } from '@aztec/stdlib/tx';
|
|
15
16
|
|
|
16
17
|
import { type Command, Option } from 'commander';
|
|
17
18
|
import inquirer from 'inquirer';
|
|
@@ -40,6 +41,17 @@ import {
|
|
|
40
41
|
integerArgParser,
|
|
41
42
|
} from '../utils/options/index.js';
|
|
42
43
|
|
|
44
|
+
function parseWaitForStatus(status: string): TxStatus {
|
|
45
|
+
switch (status) {
|
|
46
|
+
case 'proposed':
|
|
47
|
+
return TxStatus.PROPOSED;
|
|
48
|
+
case 'checkpointed':
|
|
49
|
+
return TxStatus.CHECKPOINTED;
|
|
50
|
+
default:
|
|
51
|
+
throw new Error(`Invalid wait-for-status: ${status}. Use 'proposed' or 'checkpointed'.`);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
43
55
|
// TODO: This function is only used in 1 place so we could just inline this
|
|
44
56
|
export function injectCommands(
|
|
45
57
|
program: Command,
|
|
@@ -63,7 +75,7 @@ export function injectCommands(
|
|
|
63
75
|
const createAccountCommand = program
|
|
64
76
|
.command('create-account')
|
|
65
77
|
.description(
|
|
66
|
-
'Creates an aztec account that can be used for sending transactions. Registers the account on the PXE and deploys an account contract. Uses a Schnorr
|
|
78
|
+
'Creates an aztec account that can be used for sending transactions. Registers the account on the PXE and deploys an account contract. Uses a Schnorr account which uses an immutable key for authentication.',
|
|
67
79
|
)
|
|
68
80
|
.summary('Creates an aztec account that can be used for sending transactions.')
|
|
69
81
|
.addOption(createAccountOption('Alias or address of the account performing the deployment', !db, db))
|
|
@@ -90,6 +102,11 @@ export function injectCommands(
|
|
|
90
102
|
)
|
|
91
103
|
.addOption(createAliasOption('Alias for the account. Used for easy reference in subsequent commands.', !db))
|
|
92
104
|
.addOption(createTypeOption(true))
|
|
105
|
+
.option(
|
|
106
|
+
'-s, --salt <hex string>',
|
|
107
|
+
'Optional deployment salt as a hex string for generating the deployment address. Defaults to 0.',
|
|
108
|
+
parseFieldFromHexString,
|
|
109
|
+
)
|
|
93
110
|
.option(
|
|
94
111
|
'--register-only',
|
|
95
112
|
'Just register the account on the Wallet. Do not deploy or initialize the account contract.',
|
|
@@ -98,6 +115,7 @@ export function injectCommands(
|
|
|
98
115
|
// `options.wait` is default true. Passing `--no-wait` will set it to false.
|
|
99
116
|
// https://github.com/tj/commander.js#other-option-types-negatable-boolean-and-booleanvalue
|
|
100
117
|
.option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction')
|
|
118
|
+
.option('--wait-for-status <status>', "Tx status to wait for: 'proposed' or 'checkpointed'", 'proposed')
|
|
101
119
|
.addOption(createVerboseOption());
|
|
102
120
|
|
|
103
121
|
addOptions(createAccountCommand, CLIFeeArgs.getOptions()).action(async (_options, command) => {
|
|
@@ -107,7 +125,9 @@ export function injectCommands(
|
|
|
107
125
|
type,
|
|
108
126
|
from: parsedFromAddress,
|
|
109
127
|
secretKey,
|
|
128
|
+
salt,
|
|
110
129
|
wait,
|
|
130
|
+
waitForStatus: waitForStatusStr,
|
|
111
131
|
registerOnly,
|
|
112
132
|
skipInitialization,
|
|
113
133
|
publicDeploy,
|
|
@@ -137,6 +157,7 @@ export function injectCommands(
|
|
|
137
157
|
node,
|
|
138
158
|
type,
|
|
139
159
|
secretKey,
|
|
160
|
+
salt,
|
|
140
161
|
publicKey,
|
|
141
162
|
alias,
|
|
142
163
|
parsedFromAddress,
|
|
@@ -146,6 +167,7 @@ export function injectCommands(
|
|
|
146
167
|
registerClass,
|
|
147
168
|
wait,
|
|
148
169
|
CLIFeeArgs.parse(options, log, db),
|
|
170
|
+
parseWaitForStatus(waitForStatusStr),
|
|
149
171
|
json,
|
|
150
172
|
verbose,
|
|
151
173
|
debugLogger,
|
|
@@ -180,12 +202,22 @@ export function injectCommands(
|
|
|
180
202
|
'--skip-initialization',
|
|
181
203
|
'Skip initializing the account contract. Useful for publicly deploying an existing account.',
|
|
182
204
|
)
|
|
205
|
+
.option('--wait-for-status <status>', "Tx status to wait for: 'proposed' or 'checkpointed'", 'proposed')
|
|
183
206
|
.addOption(createVerboseOption());
|
|
184
207
|
|
|
185
208
|
addOptions(deployAccountCommand, CLIFeeArgs.getOptions()).action(async (parsedAccount, _options, command) => {
|
|
186
209
|
const { deployAccount } = await import('./deploy_account.js');
|
|
187
210
|
const options = command.optsWithGlobals();
|
|
188
|
-
const {
|
|
211
|
+
const {
|
|
212
|
+
wait,
|
|
213
|
+
waitForStatus: waitForStatusStr,
|
|
214
|
+
from: parsedFromAddress,
|
|
215
|
+
json,
|
|
216
|
+
registerClass,
|
|
217
|
+
skipInitialization,
|
|
218
|
+
publicDeploy,
|
|
219
|
+
verbose,
|
|
220
|
+
} = options;
|
|
189
221
|
|
|
190
222
|
const { wallet, node } = walletAndNodeWrapper;
|
|
191
223
|
|
|
@@ -199,6 +231,7 @@ export function injectCommands(
|
|
|
199
231
|
publicDeploy,
|
|
200
232
|
skipInitialization,
|
|
201
233
|
CLIFeeArgs.parse(options, log, db),
|
|
234
|
+
parseWaitForStatus(waitForStatusStr),
|
|
202
235
|
json,
|
|
203
236
|
verbose,
|
|
204
237
|
debugLogger,
|
|
@@ -219,7 +252,7 @@ export function injectCommands(
|
|
|
219
252
|
)
|
|
220
253
|
.option(
|
|
221
254
|
'-s, --salt <hex string>',
|
|
222
|
-
'Optional deployment salt as a hex string for generating the deployment address.',
|
|
255
|
+
'Optional deployment salt as a hex string for generating the deployment address. Defaults to random.',
|
|
223
256
|
parseFieldFromHexString,
|
|
224
257
|
)
|
|
225
258
|
.option('--universal', 'Do not mix the sender address into the deployment.')
|
|
@@ -238,6 +271,7 @@ export function injectCommands(
|
|
|
238
271
|
'The amount of time in seconds to wait for the deployment to post to L2',
|
|
239
272
|
).conflicts('wait'),
|
|
240
273
|
)
|
|
274
|
+
.option('--wait-for-status <status>', "Tx status to wait for: 'proposed' or 'checkpointed'", 'proposed')
|
|
241
275
|
.addOption(createVerboseOption());
|
|
242
276
|
|
|
243
277
|
addOptions(deployCommand, CLIFeeArgs.getOptions()).action(async (artifactPathPromise, _options, command) => {
|
|
@@ -249,6 +283,7 @@ export function injectCommands(
|
|
|
249
283
|
args,
|
|
250
284
|
salt,
|
|
251
285
|
wait,
|
|
286
|
+
waitForStatus: waitForStatusStr,
|
|
252
287
|
classRegistration,
|
|
253
288
|
init,
|
|
254
289
|
publicDeployment,
|
|
@@ -279,8 +314,9 @@ export function injectCommands(
|
|
|
279
314
|
typeof init === 'string' ? false : init,
|
|
280
315
|
wait,
|
|
281
316
|
CLIFeeArgs.parse(options, log, db),
|
|
282
|
-
|
|
317
|
+
parseWaitForStatus(waitForStatusStr),
|
|
283
318
|
verbose,
|
|
319
|
+
timeout,
|
|
284
320
|
debugLogger,
|
|
285
321
|
log,
|
|
286
322
|
);
|
|
@@ -308,6 +344,7 @@ export function injectCommands(
|
|
|
308
344
|
)
|
|
309
345
|
.addOption(createAccountOption('Alias or address of the account to send the transaction from', !db, db))
|
|
310
346
|
.option('--no-wait', 'Print transaction hash without waiting for it to be mined')
|
|
347
|
+
.option('--wait-for-status <status>', "Tx status to wait for: 'proposed' or 'checkpointed'", 'proposed')
|
|
311
348
|
.addOption(createVerboseOption());
|
|
312
349
|
|
|
313
350
|
addOptions(sendCommand, CLIFeeArgs.getOptions()).action(async (functionName, _options, command) => {
|
|
@@ -319,6 +356,7 @@ export function injectCommands(
|
|
|
319
356
|
contractAddress,
|
|
320
357
|
from: parsedFromAddress,
|
|
321
358
|
wait,
|
|
359
|
+
waitForStatus: waitForStatusStr,
|
|
322
360
|
alias,
|
|
323
361
|
authWitness: authWitnessArray,
|
|
324
362
|
verbose,
|
|
@@ -342,6 +380,7 @@ export function injectCommands(
|
|
|
342
380
|
alias,
|
|
343
381
|
CLIFeeArgs.parse(options, log, db),
|
|
344
382
|
authWitnesses,
|
|
383
|
+
parseWaitForStatus(waitForStatusStr),
|
|
345
384
|
verbose,
|
|
346
385
|
log,
|
|
347
386
|
);
|
|
@@ -492,6 +531,20 @@ export function injectCommands(
|
|
|
492
531
|
}
|
|
493
532
|
});
|
|
494
533
|
|
|
534
|
+
program
|
|
535
|
+
.command('get-fee-juice-balance')
|
|
536
|
+
.description('Checks the Fee Juice balance for a given address.')
|
|
537
|
+
.argument('<address>', 'Aztec address or alias to check balance for', address =>
|
|
538
|
+
aliasedAddressParser('accounts', address, db),
|
|
539
|
+
)
|
|
540
|
+
.option('--json', 'Emit output as json')
|
|
541
|
+
.option('--exact', 'Show exact balance with all 18 decimal places')
|
|
542
|
+
.action(async (address, options) => {
|
|
543
|
+
const { getFeeJuiceBalanceCmd } = await import('./get_fee_juice_balance.js');
|
|
544
|
+
const { json, exact } = options;
|
|
545
|
+
await getFeeJuiceBalanceCmd(walletAndNodeWrapper.node, address, json, exact, log);
|
|
546
|
+
});
|
|
547
|
+
|
|
495
548
|
program
|
|
496
549
|
.command('create-authwit')
|
|
497
550
|
.description(
|
package/src/cmds/send.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
2
|
import { AuthWitness } from '@aztec/aztec.js/authorization';
|
|
3
|
-
import { Contract, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
|
|
4
|
-
import type
|
|
3
|
+
import { Contract, NO_WAIT, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
|
|
4
|
+
import { type AztecNode, waitForTx } from '@aztec/aztec.js/node';
|
|
5
5
|
import { prepTx } from '@aztec/cli/utils';
|
|
6
6
|
import type { LogFn } from '@aztec/foundation/log';
|
|
7
|
+
import { TxStatus } from '@aztec/stdlib/tx';
|
|
7
8
|
|
|
8
9
|
import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
|
|
9
10
|
import { CLIFeeArgs } from '../utils/options/fees.js';
|
|
@@ -22,6 +23,7 @@ export async function send(
|
|
|
22
23
|
cancellable: boolean,
|
|
23
24
|
feeOpts: CLIFeeArgs,
|
|
24
25
|
authWitnesses: AuthWitness[],
|
|
26
|
+
waitForStatus: TxStatus,
|
|
25
27
|
verbose: boolean,
|
|
26
28
|
log: LogFn,
|
|
27
29
|
) {
|
|
@@ -37,40 +39,58 @@ export async function send(
|
|
|
37
39
|
authWitnesses,
|
|
38
40
|
};
|
|
39
41
|
|
|
40
|
-
const
|
|
42
|
+
const localStart = performance.now();
|
|
43
|
+
const sim = await call.simulate({
|
|
41
44
|
...sendOptions,
|
|
42
45
|
fee: { ...sendOptions.fee, estimateGas: true },
|
|
43
46
|
});
|
|
47
|
+
// estimateGas: true guarantees these fields are present
|
|
48
|
+
const estimatedGas = sim.estimatedGas!;
|
|
49
|
+
const stats = sim.stats!;
|
|
44
50
|
|
|
45
51
|
if (feeOpts.estimateOnly) {
|
|
46
52
|
return;
|
|
47
53
|
}
|
|
48
54
|
|
|
49
|
-
const tx = call.send({ ...sendOptions, fee: { ...sendOptions.fee, gasSettings: estimatedGas } });
|
|
50
55
|
if (verbose) {
|
|
51
56
|
printProfileResult(stats!, log);
|
|
52
57
|
}
|
|
53
58
|
|
|
54
|
-
const txHash = await
|
|
59
|
+
const { txHash } = await call.send({
|
|
60
|
+
...sendOptions,
|
|
61
|
+
fee: { ...sendOptions.fee, gasSettings: estimatedGas },
|
|
62
|
+
wait: NO_WAIT,
|
|
63
|
+
});
|
|
64
|
+
const localTimeMs = performance.now() - localStart;
|
|
65
|
+
|
|
55
66
|
log(`\nTransaction hash: ${txHash.toString()}`);
|
|
67
|
+
|
|
56
68
|
if (wait) {
|
|
57
69
|
try {
|
|
58
|
-
|
|
70
|
+
const nodeStart = performance.now();
|
|
71
|
+
const receipt = await waitForTx(node, txHash, { timeout: DEFAULT_TX_TIMEOUT_S, waitForStatus });
|
|
72
|
+
const nodeTimeMs = performance.now() - nodeStart;
|
|
59
73
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
const receipt = await tx.getReceipt();
|
|
74
|
+
const statusLabel = waitForStatus === TxStatus.PROPOSED ? 'proposed' : 'checkpointed';
|
|
75
|
+
log(`Transaction has been ${statusLabel}`);
|
|
63
76
|
log(` Tx fee: ${receipt.transactionFee}`);
|
|
64
77
|
log(` Status: ${receipt.status}`);
|
|
65
78
|
log(` Block number: ${receipt.blockNumber}`);
|
|
66
79
|
log(` Block hash: ${receipt.blockHash?.toString()}`);
|
|
80
|
+
log(` Local processing time: ${(localTimeMs / 1000).toFixed(1)}s`);
|
|
81
|
+
log(` Node inclusion time: ${(nodeTimeMs / 1000).toFixed(1)}s`);
|
|
82
|
+
|
|
83
|
+
return {
|
|
84
|
+
txHash,
|
|
85
|
+
};
|
|
67
86
|
} catch (err: any) {
|
|
68
87
|
log(`Transaction failed\n ${err.message}`);
|
|
88
|
+
throw err;
|
|
69
89
|
}
|
|
70
90
|
} else {
|
|
71
91
|
log('Transaction pending. Check status with check-tx');
|
|
92
|
+
return {
|
|
93
|
+
txHash,
|
|
94
|
+
};
|
|
72
95
|
}
|
|
73
|
-
return {
|
|
74
|
-
txHash,
|
|
75
|
-
};
|
|
76
96
|
}
|
package/src/cmds/simulate.ts
CHANGED
|
@@ -38,7 +38,7 @@ export async function simulate(
|
|
|
38
38
|
});
|
|
39
39
|
if (verbose) {
|
|
40
40
|
await printAuthorizations(
|
|
41
|
-
simulationResult.offchainEffects
|
|
41
|
+
simulationResult.offchainEffects,
|
|
42
42
|
async (address: AztecAddress) => {
|
|
43
43
|
const metadata = await wallet.getContractMetadata(address);
|
|
44
44
|
if (!metadata.instance) {
|
package/src/storage/wallet_db.ts
CHANGED
|
@@ -12,6 +12,7 @@ export const Aliases = ['accounts', 'contracts', 'artifacts', 'secrets', 'transa
|
|
|
12
12
|
export type AliasType = (typeof Aliases)[number];
|
|
13
13
|
|
|
14
14
|
export class WalletDB {
|
|
15
|
+
#store!: AztecAsyncKVStore;
|
|
15
16
|
#accounts!: AztecAsyncMap<string, Buffer>;
|
|
16
17
|
#aliases!: AztecAsyncMap<string, Buffer>;
|
|
17
18
|
#bridgedFeeJuice!: AztecAsyncMap<string, Buffer>;
|
|
@@ -29,6 +30,7 @@ export class WalletDB {
|
|
|
29
30
|
}
|
|
30
31
|
|
|
31
32
|
async init(store: AztecAsyncKVStore) {
|
|
33
|
+
this.#store = store;
|
|
32
34
|
this.#accounts = store.openMap('accounts');
|
|
33
35
|
this.#aliases = store.openMap('aliases');
|
|
34
36
|
this.#bridgedFeeJuice = store.openMap('bridgedFeeJuice');
|
|
@@ -41,14 +43,17 @@ export class WalletDB {
|
|
|
41
43
|
}
|
|
42
44
|
|
|
43
45
|
async pushBridgedFeeJuice(recipient: AztecAddress, secret: Fr, amount: bigint, leafIndex: bigint, log: LogFn) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
46
|
+
await this.#store.transactionAsync(async () => {
|
|
47
|
+
let stackPointer =
|
|
48
|
+
(await this.#bridgedFeeJuice.getAsync(`${recipient.toString()}:stackPointer`))?.readInt8() || 0;
|
|
49
|
+
stackPointer++;
|
|
50
|
+
await this.#bridgedFeeJuice.set(
|
|
51
|
+
`${recipient.toString()}:${stackPointer}`,
|
|
52
|
+
Buffer.from(`${amount.toString()}:${secret.toString()}:${leafIndex.toString()}`),
|
|
53
|
+
);
|
|
54
|
+
await this.#bridgedFeeJuice.set(`${recipient.toString()}:stackPointer`, Buffer.from([stackPointer]));
|
|
55
|
+
log(`Pushed ${amount} fee juice for recipient ${recipient.toString()}. Stack pointer ${stackPointer}`);
|
|
56
|
+
});
|
|
52
57
|
}
|
|
53
58
|
|
|
54
59
|
async popBridgedFeeJuice(recipient: AztecAddress, log: LogFn) {
|
|
@@ -76,19 +81,24 @@ export class WalletDB {
|
|
|
76
81
|
}: { type: AccountType; secretKey: Fr; salt: Fr; alias: string | undefined; publicKey: string | undefined },
|
|
77
82
|
log: LogFn,
|
|
78
83
|
) {
|
|
79
|
-
|
|
80
|
-
await this.#aliases.set(`accounts:${alias}`, Buffer.from(address.toString()));
|
|
81
|
-
}
|
|
82
|
-
await this.#accounts.set(`${address.toString()}:type`, Buffer.from(type));
|
|
83
|
-
await this.#accounts.set(`${address.toString()}:sk`, secretKey.toBuffer());
|
|
84
|
-
await this.#accounts.set(`${address.toString()}:salt`, salt.toBuffer());
|
|
84
|
+
let publicSigningKey: Buffer | undefined;
|
|
85
85
|
if (type === 'ecdsasecp256r1ssh' && publicKey) {
|
|
86
|
-
|
|
87
|
-
await this.storeAccountMetadata(address, 'publicSigningKey', publicSigningKey);
|
|
86
|
+
publicSigningKey = extractECDSAPublicKeyFromBase64String(publicKey);
|
|
88
87
|
}
|
|
89
|
-
await this.#aliases.set('accounts:last', Buffer.from(address.toString()));
|
|
90
|
-
log(`Account stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
|
|
91
88
|
|
|
89
|
+
await this.#store.transactionAsync(async () => {
|
|
90
|
+
if (alias) {
|
|
91
|
+
await this.#aliases.set(`accounts:${alias}`, Buffer.from(address.toString()));
|
|
92
|
+
}
|
|
93
|
+
await this.#accounts.set(`${address.toString()}:type`, Buffer.from(type));
|
|
94
|
+
await this.#accounts.set(`${address.toString()}:sk`, secretKey.toBuffer());
|
|
95
|
+
await this.#accounts.set(`${address.toString()}:salt`, salt.toBuffer());
|
|
96
|
+
if (publicSigningKey) {
|
|
97
|
+
await this.#accounts.set(`${address.toString()}:publicSigningKey`, publicSigningKey);
|
|
98
|
+
}
|
|
99
|
+
await this.#aliases.set('accounts:last', Buffer.from(address.toString()));
|
|
100
|
+
});
|
|
101
|
+
log(`Account stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
|
|
92
102
|
await this.refreshAliasCache();
|
|
93
103
|
}
|
|
94
104
|
|
|
@@ -100,35 +110,38 @@ export class WalletDB {
|
|
|
100
110
|
}
|
|
101
111
|
|
|
102
112
|
async storeContract(address: AztecAddress, artifactPath: string, log: LogFn, alias?: string) {
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
113
|
+
await this.#store.transactionAsync(async () => {
|
|
114
|
+
if (alias) {
|
|
115
|
+
await this.#aliases.set(`contracts:${alias}`, Buffer.from(address.toString()));
|
|
116
|
+
await this.#aliases.set(`artifacts:${alias}`, Buffer.from(artifactPath));
|
|
117
|
+
}
|
|
118
|
+
await this.#aliases.set(`contracts:last`, Buffer.from(address.toString()));
|
|
119
|
+
await this.#aliases.set(`artifacts:last`, Buffer.from(artifactPath));
|
|
120
|
+
await this.#aliases.set(`artifacts:${address.toString()}`, Buffer.from(artifactPath));
|
|
121
|
+
});
|
|
110
122
|
log(`Contract stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
|
|
111
|
-
|
|
112
123
|
await this.refreshAliasCache();
|
|
113
124
|
}
|
|
114
125
|
|
|
115
126
|
async storeAuthwitness(authWit: AuthWitness, log: LogFn, alias?: string) {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
127
|
+
await this.#store.transactionAsync(async () => {
|
|
128
|
+
if (alias) {
|
|
129
|
+
await this.#aliases.set(`authwits:${alias}`, Buffer.from(authWit.toString()));
|
|
130
|
+
}
|
|
131
|
+
await this.#aliases.set(`authwits:last`, Buffer.from(authWit.toString()));
|
|
132
|
+
});
|
|
120
133
|
log(`Authorization witness stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
|
|
121
|
-
|
|
122
134
|
await this.refreshAliasCache();
|
|
123
135
|
}
|
|
124
136
|
|
|
125
137
|
async storeTx({ txHash }: { txHash: TxHash }, log: LogFn, alias?: string) {
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
138
|
+
await this.#store.transactionAsync(async () => {
|
|
139
|
+
if (alias) {
|
|
140
|
+
await this.#aliases.set(`transactions:${alias}`, Buffer.from(txHash.toString()));
|
|
141
|
+
}
|
|
142
|
+
await this.#aliases.set(`transactions:last`, Buffer.from(txHash.toString()));
|
|
143
|
+
});
|
|
130
144
|
log(`Transaction hash stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
|
|
131
|
-
|
|
132
145
|
await this.refreshAliasCache();
|
|
133
146
|
}
|
|
134
147
|
|
|
@@ -171,6 +171,9 @@ export function parsePaymentMethod(
|
|
|
171
171
|
case 'fpc-public': {
|
|
172
172
|
const fpc = getFpc();
|
|
173
173
|
const asset = getAsset();
|
|
174
|
+
log(
|
|
175
|
+
`WARNING: fpc-public is deprecated and will not work on mainnet alpha. Use fee_juice or fpc-sponsored instead.`,
|
|
176
|
+
);
|
|
174
177
|
log(`Using public fee payment with asset ${asset} via paymaster ${fpc}`);
|
|
175
178
|
const { PublicFeePaymentMethod } = await import('@aztec/aztec.js/fee');
|
|
176
179
|
return new PublicFeePaymentMethod(fpc, from, wallet, gasSettings);
|
|
@@ -178,6 +181,9 @@ export function parsePaymentMethod(
|
|
|
178
181
|
case 'fpc-private': {
|
|
179
182
|
const fpc = getFpc();
|
|
180
183
|
const asset = getAsset();
|
|
184
|
+
log(
|
|
185
|
+
`WARNING: fpc-private is deprecated and will not work on mainnet alpha. Use fee_juice or fpc-sponsored instead.`,
|
|
186
|
+
);
|
|
181
187
|
log(`Using private fee payment with asset ${asset} via paymaster ${fpc}`);
|
|
182
188
|
const { PrivateFeePaymentMethod } = await import('@aztec/aztec.js/fee');
|
|
183
189
|
return new PrivateFeePaymentMethod(fpc, from, wallet, gasSettings);
|