@aztec/cli-wallet 4.2.0-nightly.20260408 → 4.2.0-nightly.20260409
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/utils/options/fees.js +2 -2
- package/dest/utils/wallet.d.ts +1 -1
- package/dest/utils/wallet.d.ts.map +1 -1
- package/dest/utils/wallet.js +10 -2
- package/package.json +14 -14
- package/src/utils/options/fees.ts +2 -2
- package/src/utils/wallet.ts +10 -2
|
@@ -193,7 +193,7 @@ export class CLIFeeArgs {
|
|
|
193
193
|
}
|
|
194
194
|
async toUserFeeOptions(node, wallet, from) {
|
|
195
195
|
const maxFeesPerGas = (await node.getCurrentMinFees()).mul(1 + MIN_FEE_PADDING);
|
|
196
|
-
const gasSettings = GasSettings.
|
|
196
|
+
const gasSettings = GasSettings.fallback({
|
|
197
197
|
...this.gasSettings,
|
|
198
198
|
maxFeesPerGas
|
|
199
199
|
});
|
|
@@ -220,7 +220,7 @@ function formatGasEstimate(estimate) {
|
|
|
220
220
|
return `da=${estimate.gasLimits.daGas},l2=${estimate.gasLimits.l2Gas},teardownDA=${estimate.teardownGasLimits.daGas},teardownL2=${estimate.teardownGasLimits.l2Gas}`;
|
|
221
221
|
}
|
|
222
222
|
function getEstimatedCost(estimate, maxFeesPerGas) {
|
|
223
|
-
return GasSettings.
|
|
223
|
+
return GasSettings.fallback({
|
|
224
224
|
...estimate,
|
|
225
225
|
maxFeesPerGas
|
|
226
226
|
}).getFeeLimit().toBigInt();
|
package/dest/utils/wallet.d.ts
CHANGED
|
@@ -37,4 +37,4 @@ export declare class CLIWallet extends BaseWallet {
|
|
|
37
37
|
getNotes(filter: NotesFilter): Promise<NoteDao[]>;
|
|
38
38
|
getContractArtifact(id: Fr): Promise<import("@aztec/stdlib/abi").ContractArtifact | undefined>;
|
|
39
39
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2FsbGV0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBaUMsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RixPQUFPLEVBQ0wsS0FBSyxxQkFBcUIsRUFHM0IsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsY0FBYyxFQUFFLEtBQUssT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHNUYsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTdDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUUzRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDN0MsT0FBTyxLQUFLLEVBQTJDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3JILE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxrQkFBa0IsQ0FBQztBQUM1RSxPQUFPLEVBQUUsVUFBVSxFQUFFLEtBQUssNEJBQTRCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUU5RixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUlsRCxxQkFBYSxTQUFVLFNBQVEsVUFBVTtJQU1yQyxPQUFPLENBQUMsT0FBTztJQUNmLE9BQU8sQ0FBQyxFQUFFLENBQUM7SUFOYixPQUFPLENBQUMsWUFBWSxDQUE4QjtJQUVsRCxZQUNFLEdBQUcsRUFBRSxHQUFHLEVBQ1IsSUFBSSxFQUFFLFNBQVMsRUFDUCxPQUFPLEVBQUUsS0FBSyxFQUNkLEVBQUUsQ0FBQyxzQkFBVSxFQUl0QjtJQUVELE9BQWEsTUFBTSxDQUNqQixJQUFJLEVBQUUsU0FBUyxFQUNmLEdBQUcsRUFBRSxLQUFLLEVBQ1YsRUFBRSxDQUFDLEVBQUUsUUFBUSxFQUNiLGlCQUFpQixDQUFDLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUNyQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBSXBCO0lBRWMsV0FBVyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQyxDQVE3RDtZQUVhLG9DQUFvQztJQTRCNUMsbUJBQW1CLENBQ3ZCLElBQUksRUFBRSxZQUFZLEVBQ2xCLE9BQU8sRUFBRSxFQUFFLEVBQ1gsWUFBWSxFQUFFLHFCQUFxQixHQUNsQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBRzFCO0lBRWMscUJBQXFCLENBQUMsT0FBTyxFQUFFLFlBQVksb0JBYXpEO1lBRWEsYUFBYTtJQVdyQix1QkFBdUIsQ0FDM0IsT0FBTyxDQUFDLEVBQUUsWUFBWSxFQUN0QixTQUFTLENBQUMsRUFBRSxFQUFFLEVBQ2QsSUFBSSxHQUFFLFdBQXVCLEVBQzdCLElBQUksQ0FBQyxFQUFFLEVBQUUsRUFDVCxTQUFTLENBQUMsRUFBRSxNQUFNLEdBQ2pCLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FtRHpCO1lBUWEscUJBQXFCO0lBa0JwQixVQUFVLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQUUsSUFBSSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FhaEg7SUFFRDs7O09BR0c7SUFDSCxVQUF5QixxQkFBcUIsQ0FDNUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLElBQUksRUFBRSw0QkFBNEIsR0FDakMsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBdUM3QjtJQUlELFlBQVksSUFBSSxPQUFPLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FFdEM7SUFJRCxRQUFRLENBQUMsTUFBTSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FFaEQ7SUFJRCxtQkFBbUIsQ0FBQyxFQUFFLEVBQUUsRUFBRSxxRUFFekI7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/utils/wallet.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAiC,MAAM,yBAAyB,CAAC;AACtF,OAAO,EACL,KAAK,qBAAqB,EAG3B,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,KAAK,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG5F,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,EAA2C,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACrH,OAAO,EAAE,gBAAgB,EAA0B,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,KAAK,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AAE9F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIlD,qBAAa,SAAU,SAAQ,UAAU;IAMrC,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,EAAE,CAAC;IANb,OAAO,CAAC,YAAY,CAA8B;IAElD,YACE,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,EACP,OAAO,EAAE,KAAK,EACd,EAAE,CAAC,sBAAU,EAItB;IAED,OAAa,MAAM,CACjB,IAAI,EAAE,SAAS,EACf,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,EACb,iBAAiB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GACrC,OAAO,CAAC,SAAS,CAAC,CAIpB;IAEc,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAQ7D;YAEa,oCAAoC;
|
|
1
|
+
{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/utils/wallet.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAiC,MAAM,yBAAyB,CAAC;AACtF,OAAO,EACL,KAAK,qBAAqB,EAG3B,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,KAAK,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG5F,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,EAA2C,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACrH,OAAO,EAAE,gBAAgB,EAA0B,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,KAAK,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AAE9F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIlD,qBAAa,SAAU,SAAQ,UAAU;IAMrC,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,EAAE,CAAC;IANb,OAAO,CAAC,YAAY,CAA8B;IAElD,YACE,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,EACP,OAAO,EAAE,KAAK,EACd,EAAE,CAAC,sBAAU,EAItB;IAED,OAAa,MAAM,CACjB,IAAI,EAAE,SAAS,EACf,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,EACb,iBAAiB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GACrC,OAAO,CAAC,SAAS,CAAC,CAIpB;IAEc,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAQ7D;YAEa,oCAAoC;IA4B5C,mBAAmB,CACvB,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,EAAE,EACX,YAAY,EAAE,qBAAqB,GAClC,OAAO,CAAC,eAAe,CAAC,CAG1B;IAEc,qBAAqB,CAAC,OAAO,EAAE,YAAY,oBAazD;YAEa,aAAa;IAWrB,uBAAuB,CAC3B,OAAO,CAAC,EAAE,YAAY,EACtB,SAAS,CAAC,EAAE,EAAE,EACd,IAAI,GAAE,WAAuB,EAC7B,IAAI,CAAC,EAAE,EAAE,EACT,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,CAAC,CAmDzB;YAQa,qBAAqB;IAkBpB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAahH;IAED;;;OAGG;IACH,UAAyB,qBAAqB,CAC5C,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,4BAA4B,GACjC,OAAO,CAAC,kBAAkB,CAAC,CAuC7B;IAID,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAEtC;IAID,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAEhD;IAID,mBAAmB,CAAC,EAAE,EAAE,EAAE,qEAEzB;CACF"}
|
package/dest/utils/wallet.js
CHANGED
|
@@ -39,7 +39,11 @@ export class CLIWallet extends BaseWallet {
|
|
|
39
39
|
}
|
|
40
40
|
async createCancellationTxExecutionRequest(from, txNonce, increasedFee) {
|
|
41
41
|
const executionPayload = ExecutionPayload.empty();
|
|
42
|
-
const feeOptions = await this.completeFeeOptions(
|
|
42
|
+
const feeOptions = await this.completeFeeOptions({
|
|
43
|
+
from,
|
|
44
|
+
feePayer: executionPayload.feePayer,
|
|
45
|
+
gasSettings: increasedFee.gasSettings
|
|
46
|
+
});
|
|
43
47
|
const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
|
|
44
48
|
const fromAccount = await this.getAccountFromAddress(from);
|
|
45
49
|
const chainInfo = await this.getChainInfo();
|
|
@@ -146,7 +150,11 @@ export class CLIWallet extends BaseWallet {
|
|
|
146
150
|
async simulateTx(executionPayload, opts) {
|
|
147
151
|
const simulationResults = await super.simulateTx(executionPayload, opts);
|
|
148
152
|
if (opts.fee?.estimateGas) {
|
|
149
|
-
const feeOptions = await this.completeFeeOptions(
|
|
153
|
+
const feeOptions = await this.completeFeeOptions({
|
|
154
|
+
from: opts.from,
|
|
155
|
+
feePayer: executionPayload.feePayer,
|
|
156
|
+
gasSettings: opts.fee?.gasSettings
|
|
157
|
+
});
|
|
150
158
|
const limits = getGasLimits(simulationResults, opts.fee?.estimatedGasPadding);
|
|
151
159
|
printGasEstimates(feeOptions, limits, this.userLog);
|
|
152
160
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli-wallet",
|
|
3
|
-
"version": "4.2.0-nightly.
|
|
3
|
+
"version": "4.2.0-nightly.20260409",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/cmds/index.js",
|
|
@@ -67,19 +67,19 @@
|
|
|
67
67
|
]
|
|
68
68
|
},
|
|
69
69
|
"dependencies": {
|
|
70
|
-
"@aztec/accounts": "4.2.0-nightly.
|
|
71
|
-
"@aztec/aztec.js": "4.2.0-nightly.
|
|
72
|
-
"@aztec/bb.js": "4.2.0-nightly.
|
|
73
|
-
"@aztec/cli": "4.2.0-nightly.
|
|
74
|
-
"@aztec/entrypoints": "4.2.0-nightly.
|
|
75
|
-
"@aztec/ethereum": "4.2.0-nightly.
|
|
76
|
-
"@aztec/foundation": "4.2.0-nightly.
|
|
77
|
-
"@aztec/kv-store": "4.2.0-nightly.
|
|
78
|
-
"@aztec/noir-contracts.js": "4.2.0-nightly.
|
|
79
|
-
"@aztec/noir-noirc_abi": "4.2.0-nightly.
|
|
80
|
-
"@aztec/pxe": "4.2.0-nightly.
|
|
81
|
-
"@aztec/stdlib": "4.2.0-nightly.
|
|
82
|
-
"@aztec/wallet-sdk": "4.2.0-nightly.
|
|
70
|
+
"@aztec/accounts": "4.2.0-nightly.20260409",
|
|
71
|
+
"@aztec/aztec.js": "4.2.0-nightly.20260409",
|
|
72
|
+
"@aztec/bb.js": "4.2.0-nightly.20260409",
|
|
73
|
+
"@aztec/cli": "4.2.0-nightly.20260409",
|
|
74
|
+
"@aztec/entrypoints": "4.2.0-nightly.20260409",
|
|
75
|
+
"@aztec/ethereum": "4.2.0-nightly.20260409",
|
|
76
|
+
"@aztec/foundation": "4.2.0-nightly.20260409",
|
|
77
|
+
"@aztec/kv-store": "4.2.0-nightly.20260409",
|
|
78
|
+
"@aztec/noir-contracts.js": "4.2.0-nightly.20260409",
|
|
79
|
+
"@aztec/noir-noirc_abi": "4.2.0-nightly.20260409",
|
|
80
|
+
"@aztec/pxe": "4.2.0-nightly.20260409",
|
|
81
|
+
"@aztec/stdlib": "4.2.0-nightly.20260409",
|
|
82
|
+
"@aztec/wallet-sdk": "4.2.0-nightly.20260409",
|
|
83
83
|
"commander": "^12.1.0",
|
|
84
84
|
"inquirer": "^10.1.8",
|
|
85
85
|
"source-map-support": "^0.5.21",
|
|
@@ -258,7 +258,7 @@ export class CLIFeeArgs {
|
|
|
258
258
|
|
|
259
259
|
async toUserFeeOptions(node: AztecNode, wallet: Wallet, from: AztecAddress): Promise<ParsedFeeOptions> {
|
|
260
260
|
const maxFeesPerGas = (await node.getCurrentMinFees()).mul(1 + MIN_FEE_PADDING);
|
|
261
|
-
const gasSettings = GasSettings.
|
|
261
|
+
const gasSettings = GasSettings.fallback({ ...this.gasSettings, maxFeesPerGas });
|
|
262
262
|
const paymentMethod = await this.paymentMethod(wallet, from, gasSettings);
|
|
263
263
|
return {
|
|
264
264
|
paymentMethod,
|
|
@@ -296,7 +296,7 @@ function formatGasEstimate(estimate: Pick<GasSettings, 'gasLimits' | 'teardownGa
|
|
|
296
296
|
}
|
|
297
297
|
|
|
298
298
|
function getEstimatedCost(estimate: Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>, maxFeesPerGas: GasFees) {
|
|
299
|
-
return GasSettings.
|
|
299
|
+
return GasSettings.fallback({ ...estimate, maxFeesPerGas })
|
|
300
300
|
.getFeeLimit()
|
|
301
301
|
.toBigInt();
|
|
302
302
|
}
|
package/src/utils/wallet.ts
CHANGED
|
@@ -70,7 +70,11 @@ export class CLIWallet extends BaseWallet {
|
|
|
70
70
|
increasedFee: InteractionFeeOptions,
|
|
71
71
|
) {
|
|
72
72
|
const executionPayload = ExecutionPayload.empty();
|
|
73
|
-
const feeOptions = await this.completeFeeOptions(
|
|
73
|
+
const feeOptions = await this.completeFeeOptions({
|
|
74
|
+
from,
|
|
75
|
+
feePayer: executionPayload.feePayer,
|
|
76
|
+
gasSettings: increasedFee.gasSettings,
|
|
77
|
+
});
|
|
74
78
|
const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
|
|
75
79
|
const fromAccount = await this.getAccountFromAddress(from);
|
|
76
80
|
const chainInfo = await this.getChainInfo();
|
|
@@ -210,7 +214,11 @@ export class CLIWallet extends BaseWallet {
|
|
|
210
214
|
const simulationResults = await super.simulateTx(executionPayload, opts);
|
|
211
215
|
|
|
212
216
|
if (opts.fee?.estimateGas) {
|
|
213
|
-
const feeOptions = await this.completeFeeOptions(
|
|
217
|
+
const feeOptions = await this.completeFeeOptions({
|
|
218
|
+
from: opts.from,
|
|
219
|
+
feePayer: executionPayload.feePayer,
|
|
220
|
+
gasSettings: opts.fee?.gasSettings,
|
|
221
|
+
});
|
|
214
222
|
const limits = getGasLimits(simulationResults, opts.fee?.estimatedGasPadding);
|
|
215
223
|
printGasEstimates(feeOptions, limits, this.userLog);
|
|
216
224
|
}
|