@metamask-previews/transaction-controller 62.5.0-preview-db01d69 → 62.5.0-preview-f557eade
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/CHANGELOG.md +4 -1
- package/dist/TransactionController.cjs +27 -121
- package/dist/TransactionController.cjs.map +1 -1
- package/dist/TransactionController.d.cts +2 -18
- package/dist/TransactionController.d.cts.map +1 -1
- package/dist/TransactionController.d.mts +2 -18
- package/dist/TransactionController.d.mts.map +1 -1
- package/dist/TransactionController.mjs +28 -122
- package/dist/TransactionController.mjs.map +1 -1
- package/dist/helpers/IncomingTransactionHelper.cjs +4 -9
- package/dist/helpers/IncomingTransactionHelper.cjs.map +1 -1
- package/dist/helpers/IncomingTransactionHelper.d.cts +1 -2
- package/dist/helpers/IncomingTransactionHelper.d.cts.map +1 -1
- package/dist/helpers/IncomingTransactionHelper.d.mts +1 -2
- package/dist/helpers/IncomingTransactionHelper.d.mts.map +1 -1
- package/dist/helpers/IncomingTransactionHelper.mjs +4 -9
- package/dist/helpers/IncomingTransactionHelper.mjs.map +1 -1
- package/dist/index.cjs +1 -4
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +1 -2
- package/dist/index.d.cts.map +1 -1
- package/dist/index.d.mts +1 -2
- package/dist/index.d.mts.map +1 -1
- package/dist/index.mjs +0 -1
- package/dist/index.mjs.map +1 -1
- package/dist/types.cjs.map +1 -1
- package/dist/types.d.cts +1 -59
- package/dist/types.d.cts.map +1 -1
- package/dist/types.d.mts +1 -59
- package/dist/types.d.mts.map +1 -1
- package/dist/types.mjs.map +1 -1
- package/package.json +1 -1
- package/dist/utils/history.cjs +0 -164
- package/dist/utils/history.cjs.map +0 -1
- package/dist/utils/history.d.cts +0 -29
- package/dist/utils/history.d.cts.map +0 -1
- package/dist/utils/history.d.mts +0 -29
- package/dist/utils/history.d.mts.map +0 -1
- package/dist/utils/history.mjs +0 -164
- package/dist/utils/history.mjs.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -7,11 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
## [Unreleased]
|
|
9
9
|
|
|
10
|
+
### Changed
|
|
11
|
+
|
|
12
|
+
- **BREAKING**: Remove `history` and `sendFlowHistory` properties from `TransactionMeta` ([#7326](https://github.com/MetaMask/core/pull/7326))
|
|
13
|
+
|
|
10
14
|
## [62.5.0]
|
|
11
15
|
|
|
12
16
|
### Changed
|
|
13
17
|
|
|
14
|
-
- Use gas fee properties from first transaction in EIP-7702 transactions ([#7323](https://github.com/MetaMask/core/pull/7323))
|
|
15
18
|
- Bump `@metamask/remote-feature-flag-controller` from `^2.0.1` to `^3.0.0` ([#7309](https://github.com/MetaMask/core/pull/7309)
|
|
16
19
|
|
|
17
20
|
## [62.4.0]
|
|
@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
13
13
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
15
|
};
|
|
16
|
-
var _TransactionController_instances, _TransactionController_afterAdd, _TransactionController_afterSign, _TransactionController_afterSimulate, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_beforeSign, _TransactionController_gasFeeFlows, _TransactionController_getAdditionalSignArguments, _TransactionController_getCurrentAccountEIP1559Compatibility, _TransactionController_getCurrentNetworkEIP1559Compatibility, _TransactionController_getExternalPendingTransactions, _TransactionController_getGasFeeEstimates, _TransactionController_getNetworkState, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_getSimulationConfig, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isEIP7702GasFeeTokensEnabled, _TransactionController_isFirstTimeInteractionEnabled,
|
|
16
|
+
var _TransactionController_instances, _TransactionController_afterAdd, _TransactionController_afterSign, _TransactionController_afterSimulate, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_beforeSign, _TransactionController_gasFeeFlows, _TransactionController_getAdditionalSignArguments, _TransactionController_getCurrentAccountEIP1559Compatibility, _TransactionController_getCurrentNetworkEIP1559Compatibility, _TransactionController_getExternalPendingTransactions, _TransactionController_getGasFeeEstimates, _TransactionController_getNetworkState, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_getSimulationConfig, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isEIP7702GasFeeTokensEnabled, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isSimulationEnabled, _TransactionController_isSwapsDisabled, _TransactionController_layer1GasFeeFlows, _TransactionController_methodDataHelper, _TransactionController_multichainTrackingHelper, _TransactionController_pendingTransactionOptions, _TransactionController_publicKeyEIP7702, _TransactionController_publish, _TransactionController_publishBatchHook, _TransactionController_securityProviderRequest, _TransactionController_sign, _TransactionController_signAbortCallbacks, _TransactionController_skipSimulationTransactionIds, _TransactionController_testGasFeeFlows, _TransactionController_trace, _TransactionController_retryTransaction, _TransactionController_signExternalTransaction, _TransactionController_addMetadata, _TransactionController_updateGasProperties, _TransactionController_onBootCleanup, _TransactionController_failIncompleteTransactions, _TransactionController_processApproval, _TransactionController_approveTransaction, _TransactionController_publishTransaction, _TransactionController_rejectTransaction, _TransactionController_isFinalState, _TransactionController_isLocalFinalState, _TransactionController_requestApproval, _TransactionController_getTransaction, _TransactionController_getTransactionOrThrow, _TransactionController_getApprovalId, _TransactionController_isTransactionCompleted, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _TransactionController_onIncomingTransactions, _TransactionController_generateDappSuggestedGasFees, _TransactionController_addExternalTransaction, _TransactionController_markNonceDuplicatesDropped, _TransactionController_setTransactionStatusDropped, _TransactionController_getTransactionWithActionId, _TransactionController_waitForTransactionFinished, _TransactionController_updateTransactionMetaRSV, _TransactionController_getEIP1559Compatibility, _TransactionController_signTransaction, _TransactionController_onTransactionStatusChange, _TransactionController_getNonceTrackerTransactions, _TransactionController_onConfirmedTransaction, _TransactionController_updatePostBalance, _TransactionController_createNonceTracker, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_publishTransactionForRetry, _TransactionController_isTransactionAlreadyConfirmedError, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_onGasFeePollerTransactionBatchUpdate, _TransactionController_updateTransactionBatch, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow, _TransactionController_failTransaction, _TransactionController_runAfterSimulateHook, _TransactionController_defaultPublishHook, _TransactionController_getGasFeeTokens, _TransactionController_getGasFeeTokensAction;
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.TransactionController = exports.ApprovalState = exports.SPEED_UP_RATE = exports.CANCEL_RATE = void 0;
|
|
19
19
|
const base_controller_1 = require("@metamask/base-controller");
|
|
@@ -53,7 +53,6 @@ const gas_1 = require("./utils/gas.cjs");
|
|
|
53
53
|
const gas_fee_tokens_1 = require("./utils/gas-fee-tokens.cjs");
|
|
54
54
|
const gas_fees_1 = require("./utils/gas-fees.cjs");
|
|
55
55
|
const gas_flow_1 = require("./utils/gas-flow.cjs");
|
|
56
|
-
const history_1 = require("./utils/history.cjs");
|
|
57
56
|
const layer1_gas_fee_flow_1 = require("./utils/layer1-gas-fee-flow.cjs");
|
|
58
57
|
const nonce_1 = require("./utils/nonce.cjs");
|
|
59
58
|
const prepare_1 = require("./utils/prepare.cjs");
|
|
@@ -144,7 +143,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
144
143
|
* @param options - The controller options.
|
|
145
144
|
*/
|
|
146
145
|
constructor(options) {
|
|
147
|
-
const {
|
|
146
|
+
const { disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkClientRegistry, getNetworkState, getPermittedAccounts, getSavedGasFees, getSimulationConfig, hooks, incomingTransactions = {}, isAutomaticGasFeeUpdateEnabled, isEIP7702GasFeeTokensEnabled, isFirstTimeInteractionEnabled, isSimulationEnabled, messenger, pendingTransactions = {}, publicKeyEIP7702, securityProviderRequest, sign, state, testGasFeeFlows, trace, } = options;
|
|
148
147
|
super({
|
|
149
148
|
name: controllerName,
|
|
150
149
|
metadata,
|
|
@@ -178,8 +177,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
178
177
|
_TransactionController_isAutomaticGasFeeUpdateEnabled.set(this, void 0);
|
|
179
178
|
_TransactionController_isEIP7702GasFeeTokensEnabled.set(this, void 0);
|
|
180
179
|
_TransactionController_isFirstTimeInteractionEnabled.set(this, void 0);
|
|
181
|
-
_TransactionController_isHistoryDisabled.set(this, void 0);
|
|
182
|
-
_TransactionController_isSendFlowHistoryDisabled.set(this, void 0);
|
|
183
180
|
_TransactionController_isSimulationEnabled.set(this, void 0);
|
|
184
181
|
_TransactionController_isSwapsDisabled.set(this, void 0);
|
|
185
182
|
_TransactionController_layer1GasFeeFlows.set(this, void 0);
|
|
@@ -195,7 +192,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
195
192
|
_TransactionController_skipSimulationTransactionIds.set(this, new Set());
|
|
196
193
|
_TransactionController_testGasFeeFlows.set(this, void 0);
|
|
197
194
|
_TransactionController_trace.set(this, void 0);
|
|
198
|
-
_TransactionController_transactionHistoryLimit.set(this, void 0);
|
|
199
195
|
_TransactionController_checkForPendingTransactionAndStartPolling.set(this, () => {
|
|
200
196
|
__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").checkForPendingTransactionAndStartPolling();
|
|
201
197
|
});
|
|
@@ -221,8 +217,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
221
217
|
__classPrivateFieldSet(this, _TransactionController_isAutomaticGasFeeUpdateEnabled, isAutomaticGasFeeUpdateEnabled ?? ((_txMeta) => false), "f");
|
|
222
218
|
__classPrivateFieldSet(this, _TransactionController_isEIP7702GasFeeTokensEnabled, isEIP7702GasFeeTokensEnabled ?? (() => Promise.resolve(false)), "f");
|
|
223
219
|
__classPrivateFieldSet(this, _TransactionController_isFirstTimeInteractionEnabled, isFirstTimeInteractionEnabled ?? (() => true), "f");
|
|
224
|
-
__classPrivateFieldSet(this, _TransactionController_isHistoryDisabled, disableHistory ?? false, "f");
|
|
225
|
-
__classPrivateFieldSet(this, _TransactionController_isSendFlowHistoryDisabled, disableSendFlowHistory ?? false, "f");
|
|
226
220
|
__classPrivateFieldSet(this, _TransactionController_isSimulationEnabled, isSimulationEnabled ?? (() => true), "f");
|
|
227
221
|
__classPrivateFieldSet(this, _TransactionController_isSwapsDisabled, disableSwaps ?? false, "f");
|
|
228
222
|
__classPrivateFieldSet(this, _TransactionController_pendingTransactionOptions, pendingTransactions, "f");
|
|
@@ -233,7 +227,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
233
227
|
__classPrivateFieldSet(this, _TransactionController_sign, sign, "f");
|
|
234
228
|
__classPrivateFieldSet(this, _TransactionController_testGasFeeFlows, testGasFeeFlows === true, "f");
|
|
235
229
|
__classPrivateFieldSet(this, _TransactionController_trace, trace ?? ((_request, fn) => fn?.()), "f");
|
|
236
|
-
__classPrivateFieldSet(this, _TransactionController_transactionHistoryLimit, transactionHistoryLimit, "f");
|
|
237
230
|
const findNetworkClientIdByChainId = (chainId) => {
|
|
238
231
|
return this.messenger.call(`NetworkController:findNetworkClientIdByChainId`, chainId);
|
|
239
232
|
};
|
|
@@ -285,7 +278,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
285
278
|
isEnabled: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").isEnabled,
|
|
286
279
|
messenger: this.messenger,
|
|
287
280
|
remoteTransactionSource: new AccountsApiRemoteTransactionSource_1.AccountsApiRemoteTransactionSource(),
|
|
288
|
-
trimTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).bind(this),
|
|
289
281
|
updateTransactions: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").updateTransactions,
|
|
290
282
|
}), "f");
|
|
291
283
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addIncomingTransactionHelperListeners).call(this, __classPrivateFieldGet(this, _TransactionController_incomingTransactionHelper, "f"));
|
|
@@ -378,7 +370,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
378
370
|
*/
|
|
379
371
|
async addTransaction(txParams, options) {
|
|
380
372
|
(0, logger_1.projectLogger)('Adding transaction', txParams, options);
|
|
381
|
-
const { actionId, assetsFiatValues, batchId, deviceConfirmedOn, disableGasBuffer, gasFeeToken, isGasFeeIncluded, isGasFeeSponsored, method, nestedTransactions, networkClientId, origin, publishHook, requireApproval, securityAlertResponse,
|
|
373
|
+
const { actionId, assetsFiatValues, batchId, deviceConfirmedOn, disableGasBuffer, gasFeeToken, isGasFeeIncluded, isGasFeeSponsored, method, nestedTransactions, networkClientId, origin, publishHook, requireApproval, securityAlertResponse, skipInitialGasEstimate, swaps = {}, traceContext, type, } = options;
|
|
382
374
|
txParams = (0, utils_2.normalizeTransactionParams)(txParams);
|
|
383
375
|
if (!__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
|
|
384
376
|
throw new Error(`Network client not found - ${networkClientId}`);
|
|
@@ -463,7 +455,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
463
455
|
.then(() => {
|
|
464
456
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
465
457
|
transactionId: newTransactionMeta.id,
|
|
466
|
-
skipHistory: true,
|
|
467
458
|
skipResimulateCheck: true,
|
|
468
459
|
skipValidation: true,
|
|
469
460
|
}, (tx) => {
|
|
@@ -486,13 +477,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
486
477
|
addedTransactionMeta.securityProviderResponse =
|
|
487
478
|
securityProviderResponse;
|
|
488
479
|
}
|
|
489
|
-
if (!__classPrivateFieldGet(this, _TransactionController_isSendFlowHistoryDisabled, "f")) {
|
|
490
|
-
addedTransactionMeta.sendFlowHistory = sendFlowHistory ?? [];
|
|
491
|
-
}
|
|
492
|
-
// Initial history push
|
|
493
|
-
if (!__classPrivateFieldGet(this, _TransactionController_isHistoryDisabled, "f")) {
|
|
494
|
-
addedTransactionMeta = (0, history_1.addInitialHistorySnapshot)(addedTransactionMeta);
|
|
495
|
-
}
|
|
496
480
|
addedTransactionMeta = (0, swaps_1.updateSwapsTransaction)(addedTransactionMeta, transactionType, swaps, {
|
|
497
481
|
isSwapsDisabled: __classPrivateFieldGet(this, _TransactionController_isSwapsDisabled, "f"),
|
|
498
482
|
cancelTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_rejectTransaction).bind(this),
|
|
@@ -503,7 +487,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
503
487
|
.then((delegationAddress) => {
|
|
504
488
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
505
489
|
transactionId: addedTransactionMeta.id,
|
|
506
|
-
skipHistory: true,
|
|
507
490
|
skipResimulateCheck: true,
|
|
508
491
|
skipValidation: true,
|
|
509
492
|
}, (tx) => {
|
|
@@ -669,11 +652,10 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
669
652
|
* Updates an existing transaction in state.
|
|
670
653
|
*
|
|
671
654
|
* @param transactionMeta - The new transaction to store in state.
|
|
672
|
-
* @param note - A note or update reason to include in the transaction history.
|
|
673
655
|
*/
|
|
674
|
-
updateTransaction(transactionMeta
|
|
656
|
+
updateTransaction(transactionMeta) {
|
|
675
657
|
const { id: transactionId } = transactionMeta;
|
|
676
|
-
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId
|
|
658
|
+
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId }, () => ({
|
|
677
659
|
...transactionMeta,
|
|
678
660
|
}));
|
|
679
661
|
}
|
|
@@ -695,7 +677,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
695
677
|
...transactionMeta,
|
|
696
678
|
securityAlertResponse,
|
|
697
679
|
};
|
|
698
|
-
this.updateTransaction(updatedTransactionMeta
|
|
680
|
+
this.updateTransaction(updatedTransactionMeta);
|
|
699
681
|
}
|
|
700
682
|
/**
|
|
701
683
|
* Remove transactions from state.
|
|
@@ -723,7 +705,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
723
705
|
return !isMatchingAddress;
|
|
724
706
|
});
|
|
725
707
|
this.update((state) => {
|
|
726
|
-
state.transactions =
|
|
708
|
+
state.transactions = newTransactions;
|
|
727
709
|
});
|
|
728
710
|
}
|
|
729
711
|
/**
|
|
@@ -750,7 +732,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
750
732
|
// Update same nonce local transactions as dropped and define replacedBy properties.
|
|
751
733
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_markNonceDuplicatesDropped).call(this, transactionId);
|
|
752
734
|
// Update external provided transaction with updated gas values and confirmed status.
|
|
753
|
-
this.updateTransaction(updatedTransactionMeta
|
|
735
|
+
this.updateTransaction(updatedTransactionMeta);
|
|
754
736
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, updatedTransactionMeta);
|
|
755
737
|
// Intentional given potential duration of process.
|
|
756
738
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updatePostBalance).call(this, updatedTransactionMeta).catch((error) => {
|
|
@@ -764,33 +746,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
764
746
|
console.error('Failed to confirm external transaction', error);
|
|
765
747
|
}
|
|
766
748
|
}
|
|
767
|
-
/**
|
|
768
|
-
* Append new send flow history to a transaction.
|
|
769
|
-
*
|
|
770
|
-
* @param transactionID - The ID of the transaction to update.
|
|
771
|
-
* @param currentSendFlowHistoryLength - The length of the current sendFlowHistory array.
|
|
772
|
-
* @param sendFlowHistoryToAdd - The sendFlowHistory entries to add.
|
|
773
|
-
* @returns The updated transactionMeta.
|
|
774
|
-
*/
|
|
775
|
-
updateTransactionSendFlowHistory(transactionID, currentSendFlowHistoryLength, sendFlowHistoryToAdd) {
|
|
776
|
-
if (__classPrivateFieldGet(this, _TransactionController_isSendFlowHistoryDisabled, "f")) {
|
|
777
|
-
throw new Error('Send flow history is disabled for the current transaction controller');
|
|
778
|
-
}
|
|
779
|
-
const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionID);
|
|
780
|
-
if (!transactionMeta) {
|
|
781
|
-
throw new Error(`Cannot update send flow history as no transaction metadata found`);
|
|
782
|
-
}
|
|
783
|
-
(0, utils_2.validateIfTransactionUnapproved)(transactionMeta, 'updateTransactionSendFlowHistory');
|
|
784
|
-
const sendFlowHistory = transactionMeta.sendFlowHistory ?? [];
|
|
785
|
-
if (currentSendFlowHistoryLength === sendFlowHistory.length) {
|
|
786
|
-
const updatedTransactionMeta = {
|
|
787
|
-
...transactionMeta,
|
|
788
|
-
sendFlowHistory: [...sendFlowHistory, ...sendFlowHistoryToAdd],
|
|
789
|
-
};
|
|
790
|
-
this.updateTransaction(updatedTransactionMeta, `${controllerName}:updateTransactionSendFlowHistory - sendFlowHistory updated`);
|
|
791
|
-
}
|
|
792
|
-
return __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionID);
|
|
793
|
-
}
|
|
794
749
|
/**
|
|
795
750
|
* Update the gas values of a transaction.
|
|
796
751
|
*
|
|
@@ -860,7 +815,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
860
815
|
const filteredTransactionGasFees = (0, lodash_1.pickBy)(transactionGasFees);
|
|
861
816
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
862
817
|
transactionId,
|
|
863
|
-
note: `${controllerName}:updateTransactionGasFees - gas values updated`,
|
|
864
818
|
skipResimulateCheck: true,
|
|
865
819
|
}, (draftTxMeta) => {
|
|
866
820
|
const { txParams, ...otherProps } = filteredTransactionGasFees;
|
|
@@ -900,7 +854,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
900
854
|
transactionPreviousGas.previousGas = (0, lodash_1.pickBy)(transactionPreviousGas.previousGas);
|
|
901
855
|
// merge updated previous gas values with existing transaction meta
|
|
902
856
|
const updatedMeta = (0, lodash_1.merge)({}, transactionMeta, transactionPreviousGas);
|
|
903
|
-
this.updateTransaction(updatedMeta
|
|
857
|
+
this.updateTransaction(updatedMeta);
|
|
904
858
|
return __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
|
|
905
859
|
}
|
|
906
860
|
async getNonceLock(address, networkClientId) {
|
|
@@ -959,7 +913,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
959
913
|
provider,
|
|
960
914
|
transactionMeta: updatedTransaction,
|
|
961
915
|
});
|
|
962
|
-
this.updateTransaction(updatedTransaction
|
|
916
|
+
this.updateTransaction(updatedTransaction);
|
|
963
917
|
return __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, txId);
|
|
964
918
|
}
|
|
965
919
|
/**
|
|
@@ -975,8 +929,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
975
929
|
}
|
|
976
930
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
977
931
|
transactionId,
|
|
978
|
-
note: 'TransactionController#setTransactionActive - Transaction isActive updated',
|
|
979
|
-
skipHistory: true,
|
|
980
932
|
skipValidation: true,
|
|
981
933
|
skipResimulateCheck: true,
|
|
982
934
|
}, (updatedTransactionMeta) => {
|
|
@@ -1080,7 +1032,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
1080
1032
|
delete updatedTransactionMeta.txParams.maxFeePerGas;
|
|
1081
1033
|
delete updatedTransactionMeta.txParams.maxPriorityFeePerGas;
|
|
1082
1034
|
}
|
|
1083
|
-
this.updateTransaction(updatedTransactionMeta
|
|
1035
|
+
this.updateTransaction(updatedTransactionMeta);
|
|
1084
1036
|
if (status &&
|
|
1085
1037
|
[types_1.TransactionStatus.submitted, types_1.TransactionStatus.failed].includes(status)) {
|
|
1086
1038
|
this.messenger.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
|
|
@@ -1222,7 +1174,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
1222
1174
|
clearUnapprovedTransactions() {
|
|
1223
1175
|
const transactions = this.state.transactions.filter(({ status }) => status !== types_1.TransactionStatus.unapproved);
|
|
1224
1176
|
this.update((state) => {
|
|
1225
|
-
state.transactions =
|
|
1177
|
+
state.transactions = transactions;
|
|
1226
1178
|
});
|
|
1227
1179
|
}
|
|
1228
1180
|
/**
|
|
@@ -1260,7 +1212,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
1260
1212
|
});
|
|
1261
1213
|
const updatedTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
1262
1214
|
transactionId,
|
|
1263
|
-
note: 'TransactionController#updateAtomicBatchData - Atomic batch data updated',
|
|
1264
1215
|
}, (transactionMeta) => {
|
|
1265
1216
|
const { nestedTransactions, txParams } = transactionMeta;
|
|
1266
1217
|
const from = txParams.from;
|
|
@@ -1283,7 +1234,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
1283
1234
|
await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateGasEstimate).call(this, draftTransaction);
|
|
1284
1235
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
1285
1236
|
transactionId,
|
|
1286
|
-
note: 'TransactionController#updateAtomicBatchData - Gas estimate updated',
|
|
1287
1237
|
}, (transactionMeta) => {
|
|
1288
1238
|
transactionMeta.txParams.gas = draftTransaction.txParams.gas;
|
|
1289
1239
|
transactionMeta.simulationFails = draftTransaction.simulationFails;
|
|
@@ -1303,7 +1253,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
1303
1253
|
(0, logger_1.projectLogger)('Updating batch transactions', { transactionId, batchTransactions });
|
|
1304
1254
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
1305
1255
|
transactionId,
|
|
1306
|
-
note: 'TransactionController#updateBatchTransactions - Batch transactions updated',
|
|
1307
1256
|
}, (transactionMeta) => {
|
|
1308
1257
|
transactionMeta.batchTransactions = batchTransactions;
|
|
1309
1258
|
});
|
|
@@ -1379,14 +1328,14 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
1379
1328
|
state.transactions.push(updatedTransactionMeta);
|
|
1380
1329
|
});
|
|
1381
1330
|
}
|
|
1382
|
-
this.updateTransaction(updatedTransactionMeta
|
|
1331
|
+
this.updateTransaction(updatedTransactionMeta);
|
|
1383
1332
|
this.messenger.publish('TransactionController:transactionStatusUpdated', {
|
|
1384
1333
|
transactionMeta: updatedTransactionMeta,
|
|
1385
1334
|
});
|
|
1386
1335
|
}
|
|
1387
1336
|
}
|
|
1388
1337
|
exports.TransactionController = TransactionController;
|
|
1389
|
-
_TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSign = new WeakMap(), _TransactionController_afterSimulate = new WeakMap(), _TransactionController_approvingTransactionIds = new WeakMap(), _TransactionController_beforeCheckPendingTransaction = new WeakMap(), _TransactionController_beforePublish = new WeakMap(), _TransactionController_beforeSign = new WeakMap(), _TransactionController_gasFeeFlows = new WeakMap(), _TransactionController_getAdditionalSignArguments = new WeakMap(), _TransactionController_getCurrentAccountEIP1559Compatibility = new WeakMap(), _TransactionController_getCurrentNetworkEIP1559Compatibility = new WeakMap(), _TransactionController_getExternalPendingTransactions = new WeakMap(), _TransactionController_getGasFeeEstimates = new WeakMap(), _TransactionController_getNetworkState = new WeakMap(), _TransactionController_getPermittedAccounts = new WeakMap(), _TransactionController_getSavedGasFees = new WeakMap(), _TransactionController_getSimulationConfig = new WeakMap(), _TransactionController_incomingTransactionHelper = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_internalEvents = new WeakMap(), _TransactionController_isAutomaticGasFeeUpdateEnabled = new WeakMap(), _TransactionController_isEIP7702GasFeeTokensEnabled = new WeakMap(), _TransactionController_isFirstTimeInteractionEnabled = new WeakMap(),
|
|
1338
|
+
_TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSign = new WeakMap(), _TransactionController_afterSimulate = new WeakMap(), _TransactionController_approvingTransactionIds = new WeakMap(), _TransactionController_beforeCheckPendingTransaction = new WeakMap(), _TransactionController_beforePublish = new WeakMap(), _TransactionController_beforeSign = new WeakMap(), _TransactionController_gasFeeFlows = new WeakMap(), _TransactionController_getAdditionalSignArguments = new WeakMap(), _TransactionController_getCurrentAccountEIP1559Compatibility = new WeakMap(), _TransactionController_getCurrentNetworkEIP1559Compatibility = new WeakMap(), _TransactionController_getExternalPendingTransactions = new WeakMap(), _TransactionController_getGasFeeEstimates = new WeakMap(), _TransactionController_getNetworkState = new WeakMap(), _TransactionController_getPermittedAccounts = new WeakMap(), _TransactionController_getSavedGasFees = new WeakMap(), _TransactionController_getSimulationConfig = new WeakMap(), _TransactionController_incomingTransactionHelper = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_internalEvents = new WeakMap(), _TransactionController_isAutomaticGasFeeUpdateEnabled = new WeakMap(), _TransactionController_isEIP7702GasFeeTokensEnabled = new WeakMap(), _TransactionController_isFirstTimeInteractionEnabled = new WeakMap(), _TransactionController_isSimulationEnabled = new WeakMap(), _TransactionController_isSwapsDisabled = new WeakMap(), _TransactionController_layer1GasFeeFlows = new WeakMap(), _TransactionController_methodDataHelper = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_pendingTransactionOptions = new WeakMap(), _TransactionController_publicKeyEIP7702 = new WeakMap(), _TransactionController_publish = new WeakMap(), _TransactionController_publishBatchHook = new WeakMap(), _TransactionController_securityProviderRequest = new WeakMap(), _TransactionController_sign = new WeakMap(), _TransactionController_signAbortCallbacks = new WeakMap(), _TransactionController_skipSimulationTransactionIds = new WeakMap(), _TransactionController_testGasFeeFlows = new WeakMap(), _TransactionController_trace = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_retryTransaction = async function _TransactionController_retryTransaction({ actionId, afterSubmit, estimatedBaseFee, gasValues, label, prepareTransactionParams, rate, transactionId, transactionType, }) {
|
|
1390
1339
|
// If transaction is found for same action id, do not create a new transaction.
|
|
1391
1340
|
if (__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionWithActionId).call(this, actionId)) {
|
|
1392
1341
|
return;
|
|
@@ -1473,10 +1422,7 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
|
|
|
1473
1422
|
}, _TransactionController_addMetadata = function _TransactionController_addMetadata(transactionMeta) {
|
|
1474
1423
|
(0, validation_1.validateTxParams)(transactionMeta.txParams);
|
|
1475
1424
|
this.update((state) => {
|
|
1476
|
-
state.transactions =
|
|
1477
|
-
...state.transactions,
|
|
1478
|
-
transactionMeta,
|
|
1479
|
-
]);
|
|
1425
|
+
state.transactions = [...state.transactions, transactionMeta];
|
|
1480
1426
|
});
|
|
1481
1427
|
}, _TransactionController_updateGasProperties = async function _TransactionController_updateGasProperties(transactionMeta, { traceContext } = {}) {
|
|
1482
1428
|
const isEIP1559Compatible = transactionMeta.txParams.type !== types_1.TransactionEnvelopeType.legacy &&
|
|
@@ -1541,7 +1487,7 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
|
|
|
1541
1487
|
customNonce: updatedTransaction.customNonceValue,
|
|
1542
1488
|
params: updatedTransaction.txParams,
|
|
1543
1489
|
});
|
|
1544
|
-
this.updateTransaction(updatedTransaction
|
|
1490
|
+
this.updateTransaction(updatedTransaction);
|
|
1545
1491
|
}
|
|
1546
1492
|
}
|
|
1547
1493
|
const { isCompleted: isTxCompleted } = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isTransactionCompleted).call(this, transactionId);
|
|
@@ -1626,7 +1572,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
1626
1572
|
clearNonceLock = releaseNonce;
|
|
1627
1573
|
transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
1628
1574
|
transactionId,
|
|
1629
|
-
note: 'TransactionController#approveTransaction - Transaction approved',
|
|
1630
1575
|
}, (draftTxMeta) => {
|
|
1631
1576
|
const { chainId, txParams } = draftTxMeta;
|
|
1632
1577
|
const { gas, type } = txParams;
|
|
@@ -1677,7 +1622,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
1677
1622
|
const { transactionHash: hash } = await publishHook(transactionMeta, rawTx ?? '0x');
|
|
1678
1623
|
transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
1679
1624
|
transactionId,
|
|
1680
|
-
note: 'TransactionController#approveTransaction - Transaction submitted',
|
|
1681
1625
|
}, (draftTxMeta) => {
|
|
1682
1626
|
draftTxMeta.hash = hash;
|
|
1683
1627
|
draftTxMeta.status = types_1.TransactionStatus.submitted;
|
|
@@ -1731,27 +1675,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
1731
1675
|
actionId,
|
|
1732
1676
|
});
|
|
1733
1677
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, updatedTransactionMeta);
|
|
1734
|
-
}, _TransactionController_trimTransactionsForState = function _TransactionController_trimTransactionsForState(transactions) {
|
|
1735
|
-
const nonceNetworkSet = new Set();
|
|
1736
|
-
const txsToKeep = [...transactions]
|
|
1737
|
-
.sort((a, b) => (a.time > b.time ? -1 : 1)) // Descending time order
|
|
1738
|
-
.filter((tx) => {
|
|
1739
|
-
const { chainId, status, txParams, time } = tx;
|
|
1740
|
-
if (txParams) {
|
|
1741
|
-
const key = `${String(txParams.nonce)}-${(0, controller_utils_1.convertHexToDecimal)(chainId)}-${new Date(time).toDateString()}`;
|
|
1742
|
-
if (nonceNetworkSet.has(key)) {
|
|
1743
|
-
return true;
|
|
1744
|
-
}
|
|
1745
|
-
else if (nonceNetworkSet.size < __classPrivateFieldGet(this, _TransactionController_transactionHistoryLimit, "f") ||
|
|
1746
|
-
!__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isFinalState).call(this, status)) {
|
|
1747
|
-
nonceNetworkSet.add(key);
|
|
1748
|
-
return true;
|
|
1749
|
-
}
|
|
1750
|
-
}
|
|
1751
|
-
return false;
|
|
1752
|
-
});
|
|
1753
|
-
txsToKeep.reverse(); // Ascending time order
|
|
1754
|
-
return txsToKeep;
|
|
1755
1678
|
}, _TransactionController_isFinalState = function _TransactionController_isFinalState(status) {
|
|
1756
1679
|
return (status === types_1.TransactionStatus.rejected ||
|
|
1757
1680
|
status === types_1.TransactionStatus.confirmed ||
|
|
@@ -1839,10 +1762,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
1839
1762
|
}
|
|
1840
1763
|
this.update((state) => {
|
|
1841
1764
|
const { transactions: currentTransactions } = state;
|
|
1842
|
-
state.transactions =
|
|
1843
|
-
...finalTransactions,
|
|
1844
|
-
...currentTransactions,
|
|
1845
|
-
]);
|
|
1765
|
+
state.transactions = [...finalTransactions, ...currentTransactions];
|
|
1846
1766
|
(0, logger_1.projectLogger)('Added incoming transactions to state', finalTransactions.length, finalTransactions);
|
|
1847
1767
|
});
|
|
1848
1768
|
this.messenger.publish(`${controllerName}:incomingTransactionsReceived`, finalTransactions);
|
|
@@ -1879,17 +1799,10 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
1879
1799
|
const confirmedTxs = sameFromAndNetworkTransactions.filter((transaction) => transaction.status === types_1.TransactionStatus.confirmed);
|
|
1880
1800
|
const pendingTxs = sameFromAndNetworkTransactions.filter((transaction) => transaction.status === types_1.TransactionStatus.submitted);
|
|
1881
1801
|
(0, external_transactions_1.validateConfirmedExternalTransaction)(transactionMeta, confirmedTxs, pendingTxs);
|
|
1882
|
-
// Make sure provided external transaction has non empty history array
|
|
1883
|
-
const newTransactionMeta = (transactionMeta.history ?? []).length === 0 && !__classPrivateFieldGet(this, _TransactionController_isHistoryDisabled, "f")
|
|
1884
|
-
? (0, history_1.addInitialHistorySnapshot)(transactionMeta)
|
|
1885
|
-
: transactionMeta;
|
|
1886
1802
|
this.update((state) => {
|
|
1887
|
-
state.transactions =
|
|
1888
|
-
...state.transactions,
|
|
1889
|
-
newTransactionMeta,
|
|
1890
|
-
]);
|
|
1803
|
+
state.transactions = [...state.transactions, transactionMeta];
|
|
1891
1804
|
});
|
|
1892
|
-
return
|
|
1805
|
+
return transactionMeta;
|
|
1893
1806
|
}, _TransactionController_markNonceDuplicatesDropped = function _TransactionController_markNonceDuplicatesDropped(transactionId) {
|
|
1894
1807
|
const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
|
|
1895
1808
|
if (!transactionMeta) {
|
|
@@ -1930,7 +1843,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
1930
1843
|
this.messenger.publish(`${controllerName}:transactionDropped`, {
|
|
1931
1844
|
transactionMeta: updatedTransactionMeta,
|
|
1932
1845
|
});
|
|
1933
|
-
this.updateTransaction(updatedTransactionMeta
|
|
1846
|
+
this.updateTransaction(updatedTransactionMeta);
|
|
1934
1847
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, updatedTransactionMeta);
|
|
1935
1848
|
}, _TransactionController_getTransactionWithActionId = function _TransactionController_getTransactionWithActionId(actionId) {
|
|
1936
1849
|
return this.state.transactions.find((transaction) => actionId && transaction.actionId === actionId);
|
|
@@ -1960,7 +1873,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
1960
1873
|
(0, logger_1.projectLogger)('Calling before sign hook', transactionMeta);
|
|
1961
1874
|
const { updateTransaction } = (await __classPrivateFieldGet(this, _TransactionController_beforeSign, "f").call(this, { transactionMeta })) ?? {};
|
|
1962
1875
|
if (updateTransaction) {
|
|
1963
|
-
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId, skipResimulateCheck: true
|
|
1876
|
+
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId, skipResimulateCheck: true }, updateTransaction);
|
|
1964
1877
|
(0, logger_1.projectLogger)('Updated transaction after before sign hook');
|
|
1965
1878
|
}
|
|
1966
1879
|
transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId);
|
|
@@ -2006,7 +1919,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2006
1919
|
}
|
|
2007
1920
|
const transactionMetaFromHook = (0, lodash_1.cloneDeep)(finalTransactionMeta);
|
|
2008
1921
|
if (!__classPrivateFieldGet(this, _TransactionController_afterSign, "f").call(this, transactionMetaFromHook, signedTx)) {
|
|
2009
|
-
this.updateTransaction(transactionMetaFromHook
|
|
1922
|
+
this.updateTransaction(transactionMetaFromHook);
|
|
2010
1923
|
(0, logger_1.projectLogger)('Skipping signed status based on hook');
|
|
2011
1924
|
return undefined;
|
|
2012
1925
|
}
|
|
@@ -2015,13 +1928,13 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2015
1928
|
status: types_1.TransactionStatus.signed,
|
|
2016
1929
|
txParams: finalTxParams,
|
|
2017
1930
|
};
|
|
2018
|
-
this.updateTransaction(transactionMetaWithRsv
|
|
1931
|
+
this.updateTransaction(transactionMetaWithRsv);
|
|
2019
1932
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, transactionMetaWithRsv);
|
|
2020
1933
|
const rawTx = (0, prepare_1.serializeTransaction)(signedTx);
|
|
2021
1934
|
const transactionMetaWithRawTx = (0, lodash_1.merge)({}, transactionMetaWithRsv, {
|
|
2022
1935
|
rawTx,
|
|
2023
1936
|
});
|
|
2024
|
-
this.updateTransaction(transactionMetaWithRawTx
|
|
1937
|
+
this.updateTransaction(transactionMetaWithRawTx);
|
|
2025
1938
|
return rawTx;
|
|
2026
1939
|
}, _TransactionController_onTransactionStatusChange = function _TransactionController_onTransactionStatusChange(transactionMeta) {
|
|
2027
1940
|
this.messenger.publish(`${controllerName}:transactionStatusUpdated`, {
|
|
@@ -2138,7 +2051,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2138
2051
|
];
|
|
2139
2052
|
}, _TransactionController_getLayer1GasFeeFlows = function _TransactionController_getLayer1GasFeeFlows() {
|
|
2140
2053
|
return [new OptimismLayer1GasFeeFlow_1.OptimismLayer1GasFeeFlow(), new ScrollLayer1GasFeeFlow_1.ScrollLayer1GasFeeFlow()];
|
|
2141
|
-
}, _TransactionController_updateTransactionInternal = function _TransactionController_updateTransactionInternal({ transactionId,
|
|
2054
|
+
}, _TransactionController_updateTransactionInternal = function _TransactionController_updateTransactionInternal({ transactionId, skipValidation, skipResimulateCheck, }, callback) {
|
|
2142
2055
|
let resimulateResponse;
|
|
2143
2056
|
this.update((state) => {
|
|
2144
2057
|
const index = state.transactions.findIndex(({ id }) => id === transactionId);
|
|
@@ -2155,10 +2068,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2155
2068
|
if (!skipResimulateCheck && __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this)) {
|
|
2156
2069
|
resimulateResponse = (0, ResimulateHelper_1.shouldResimulate)(originalTransactionMeta, transactionMeta);
|
|
2157
2070
|
}
|
|
2158
|
-
const shouldSkipHistory = __classPrivateFieldGet(this, _TransactionController_isHistoryDisabled, "f") || skipHistory;
|
|
2159
|
-
if (!shouldSkipHistory) {
|
|
2160
|
-
transactionMeta = (0, history_1.updateTransactionHistory)(transactionMeta, note ?? 'Transaction updated');
|
|
2161
|
-
}
|
|
2162
2071
|
state.transactions[index] = transactionMeta;
|
|
2163
2072
|
});
|
|
2164
2073
|
const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
|
|
@@ -2220,7 +2129,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2220
2129
|
}
|
|
2221
2130
|
const updatedTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
2222
2131
|
transactionId,
|
|
2223
|
-
note: 'TransactionController#updateSimulationData - Update simulation data',
|
|
2224
2132
|
skipResimulateCheck: Boolean(blockTime),
|
|
2225
2133
|
}, (txMeta) => {
|
|
2226
2134
|
txMeta.gasFeeTokens = gasFeeTokens;
|
|
@@ -2233,7 +2141,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2233
2141
|
(0, logger_1.projectLogger)('Updated simulation data', transactionId, updatedTransactionMeta);
|
|
2234
2142
|
await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_runAfterSimulateHook).call(this, updatedTransactionMeta);
|
|
2235
2143
|
}, _TransactionController_onGasFeePollerTransactionUpdate = function _TransactionController_onGasFeePollerTransactionUpdate({ transactionId, gasFeeEstimates, gasFeeEstimatesLoaded, layer1GasFee, }) {
|
|
2236
|
-
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId
|
|
2144
|
+
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId }, (txMeta) => {
|
|
2237
2145
|
(0, GasFeePoller_1.updateTransactionGasProperties)({
|
|
2238
2146
|
txMeta,
|
|
2239
2147
|
gasFeeEstimates,
|
|
@@ -2317,7 +2225,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2317
2225
|
}, _TransactionController_deleteTransaction = function _TransactionController_deleteTransaction(transactionId) {
|
|
2318
2226
|
this.update((state) => {
|
|
2319
2227
|
const transactions = state.transactions.filter(({ id }) => id !== transactionId);
|
|
2320
|
-
state.transactions =
|
|
2228
|
+
state.transactions = transactions;
|
|
2321
2229
|
});
|
|
2322
2230
|
}, _TransactionController_isRejectError = function _TransactionController_isRejectError(error) {
|
|
2323
2231
|
return [
|
|
@@ -2338,7 +2246,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2338
2246
|
try {
|
|
2339
2247
|
newTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
2340
2248
|
transactionId: transactionMeta.id,
|
|
2341
|
-
note: 'TransactionController#failTransaction - Add error message and set status to failed',
|
|
2342
2249
|
skipValidation: true,
|
|
2343
2250
|
}, (draftTransactionMeta) => {
|
|
2344
2251
|
draftTransactionMeta.status = types_1.TransactionStatus.failed;
|
|
@@ -2380,7 +2287,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2380
2287
|
const updatedTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
2381
2288
|
transactionId,
|
|
2382
2289
|
skipResimulateCheck: true,
|
|
2383
|
-
note: 'afterSimulate Hook',
|
|
2384
2290
|
}, (txMeta) => {
|
|
2385
2291
|
txMeta.txParamsOriginal = (0, lodash_1.cloneDeep)(txMeta.txParams);
|
|
2386
2292
|
updateTransaction(txMeta);
|