@metamask-previews/transaction-controller 66.0.1-preview-e37aff3 → 66.0.1-preview-c5f8cd0af
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 +23 -0
- package/dist/TransactionController-method-action-types.cjs.map +1 -1
- package/dist/TransactionController-method-action-types.d.cts +1 -25
- package/dist/TransactionController-method-action-types.d.cts.map +1 -1
- package/dist/TransactionController-method-action-types.d.mts +1 -25
- package/dist/TransactionController-method-action-types.d.mts.map +1 -1
- package/dist/TransactionController-method-action-types.mjs.map +1 -1
- package/dist/TransactionController.cjs +32 -191
- package/dist/TransactionController.cjs.map +1 -1
- package/dist/TransactionController.d.cts +12 -89
- package/dist/TransactionController.d.cts.map +1 -1
- package/dist/TransactionController.d.mts +12 -89
- package/dist/TransactionController.d.mts.map +1 -1
- package/dist/TransactionController.mjs +32 -191
- package/dist/TransactionController.mjs.map +1 -1
- package/dist/api/accounts-api.cjs +1 -42
- package/dist/api/accounts-api.cjs.map +1 -1
- package/dist/api/accounts-api.d.cts +0 -51
- package/dist/api/accounts-api.d.cts.map +1 -1
- package/dist/api/accounts-api.d.mts +0 -51
- package/dist/api/accounts-api.d.mts.map +1 -1
- package/dist/api/accounts-api.mjs +0 -40
- package/dist/api/accounts-api.mjs.map +1 -1
- package/dist/helpers/MultichainTrackingHelper.cjs +27 -7
- package/dist/helpers/MultichainTrackingHelper.cjs.map +1 -1
- package/dist/helpers/MultichainTrackingHelper.d.cts +0 -1
- package/dist/helpers/MultichainTrackingHelper.d.cts.map +1 -1
- package/dist/helpers/MultichainTrackingHelper.d.mts +0 -1
- package/dist/helpers/MultichainTrackingHelper.d.mts.map +1 -1
- package/dist/helpers/MultichainTrackingHelper.mjs +27 -7
- package/dist/helpers/MultichainTrackingHelper.mjs.map +1 -1
- package/dist/helpers/PendingTransactionTracker.cjs +4 -82
- package/dist/helpers/PendingTransactionTracker.cjs.map +1 -1
- package/dist/helpers/PendingTransactionTracker.d.cts +1 -3
- package/dist/helpers/PendingTransactionTracker.d.cts.map +1 -1
- package/dist/helpers/PendingTransactionTracker.d.mts +1 -3
- package/dist/helpers/PendingTransactionTracker.d.mts.map +1 -1
- package/dist/helpers/PendingTransactionTracker.mjs +5 -83
- package/dist/helpers/PendingTransactionTracker.mjs.map +1 -1
- package/dist/index.cjs +1 -3
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +3 -4
- package/dist/index.d.cts.map +1 -1
- package/dist/index.d.mts +3 -4
- 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 +0 -15
- package/dist/types.d.cts.map +1 -1
- package/dist/types.d.mts +0 -15
- package/dist/types.d.mts.map +1 -1
- package/dist/types.mjs.map +1 -1
- package/dist/utils/feature-flags.cjs +14 -33
- package/dist/utils/feature-flags.cjs.map +1 -1
- package/dist/utils/feature-flags.d.cts +1 -25
- package/dist/utils/feature-flags.d.cts.map +1 -1
- package/dist/utils/feature-flags.d.mts +1 -25
- package/dist/utils/feature-flags.d.mts.map +1 -1
- package/dist/utils/feature-flags.mjs +13 -30
- package/dist/utils/feature-flags.mjs.map +1 -1
- package/dist/utils/prepare.cjs +8 -4
- package/dist/utils/prepare.cjs.map +1 -1
- package/dist/utils/prepare.d.cts +5 -4
- package/dist/utils/prepare.d.cts.map +1 -1
- package/dist/utils/prepare.d.mts +5 -4
- package/dist/utils/prepare.d.mts.map +1 -1
- package/dist/utils/prepare.mjs +8 -4
- package/dist/utils/prepare.mjs.map +1 -1
- package/package.json +1 -1
- package/dist/helpers/AccountsApiRemoteTransactionSource.cjs +0 -159
- package/dist/helpers/AccountsApiRemoteTransactionSource.cjs.map +0 -1
- package/dist/helpers/AccountsApiRemoteTransactionSource.d.cts +0 -12
- package/dist/helpers/AccountsApiRemoteTransactionSource.d.cts.map +0 -1
- package/dist/helpers/AccountsApiRemoteTransactionSource.d.mts +0 -12
- package/dist/helpers/AccountsApiRemoteTransactionSource.d.mts.map +0 -1
- package/dist/helpers/AccountsApiRemoteTransactionSource.mjs +0 -159
- package/dist/helpers/AccountsApiRemoteTransactionSource.mjs.map +0 -1
- package/dist/helpers/IncomingTransactionHelper.cjs +0 -306
- package/dist/helpers/IncomingTransactionHelper.cjs.map +0 -1
- package/dist/helpers/IncomingTransactionHelper.d.cts +0 -45
- package/dist/helpers/IncomingTransactionHelper.d.cts.map +0 -1
- package/dist/helpers/IncomingTransactionHelper.d.mts +0 -45
- package/dist/helpers/IncomingTransactionHelper.d.mts.map +0 -1
- package/dist/helpers/IncomingTransactionHelper.mjs +0 -299
- package/dist/helpers/IncomingTransactionHelper.mjs.map +0 -1
|
@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _TransactionController_instances, _TransactionController_afterAdd,
|
|
13
|
+
var _TransactionController_instances, _TransactionController_afterAdd, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_beforeSign, _TransactionController_gasFeeFlows, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_getSimulationConfig, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isEIP7702GasFeeTokensEnabled, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isSimulationEnabled, _TransactionController_isSwapsDisabled, _TransactionController_isTimeoutEnabled, _TransactionController_layer1GasFeeFlows, _TransactionController_methodDataHelper, _TransactionController_multichainTrackingHelper, _TransactionController_publicKeyEIP7702, _TransactionController_publish, _TransactionController_publishBatchHook, _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_trimTransactionsForState, _TransactionController_isFinalState, _TransactionController_isLocalFinalState, _TransactionController_requestApproval, _TransactionController_getTransaction, _TransactionController_getTransactionOrThrow, _TransactionController_getApprovalId, _TransactionController_isTransactionCompleted, _TransactionController_generateDappSuggestedGasFees, _TransactionController_addExternalTransaction, _TransactionController_markNonceDuplicatesDropped, _TransactionController_setTransactionStatusDropped, _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_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_publishTransactionForRetry, _TransactionController_isTransactionAlreadyConfirmedError, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_isBalanceChangesSkipped, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_onGasFeePollerTransactionBatchUpdate, _TransactionController_updateTransactionBatch, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow, _TransactionController_failTransaction, _TransactionController_defaultPublishHook, _TransactionController_getGasFeeTokens;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.TransactionController = exports.ApprovalState = exports.SPEED_UP_RATE = exports.CANCEL_RATE = void 0;
|
|
16
16
|
const base_controller_1 = require("@metamask/base-controller");
|
|
@@ -31,9 +31,7 @@ const OptimismLayer1GasFeeFlow_1 = require("./gas-flows/OptimismLayer1GasFeeFlow
|
|
|
31
31
|
const RandomisedEstimationsGasFeeFlow_1 = require("./gas-flows/RandomisedEstimationsGasFeeFlow.cjs");
|
|
32
32
|
const ScrollLayer1GasFeeFlow_1 = require("./gas-flows/ScrollLayer1GasFeeFlow.cjs");
|
|
33
33
|
const TestGasFeeFlow_1 = require("./gas-flows/TestGasFeeFlow.cjs");
|
|
34
|
-
const AccountsApiRemoteTransactionSource_1 = require("./helpers/AccountsApiRemoteTransactionSource.cjs");
|
|
35
34
|
const GasFeePoller_1 = require("./helpers/GasFeePoller.cjs");
|
|
36
|
-
const IncomingTransactionHelper_1 = require("./helpers/IncomingTransactionHelper.cjs");
|
|
37
35
|
const MethodDataHelper_1 = require("./helpers/MethodDataHelper.cjs");
|
|
38
36
|
const MultichainTrackingHelper_1 = require("./helpers/MultichainTrackingHelper.cjs");
|
|
39
37
|
const PendingTransactionTracker_1 = require("./helpers/PendingTransactionTracker.cjs");
|
|
@@ -153,13 +151,10 @@ const MESSENGER_EXPOSED_METHODS = [
|
|
|
153
151
|
'isAtomicBatchSupported',
|
|
154
152
|
'setTransactionActive',
|
|
155
153
|
'speedUpTransaction',
|
|
156
|
-
'startIncomingTransactionPolling',
|
|
157
|
-
'stopIncomingTransactionPolling',
|
|
158
154
|
'stopTransaction',
|
|
159
155
|
'updateAtomicBatchData',
|
|
160
156
|
'updateCustodialTransaction',
|
|
161
157
|
'updateEditableParams',
|
|
162
|
-
'updateIncomingTransactions',
|
|
163
158
|
'updatePreviousGasParams',
|
|
164
159
|
'updateRequiredTransactionIds',
|
|
165
160
|
'updateSecurityAlertResponse',
|
|
@@ -178,7 +173,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
178
173
|
* @param options - The controller options.
|
|
179
174
|
*/
|
|
180
175
|
constructor(options) {
|
|
181
|
-
const { disableSwaps,
|
|
176
|
+
const { disableSwaps, getPermittedAccounts, getSavedGasFees, getSimulationConfig, hooks, isAutomaticGasFeeUpdateEnabled, isEIP7702GasFeeTokensEnabled, isFirstTimeInteractionEnabled, isSimulationEnabled, isTimeoutEnabled, messenger, publicKeyEIP7702, state, testGasFeeFlows, trace, } = options;
|
|
182
177
|
super({
|
|
183
178
|
name: controllerName,
|
|
184
179
|
metadata,
|
|
@@ -190,24 +185,14 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
190
185
|
});
|
|
191
186
|
_TransactionController_instances.add(this);
|
|
192
187
|
_TransactionController_afterAdd.set(this, void 0);
|
|
193
|
-
_TransactionController_afterSign.set(this, void 0);
|
|
194
|
-
_TransactionController_afterSimulate.set(this, void 0);
|
|
195
188
|
_TransactionController_approvingTransactionIds.set(this, new Set());
|
|
196
189
|
_TransactionController_beforeCheckPendingTransaction.set(this, void 0);
|
|
197
190
|
_TransactionController_beforePublish.set(this, void 0);
|
|
198
191
|
_TransactionController_beforeSign.set(this, void 0);
|
|
199
192
|
_TransactionController_gasFeeFlows.set(this, void 0);
|
|
200
|
-
_TransactionController_getAdditionalSignArguments.set(this, void 0);
|
|
201
|
-
_TransactionController_getCurrentAccountEIP1559Compatibility.set(this, void 0);
|
|
202
|
-
_TransactionController_getCurrentNetworkEIP1559Compatibility.set(this, void 0);
|
|
203
|
-
_TransactionController_getExternalPendingTransactions.set(this, void 0);
|
|
204
|
-
_TransactionController_getGasFeeEstimates.set(this, void 0);
|
|
205
|
-
_TransactionController_getNetworkState.set(this, void 0);
|
|
206
193
|
_TransactionController_getPermittedAccounts.set(this, void 0);
|
|
207
194
|
_TransactionController_getSavedGasFees.set(this, void 0);
|
|
208
195
|
_TransactionController_getSimulationConfig.set(this, void 0);
|
|
209
|
-
_TransactionController_incomingTransactionHelper.set(this, void 0);
|
|
210
|
-
_TransactionController_incomingTransactionOptions.set(this, void 0);
|
|
211
196
|
_TransactionController_internalEvents.set(this, new events_1.EventEmitter());
|
|
212
197
|
_TransactionController_isAutomaticGasFeeUpdateEnabled.set(this, void 0);
|
|
213
198
|
_TransactionController_isEIP7702GasFeeTokensEnabled.set(this, void 0);
|
|
@@ -218,12 +203,9 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
218
203
|
_TransactionController_layer1GasFeeFlows.set(this, void 0);
|
|
219
204
|
_TransactionController_methodDataHelper.set(this, void 0);
|
|
220
205
|
_TransactionController_multichainTrackingHelper.set(this, void 0);
|
|
221
|
-
_TransactionController_pendingTransactionOptions.set(this, void 0);
|
|
222
206
|
_TransactionController_publicKeyEIP7702.set(this, void 0);
|
|
223
207
|
_TransactionController_publish.set(this, void 0);
|
|
224
208
|
_TransactionController_publishBatchHook.set(this, void 0);
|
|
225
|
-
_TransactionController_securityProviderRequest.set(this, void 0);
|
|
226
|
-
_TransactionController_sign.set(this, void 0);
|
|
227
209
|
_TransactionController_signAbortCallbacks.set(this, new Map());
|
|
228
210
|
_TransactionController_skipSimulationTransactionIds.set(this, new Set());
|
|
229
211
|
_TransactionController_testGasFeeFlows.set(this, void 0);
|
|
@@ -233,9 +215,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
233
215
|
});
|
|
234
216
|
this.messenger = messenger;
|
|
235
217
|
__classPrivateFieldSet(this, _TransactionController_afterAdd, hooks?.afterAdd ?? (() => Promise.resolve({})), "f");
|
|
236
|
-
__classPrivateFieldSet(this, _TransactionController_afterSign, hooks?.afterSign ?? (() => true), "f");
|
|
237
|
-
__classPrivateFieldSet(this, _TransactionController_afterSimulate, hooks?.afterSimulate ??
|
|
238
|
-
(() => Promise.resolve({})), "f");
|
|
239
218
|
__classPrivateFieldSet(this, _TransactionController_beforeCheckPendingTransaction,
|
|
240
219
|
/* istanbul ignore next */
|
|
241
220
|
hooks?.beforeCheckPendingTransaction ??
|
|
@@ -243,20 +222,10 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
243
222
|
__classPrivateFieldSet(this, _TransactionController_beforePublish, hooks?.beforePublish ?? (() => Promise.resolve(true)), "f");
|
|
244
223
|
__classPrivateFieldSet(this, _TransactionController_beforeSign, hooks?.beforeSign ??
|
|
245
224
|
(() => Promise.resolve({})), "f");
|
|
246
|
-
__classPrivateFieldSet(this, _TransactionController_getAdditionalSignArguments, hooks?.getAdditionalSignArguments ??
|
|
247
|
-
(() => []), "f");
|
|
248
|
-
__classPrivateFieldSet(this, _TransactionController_getCurrentAccountEIP1559Compatibility, getCurrentAccountEIP1559Compatibility ??
|
|
249
|
-
(() => Promise.resolve(true)), "f");
|
|
250
|
-
__classPrivateFieldSet(this, _TransactionController_getCurrentNetworkEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, "f");
|
|
251
|
-
__classPrivateFieldSet(this, _TransactionController_getExternalPendingTransactions, getExternalPendingTransactions ?? (() => []), "f");
|
|
252
|
-
__classPrivateFieldSet(this, _TransactionController_getGasFeeEstimates, getGasFeeEstimates ??
|
|
253
|
-
(() => Promise.resolve({})), "f");
|
|
254
|
-
__classPrivateFieldSet(this, _TransactionController_getNetworkState, getNetworkState, "f");
|
|
255
225
|
__classPrivateFieldSet(this, _TransactionController_getPermittedAccounts, getPermittedAccounts, "f");
|
|
256
226
|
__classPrivateFieldSet(this, _TransactionController_getSavedGasFees, getSavedGasFees ?? ((_chainId) => undefined), "f");
|
|
257
227
|
__classPrivateFieldSet(this, _TransactionController_getSimulationConfig, getSimulationConfig ??
|
|
258
228
|
(() => Promise.resolve({})), "f");
|
|
259
|
-
__classPrivateFieldSet(this, _TransactionController_incomingTransactionOptions, incomingTransactions, "f");
|
|
260
229
|
__classPrivateFieldSet(this, _TransactionController_isAutomaticGasFeeUpdateEnabled, isAutomaticGasFeeUpdateEnabled ??
|
|
261
230
|
((_txMeta) => false), "f");
|
|
262
231
|
__classPrivateFieldSet(this, _TransactionController_isEIP7702GasFeeTokensEnabled, isEIP7702GasFeeTokensEnabled ??
|
|
@@ -264,14 +233,11 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
264
233
|
__classPrivateFieldSet(this, _TransactionController_isFirstTimeInteractionEnabled, isFirstTimeInteractionEnabled ?? (() => true), "f");
|
|
265
234
|
__classPrivateFieldSet(this, _TransactionController_isSimulationEnabled, isSimulationEnabled ?? (() => true), "f");
|
|
266
235
|
__classPrivateFieldSet(this, _TransactionController_isSwapsDisabled, disableSwaps ?? false, "f");
|
|
267
|
-
__classPrivateFieldSet(this, _TransactionController_isTimeoutEnabled,
|
|
268
|
-
__classPrivateFieldSet(this, _TransactionController_pendingTransactionOptions, pendingTransactions, "f");
|
|
236
|
+
__classPrivateFieldSet(this, _TransactionController_isTimeoutEnabled, isTimeoutEnabled ?? (() => true), "f");
|
|
269
237
|
__classPrivateFieldSet(this, _TransactionController_publicKeyEIP7702, publicKeyEIP7702, "f");
|
|
270
238
|
__classPrivateFieldSet(this, _TransactionController_publish, hooks?.publish ??
|
|
271
239
|
(() => Promise.resolve({ transactionHash: undefined })), "f");
|
|
272
240
|
__classPrivateFieldSet(this, _TransactionController_publishBatchHook, hooks?.publishBatch, "f");
|
|
273
|
-
__classPrivateFieldSet(this, _TransactionController_securityProviderRequest, securityProviderRequest, "f");
|
|
274
|
-
__classPrivateFieldSet(this, _TransactionController_sign, sign, "f");
|
|
275
241
|
__classPrivateFieldSet(this, _TransactionController_testGasFeeFlows, testGasFeeFlows === true, "f");
|
|
276
242
|
__classPrivateFieldSet(this, _TransactionController_trace, trace ?? ((_request, fn) => fn?.()), "f");
|
|
277
243
|
const findNetworkClientIdByChainId = (chainId) => {
|
|
@@ -282,7 +248,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
282
248
|
getNetworkClientById: ((networkClientId) => {
|
|
283
249
|
return this.messenger.call(`NetworkController:getNetworkClientById`, networkClientId);
|
|
284
250
|
}),
|
|
285
|
-
getNetworkClientRegistry,
|
|
251
|
+
getNetworkClientRegistry: (() => this.messenger.call('NetworkController:getNetworkClientRegistry')),
|
|
286
252
|
removePendingTransactionTrackerListeners: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_removePendingTransactionTrackerListeners).bind(this),
|
|
287
253
|
createNonceTracker: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createNonceTracker).bind(this),
|
|
288
254
|
createPendingTransactionTracker: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createPendingTransactionTracker).bind(this),
|
|
@@ -290,12 +256,11 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
290
256
|
this.messenger.subscribe('NetworkController:stateChange', listener);
|
|
291
257
|
},
|
|
292
258
|
}), "f");
|
|
293
|
-
__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").initialize();
|
|
294
259
|
__classPrivateFieldSet(this, _TransactionController_gasFeeFlows, __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGasFeeFlows).call(this), "f");
|
|
295
260
|
__classPrivateFieldSet(this, _TransactionController_layer1GasFeeFlows, __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getLayer1GasFeeFlows).call(this), "f");
|
|
296
261
|
const gasFeePoller = new GasFeePoller_1.GasFeePoller({
|
|
297
262
|
gasFeeFlows: __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"),
|
|
298
|
-
getGasFeeControllerEstimates:
|
|
263
|
+
getGasFeeControllerEstimates: (gasFeeOpts) => this.messenger.call('GasFeeController:fetchGasFeeEstimates', gasFeeOpts),
|
|
299
264
|
getTransactions: () => this.state.transactions,
|
|
300
265
|
getTransactionBatches: () => this.state.transactionBatches,
|
|
301
266
|
layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
|
|
@@ -315,18 +280,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
315
280
|
_state.methodData[fourBytePrefix] = methodData;
|
|
316
281
|
});
|
|
317
282
|
});
|
|
318
|
-
__classPrivateFieldSet(this, _TransactionController_incomingTransactionHelper, new IncomingTransactionHelper_1.IncomingTransactionHelper({
|
|
319
|
-
client: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").client,
|
|
320
|
-
getCurrentAccount: () => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getSelectedAccount).call(this),
|
|
321
|
-
getLocalTransactions: () => this.state.transactions,
|
|
322
|
-
includeTokenTransfers: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").includeTokenTransfers,
|
|
323
|
-
isEnabled: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").isEnabled,
|
|
324
|
-
messenger: this.messenger,
|
|
325
|
-
remoteTransactionSource: new AccountsApiRemoteTransactionSource_1.AccountsApiRemoteTransactionSource(),
|
|
326
|
-
trimTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).bind(this),
|
|
327
|
-
updateTransactions: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").updateTransactions,
|
|
328
|
-
}), "f");
|
|
329
|
-
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addIncomingTransactionHelperListeners).call(this, __classPrivateFieldGet(this, _TransactionController_incomingTransactionHelper, "f"));
|
|
330
283
|
// when transactionsController state changes
|
|
331
284
|
// check for pending transactions and start polling if there are any
|
|
332
285
|
this.messenger.subscribe('TransactionController:stateChange', __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f"));
|
|
@@ -369,7 +322,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
369
322
|
return await (0, batch_1.addTransactionBatch)({
|
|
370
323
|
addTransaction: this.addTransaction.bind(this),
|
|
371
324
|
estimateGas: this.estimateGas.bind(this),
|
|
372
|
-
getGasFeeEstimates:
|
|
325
|
+
getGasFeeEstimates: (options) => this.messenger.call('GasFeeController:fetchGasFeeEstimates', options),
|
|
373
326
|
getInternalAccounts: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getInternalAccounts).bind(this),
|
|
374
327
|
getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f").bind(this),
|
|
375
328
|
getPendingTransactionTracker: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createPendingTransactionTracker).call(this, {
|
|
@@ -412,7 +365,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
412
365
|
*/
|
|
413
366
|
async addTransaction(txParams, options) {
|
|
414
367
|
(0, logger_1.projectLogger)('Adding transaction', txParams, options);
|
|
415
|
-
const { actionId, assetsFiatValues, batchId, deviceConfirmedOn, disableGasBuffer, gasFeeToken, excludeNativeTokenForFee, isGasFeeIncluded, isGasFeeSponsored, isInternal = false, isStateOnly,
|
|
368
|
+
const { actionId, assetsFiatValues, batchId, deviceConfirmedOn, disableGasBuffer, gasFeeToken, excludeNativeTokenForFee, isGasFeeIncluded, isGasFeeSponsored, isInternal = false, isStateOnly, nestedTransactions, networkClientId, origin, publishHook, requestId, requiredAssets, requireApproval, securityAlertResponse, skipInitialGasEstimate, swaps = {}, traceContext, type, } = options;
|
|
416
369
|
// eslint-disable-next-line no-param-reassign
|
|
417
370
|
txParams = (0, utils_2.normalizeTransactionParams)(txParams);
|
|
418
371
|
if (!__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
|
|
@@ -524,12 +477,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
524
477
|
})
|
|
525
478
|
.catch(lodash_1.noop);
|
|
526
479
|
}
|
|
527
|
-
// Set security provider response
|
|
528
|
-
if (method && __classPrivateFieldGet(this, _TransactionController_securityProviderRequest, "f")) {
|
|
529
|
-
const securityProviderResponse = await __classPrivateFieldGet(this, _TransactionController_securityProviderRequest, "f").call(this, addedTransactionMeta, method);
|
|
530
|
-
// eslint-disable-next-line require-atomic-updates
|
|
531
|
-
addedTransactionMeta.securityProviderResponse = securityProviderResponse;
|
|
532
|
-
}
|
|
533
480
|
addedTransactionMeta = (0, swaps_1.updateSwapsTransaction)(addedTransactionMeta, transactionType, swaps, {
|
|
534
481
|
isSwapsDisabled: __classPrivateFieldGet(this, _TransactionController_isSwapsDisabled, "f"),
|
|
535
482
|
cancelTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_rejectTransaction).bind(this),
|
|
@@ -581,27 +528,6 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
581
528
|
transactionMeta: addedTransactionMeta,
|
|
582
529
|
};
|
|
583
530
|
}
|
|
584
|
-
/**
|
|
585
|
-
* Starts polling for incoming transactions from the remote transaction source.
|
|
586
|
-
*/
|
|
587
|
-
startIncomingTransactionPolling() {
|
|
588
|
-
__classPrivateFieldGet(this, _TransactionController_incomingTransactionHelper, "f").start();
|
|
589
|
-
}
|
|
590
|
-
/**
|
|
591
|
-
* Stops polling for incoming transactions from the remote transaction source.
|
|
592
|
-
*/
|
|
593
|
-
stopIncomingTransactionPolling() {
|
|
594
|
-
__classPrivateFieldGet(this, _TransactionController_incomingTransactionHelper, "f").stop();
|
|
595
|
-
}
|
|
596
|
-
/**
|
|
597
|
-
* Update the incoming transactions by polling the remote transaction source.
|
|
598
|
-
*
|
|
599
|
-
* @param request - Request object.
|
|
600
|
-
* @param request.tags - Additional tags to identify the source of the request.
|
|
601
|
-
*/
|
|
602
|
-
async updateIncomingTransactions({ tags, } = {}) {
|
|
603
|
-
await __classPrivateFieldGet(this, _TransactionController_incomingTransactionHelper, "f").update({ tags });
|
|
604
|
-
}
|
|
605
531
|
/**
|
|
606
532
|
* Attempts to cancel a transaction based on its ID by setting its status to "rejected"
|
|
607
533
|
* and emitting a `<tx.id>:finished` hub event.
|
|
@@ -1053,7 +979,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
1053
979
|
chainId,
|
|
1054
980
|
});
|
|
1055
981
|
const initialTxAsEthTx = (0, prepare_1.prepareTransaction)(chainId, initialTx);
|
|
1056
|
-
const initialTxAsSerializedHex = (0, prepare_1.serializeTransaction)(initialTxAsEthTx);
|
|
982
|
+
const initialTxAsSerializedHex = (0, prepare_1.serializeTransaction)(chainId, initialTxAsEthTx);
|
|
1057
983
|
if (__classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").has(initialTxAsSerializedHex)) {
|
|
1058
984
|
return '';
|
|
1059
985
|
}
|
|
@@ -1241,9 +1167,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
1241
1167
|
};
|
|
1242
1168
|
// Guaranteed as the default gas fee flow matches all transactions.
|
|
1243
1169
|
const gasFeeFlow = (0, gas_flow_1.getGasFeeFlow)(transactionMeta, __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"), this.messenger);
|
|
1244
|
-
const gasFeeControllerData = await
|
|
1245
|
-
networkClientId,
|
|
1246
|
-
});
|
|
1170
|
+
const gasFeeControllerData = await this.messenger.call('GasFeeController:fetchGasFeeEstimates', { networkClientId });
|
|
1247
1171
|
return gasFeeFlow.getGasFees({
|
|
1248
1172
|
gasFeeControllerData,
|
|
1249
1173
|
messenger: this.messenger,
|
|
@@ -1476,7 +1400,7 @@ class TransactionController extends base_controller_1.BaseController {
|
|
|
1476
1400
|
}
|
|
1477
1401
|
}
|
|
1478
1402
|
exports.TransactionController = TransactionController;
|
|
1479
|
-
_TransactionController_afterAdd = new WeakMap(),
|
|
1403
|
+
_TransactionController_afterAdd = new WeakMap(), _TransactionController_approvingTransactionIds = new WeakMap(), _TransactionController_beforeCheckPendingTransaction = new WeakMap(), _TransactionController_beforePublish = new WeakMap(), _TransactionController_beforeSign = new WeakMap(), _TransactionController_gasFeeFlows = new WeakMap(), _TransactionController_getPermittedAccounts = new WeakMap(), _TransactionController_getSavedGasFees = new WeakMap(), _TransactionController_getSimulationConfig = 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_isTimeoutEnabled = new WeakMap(), _TransactionController_layer1GasFeeFlows = new WeakMap(), _TransactionController_methodDataHelper = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_publicKeyEIP7702 = new WeakMap(), _TransactionController_publish = new WeakMap(), _TransactionController_publishBatchHook = 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, }) {
|
|
1480
1404
|
if (gasValues) {
|
|
1481
1405
|
// Not good practice to reassign a parameter but temporarily avoiding a larger refactor.
|
|
1482
1406
|
// eslint-disable-next-line no-param-reassign
|
|
@@ -1489,16 +1413,12 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
|
|
|
1489
1413
|
if (!transactionMeta) {
|
|
1490
1414
|
return;
|
|
1491
1415
|
}
|
|
1492
|
-
/* istanbul ignore next */
|
|
1493
|
-
if (!__classPrivateFieldGet(this, _TransactionController_sign, "f")) {
|
|
1494
|
-
throw new Error('No sign method defined.');
|
|
1495
|
-
}
|
|
1496
1416
|
const newTxParams = (0, retry_1.getTransactionParamsWithIncreasedGasFee)(transactionMeta.txParams, rate, gasValues);
|
|
1497
1417
|
prepareTransactionParams?.(newTxParams);
|
|
1498
1418
|
const unsignedEthTx = (0, prepare_1.prepareTransaction)(transactionMeta.chainId, newTxParams);
|
|
1499
|
-
const
|
|
1500
|
-
const transactionMetaWithRsv = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionMetaRSV).call(this, transactionMeta,
|
|
1501
|
-
const rawTx = (0, prepare_1.serializeTransaction)(
|
|
1419
|
+
const signedTxData = await this.messenger.call('KeyringController:signTransaction', unsignedEthTx, transactionMeta.txParams.from);
|
|
1420
|
+
const transactionMetaWithRsv = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionMetaRSV).call(this, transactionMeta, signedTxData);
|
|
1421
|
+
const rawTx = (0, prepare_1.serializeTransaction)(transactionMeta.chainId, signedTxData);
|
|
1502
1422
|
const newFee = newTxParams.maxFeePerGas ?? newTxParams.gasPrice;
|
|
1503
1423
|
const oldFee = newTxParams.maxFeePerGas
|
|
1504
1424
|
? transactionMetaWithRsv.txParams.maxFeePerGas
|
|
@@ -1537,9 +1457,6 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
|
|
|
1537
1457
|
});
|
|
1538
1458
|
afterSubmit?.(newTransactionMeta);
|
|
1539
1459
|
}, _TransactionController_signExternalTransaction = async function _TransactionController_signExternalTransaction(chainId, transactionParams) {
|
|
1540
|
-
if (!__classPrivateFieldGet(this, _TransactionController_sign, "f")) {
|
|
1541
|
-
throw new Error('No sign method defined.');
|
|
1542
|
-
}
|
|
1543
1460
|
const normalizedTransactionParams = (0, utils_2.normalizeTransactionParams)(transactionParams);
|
|
1544
1461
|
const type = (0, utils_2.isEIP1559Transaction)(normalizedTransactionParams)
|
|
1545
1462
|
? types_1.TransactionEnvelopeType.feeMarket
|
|
@@ -1552,8 +1469,8 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
|
|
|
1552
1469
|
};
|
|
1553
1470
|
const { from } = updatedTransactionParams;
|
|
1554
1471
|
const unsignedTransaction = (0, prepare_1.prepareTransaction)(chainId, updatedTransactionParams);
|
|
1555
|
-
const
|
|
1556
|
-
const rawTransaction = (0, prepare_1.serializeTransaction)(
|
|
1472
|
+
const signedTxData = await this.messenger.call('KeyringController:signTransaction', unsignedTransaction, from);
|
|
1473
|
+
const rawTransaction = (0, prepare_1.serializeTransaction)(chainId, signedTxData);
|
|
1557
1474
|
return rawTransaction;
|
|
1558
1475
|
}, _TransactionController_addMetadata = function _TransactionController_addMetadata(transactionMeta) {
|
|
1559
1476
|
(0, validation_1.validateTxParams)(transactionMeta.txParams);
|
|
@@ -1572,7 +1489,7 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
|
|
|
1572
1489
|
await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Gas Fees', parentContext: traceContext }, async () => await (0, gas_fees_1.updateGasFees)({
|
|
1573
1490
|
eip1559: isEIP1559Compatible,
|
|
1574
1491
|
gasFeeFlows: __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"),
|
|
1575
|
-
getGasFeeEstimates:
|
|
1492
|
+
getGasFeeEstimates: (options) => this.messenger.call('GasFeeController:fetchGasFeeEstimates', options),
|
|
1576
1493
|
getSavedGasFees: __classPrivateFieldGet(this, _TransactionController_getSavedGasFees, "f").bind(this),
|
|
1577
1494
|
messenger: this.messenger,
|
|
1578
1495
|
txMeta: transactionMeta,
|
|
@@ -1705,11 +1622,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
1705
1622
|
let transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId);
|
|
1706
1623
|
(0, logger_1.projectLogger)('Approving transaction', transactionMeta);
|
|
1707
1624
|
try {
|
|
1708
|
-
if (!
|
|
1709
|
-
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failTransaction).call(this, transactionMeta, new Error('No sign method defined.'));
|
|
1710
|
-
return ApprovalState.NotApproved;
|
|
1711
|
-
}
|
|
1712
|
-
else if (!transactionMeta.chainId) {
|
|
1625
|
+
if (!transactionMeta.chainId) {
|
|
1713
1626
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failTransaction).call(this, transactionMeta, new Error('No chainId defined.'));
|
|
1714
1627
|
return ApprovalState.NotApproved;
|
|
1715
1628
|
}
|
|
@@ -1848,8 +1761,11 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
1848
1761
|
});
|
|
1849
1762
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, updatedTransactionMeta);
|
|
1850
1763
|
}, _TransactionController_trimTransactionsForState = function _TransactionController_trimTransactionsForState(transactions) {
|
|
1851
|
-
const nonceNetworkSet = new Set();
|
|
1852
1764
|
const transactionHistoryLimit = (0, feature_flags_1.getTransactionHistoryLimit)(this.messenger);
|
|
1765
|
+
if (transactionHistoryLimit === undefined) {
|
|
1766
|
+
return transactions;
|
|
1767
|
+
}
|
|
1768
|
+
const nonceNetworkSet = new Set();
|
|
1853
1769
|
const txsToKeep = [...transactions]
|
|
1854
1770
|
.sort((a, b) => (a.time > b.time ? -1 : 1)) // Descending time order
|
|
1855
1771
|
.filter((tx) => {
|
|
@@ -1916,39 +1832,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
1916
1832
|
}
|
|
1917
1833
|
const isCompleted = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isLocalFinalState).call(this, transaction.status);
|
|
1918
1834
|
return { meta: transaction, isCompleted };
|
|
1919
|
-
}, _TransactionController_onIncomingTransactions = function _TransactionController_onIncomingTransactions(transactions) {
|
|
1920
|
-
if (!transactions.length) {
|
|
1921
|
-
return;
|
|
1922
|
-
}
|
|
1923
|
-
const finalTransactions = [];
|
|
1924
|
-
for (const tx of transactions) {
|
|
1925
|
-
const { chainId } = tx;
|
|
1926
|
-
try {
|
|
1927
|
-
const networkClientId = (0, provider_1.getNetworkClientId)({
|
|
1928
|
-
messenger: this.messenger,
|
|
1929
|
-
chainId,
|
|
1930
|
-
});
|
|
1931
|
-
finalTransactions.push({
|
|
1932
|
-
...tx,
|
|
1933
|
-
networkClientId,
|
|
1934
|
-
});
|
|
1935
|
-
}
|
|
1936
|
-
catch (error) {
|
|
1937
|
-
(0, logger_1.projectLogger)('Failed to get network client ID for incoming transaction', {
|
|
1938
|
-
chainId,
|
|
1939
|
-
error,
|
|
1940
|
-
});
|
|
1941
|
-
}
|
|
1942
|
-
}
|
|
1943
|
-
this.update((state) => {
|
|
1944
|
-
const { transactions: currentTransactions } = state;
|
|
1945
|
-
state.transactions = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).call(this, [
|
|
1946
|
-
...finalTransactions,
|
|
1947
|
-
...currentTransactions,
|
|
1948
|
-
]);
|
|
1949
|
-
(0, logger_1.projectLogger)('Added incoming transactions to state', finalTransactions.length, finalTransactions);
|
|
1950
|
-
});
|
|
1951
|
-
this.messenger.publish(`${controllerName}:incomingTransactionsReceived`, finalTransactions);
|
|
1952
1835
|
}, _TransactionController_generateDappSuggestedGasFees = function _TransactionController_generateDappSuggestedGasFees(txParams, origin, isInternal) {
|
|
1953
1836
|
if (isInternal || !origin) {
|
|
1954
1837
|
return undefined;
|
|
@@ -2045,13 +1928,11 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2045
1928
|
if (value === undefined || value === null) {
|
|
2046
1929
|
continue;
|
|
2047
1930
|
}
|
|
2048
|
-
transactionMetaWithRsv[key] = (0, utils_1.add0x)(value.toString(16));
|
|
1931
|
+
transactionMetaWithRsv[key] = (0, utils_1.add0x)(BigInt(value).toString(16));
|
|
2049
1932
|
}
|
|
2050
1933
|
return transactionMetaWithRsv;
|
|
2051
1934
|
}, _TransactionController_getEIP1559Compatibility = async function _TransactionController_getEIP1559Compatibility(networkClientId) {
|
|
2052
|
-
|
|
2053
|
-
const currentAccountIsEIP1559Compatible = await __classPrivateFieldGet(this, _TransactionController_getCurrentAccountEIP1559Compatibility, "f").call(this);
|
|
2054
|
-
return (currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible);
|
|
1935
|
+
return ((await this.messenger.call('NetworkController:getEIP1559Compatibility', networkClientId)) ?? false);
|
|
2055
1936
|
}, _TransactionController_signTransaction = async function _TransactionController_signTransaction(originalTransactionMeta) {
|
|
2056
1937
|
let transactionMeta = originalTransactionMeta;
|
|
2057
1938
|
const { id: transactionId } = transactionMeta;
|
|
@@ -2093,29 +1974,23 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2093
1974
|
const unsignedEthTx = (0, prepare_1.prepareTransaction)(chainId, finalTxParams);
|
|
2094
1975
|
__classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").add(transactionId);
|
|
2095
1976
|
(0, logger_1.projectLogger)('Signing transaction', finalTxParams);
|
|
2096
|
-
const
|
|
2097
|
-
|
|
1977
|
+
const signedTxData = await new Promise((resolve, reject) => {
|
|
1978
|
+
// eslint-disable-next-line promise/catch-or-return
|
|
1979
|
+
this.messenger
|
|
1980
|
+
.call('KeyringController:signTransaction', unsignedEthTx, from)
|
|
1981
|
+
.then(resolve, reject);
|
|
2098
1982
|
__classPrivateFieldGet(this, _TransactionController_signAbortCallbacks, "f").set(transactionId, () => reject(new Error('Signing aborted by user')));
|
|
2099
1983
|
});
|
|
2100
1984
|
__classPrivateFieldGet(this, _TransactionController_signAbortCallbacks, "f").delete(transactionId);
|
|
2101
|
-
if (!signedTx) {
|
|
2102
|
-
(0, logger_1.projectLogger)('Skipping signed status as no signed transaction');
|
|
2103
|
-
return undefined;
|
|
2104
|
-
}
|
|
2105
1985
|
const transactionMetaFromHook = (0, lodash_1.cloneDeep)(finalTransactionMeta);
|
|
2106
|
-
if (!__classPrivateFieldGet(this, _TransactionController_afterSign, "f").call(this, transactionMetaFromHook, signedTx)) {
|
|
2107
|
-
this.updateTransaction(transactionMetaFromHook, 'TransactionController#signTransaction - Update after sign');
|
|
2108
|
-
(0, logger_1.projectLogger)('Skipping signed status based on hook');
|
|
2109
|
-
return undefined;
|
|
2110
|
-
}
|
|
2111
1986
|
const transactionMetaWithRsv = {
|
|
2112
|
-
...__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionMetaRSV).call(this, transactionMetaFromHook,
|
|
1987
|
+
...__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionMetaRSV).call(this, transactionMetaFromHook, signedTxData),
|
|
2113
1988
|
status: types_1.TransactionStatus.signed,
|
|
2114
1989
|
txParams: finalTxParams,
|
|
2115
1990
|
};
|
|
2116
1991
|
this.updateTransaction(transactionMetaWithRsv, 'TransactionController#approveTransaction - Transaction signed');
|
|
2117
1992
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, transactionMetaWithRsv);
|
|
2118
|
-
const rawTx = (0, prepare_1.serializeTransaction)(
|
|
1993
|
+
const rawTx = (0, prepare_1.serializeTransaction)(chainId, signedTxData);
|
|
2119
1994
|
const transactionMetaWithRawTx = (0, lodash_1.merge)({}, transactionMetaWithRsv, {
|
|
2120
1995
|
rawTx,
|
|
2121
1996
|
});
|
|
@@ -2179,20 +2054,14 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2179
2054
|
hooks: {
|
|
2180
2055
|
beforeCheckPendingTransaction: __classPrivateFieldGet(this, _TransactionController_beforeCheckPendingTransaction, "f").bind(this),
|
|
2181
2056
|
},
|
|
2182
|
-
isResubmitEnabled: __classPrivateFieldGet(this, _TransactionController_pendingTransactionOptions, "f").isResubmitEnabled,
|
|
2183
2057
|
isTimeoutEnabled: __classPrivateFieldGet(this, _TransactionController_isTimeoutEnabled, "f"),
|
|
2184
2058
|
messenger: this.messenger,
|
|
2185
2059
|
networkClientId,
|
|
2186
|
-
publishTransaction: (transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, transactionMeta, {
|
|
2187
|
-
skipSubmitHistory: true,
|
|
2188
|
-
}),
|
|
2189
2060
|
});
|
|
2190
2061
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addPendingTransactionTrackerListeners).call(this, pendingTransactionTracker);
|
|
2191
2062
|
return pendingTransactionTracker;
|
|
2192
2063
|
}, _TransactionController_stopAllTracking = function _TransactionController_stopAllTracking() {
|
|
2193
2064
|
__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").stopAllTracking();
|
|
2194
|
-
}, _TransactionController_addIncomingTransactionHelperListeners = function _TransactionController_addIncomingTransactionHelperListeners(incomingTransactionHelper) {
|
|
2195
|
-
incomingTransactionHelper.hub.on('transactions', __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onIncomingTransactions).bind(this));
|
|
2196
2065
|
}, _TransactionController_removePendingTransactionTrackerListeners = function _TransactionController_removePendingTransactionTrackerListeners(pendingTransactionTracker) {
|
|
2197
2066
|
pendingTransactionTracker.hub.removeAllListeners('transaction-confirmed');
|
|
2198
2067
|
pendingTransactionTracker.hub.removeAllListeners('transaction-dropped');
|
|
@@ -2209,8 +2078,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2209
2078
|
types_1.TransactionStatus.signed,
|
|
2210
2079
|
types_1.TransactionStatus.submitted,
|
|
2211
2080
|
], address, chainId);
|
|
2212
|
-
|
|
2213
|
-
return [...standardPendingTransactions, ...externalPendingTransactions];
|
|
2081
|
+
return standardPendingTransactions;
|
|
2214
2082
|
}, _TransactionController_publishTransactionForRetry = async function _TransactionController_publishTransactionForRetry(transactionMeta) {
|
|
2215
2083
|
try {
|
|
2216
2084
|
return await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, transactionMeta);
|
|
@@ -2339,7 +2207,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2339
2207
|
}
|
|
2340
2208
|
});
|
|
2341
2209
|
(0, logger_1.projectLogger)('Updated simulation data', transactionId, updatedTransactionMeta);
|
|
2342
|
-
await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_runAfterSimulateHook).call(this, updatedTransactionMeta);
|
|
2343
2210
|
}, _TransactionController_onGasFeePollerTransactionUpdate = function _TransactionController_onGasFeePollerTransactionUpdate({ transactionId, gasFeeEstimates, gasFeeEstimatesLoaded, layer1GasFee, }) {
|
|
2344
2211
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId }, (txMeta) => {
|
|
2345
2212
|
(0, GasFeePoller_1.updateTransactionGasProperties)({
|
|
@@ -2364,8 +2231,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2364
2231
|
const updated = callback(batch);
|
|
2365
2232
|
state.transactionBatches[index] = updated ?? batch;
|
|
2366
2233
|
});
|
|
2367
|
-
}, _TransactionController_getSelectedAccount = function _TransactionController_getSelectedAccount() {
|
|
2368
|
-
return this.messenger.call('AccountsController:getSelectedAccount');
|
|
2369
2234
|
}, _TransactionController_getInternalAccounts = function _TransactionController_getInternalAccounts() {
|
|
2370
2235
|
const state = this.messenger.call('AccountsController:getState');
|
|
2371
2236
|
return Object.values(state.internalAccounts?.accounts ?? {})
|
|
@@ -2373,7 +2238,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2373
2238
|
.map((account) => account.address);
|
|
2374
2239
|
}, _TransactionController_updateSubmitHistory = function _TransactionController_updateSubmitHistory(transactionMeta, hash) {
|
|
2375
2240
|
const { chainId, networkClientId, origin, rawTx, txParams } = transactionMeta;
|
|
2376
|
-
const { networkConfigurationsByChainId } =
|
|
2241
|
+
const { networkConfigurationsByChainId } = this.messenger.call('NetworkController:getState');
|
|
2377
2242
|
const networkConfiguration = networkConfigurationsByChainId[chainId];
|
|
2378
2243
|
const endpoint = networkConfiguration?.rpcEndpoints.find((currentEndpoint) => currentEndpoint.networkClientId === networkClientId);
|
|
2379
2244
|
const networkUrl = endpoint?.url;
|
|
@@ -2472,30 +2337,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
|
|
|
2472
2337
|
__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, newTransactionMeta);
|
|
2473
2338
|
this.messenger.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
|
|
2474
2339
|
__classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, newTransactionMeta);
|
|
2475
|
-
}, _TransactionController_runAfterSimulateHook = async function _TransactionController_runAfterSimulateHook(transactionMeta) {
|
|
2476
|
-
(0, logger_1.projectLogger)('Calling afterSimulate hook', transactionMeta);
|
|
2477
|
-
const { id: transactionId } = transactionMeta;
|
|
2478
|
-
const result = await __classPrivateFieldGet(this, _TransactionController_afterSimulate, "f").call(this, {
|
|
2479
|
-
transactionMeta,
|
|
2480
|
-
});
|
|
2481
|
-
const { skipSimulation, updateTransaction } = result ?? {};
|
|
2482
|
-
if (skipSimulation) {
|
|
2483
|
-
__classPrivateFieldGet(this, _TransactionController_skipSimulationTransactionIds, "f").add(transactionId);
|
|
2484
|
-
}
|
|
2485
|
-
else if (skipSimulation === false) {
|
|
2486
|
-
__classPrivateFieldGet(this, _TransactionController_skipSimulationTransactionIds, "f").delete(transactionId);
|
|
2487
|
-
}
|
|
2488
|
-
if (!updateTransaction) {
|
|
2489
|
-
return;
|
|
2490
|
-
}
|
|
2491
|
-
const updatedTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
|
|
2492
|
-
transactionId,
|
|
2493
|
-
skipResimulateCheck: true,
|
|
2494
|
-
}, (txMeta) => {
|
|
2495
|
-
txMeta.txParamsOriginal = (0, lodash_1.cloneDeep)(txMeta.txParams);
|
|
2496
|
-
updateTransaction(txMeta);
|
|
2497
|
-
});
|
|
2498
|
-
(0, logger_1.projectLogger)('Updated transaction with afterSimulate data', updatedTransactionMeta);
|
|
2499
2340
|
}, _TransactionController_defaultPublishHook = async function _TransactionController_defaultPublishHook({ networkClientId, publishHookOverride, traceContext, }, transactionMeta, signedTx) {
|
|
2500
2341
|
let transactionHash;
|
|
2501
2342
|
await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Publish', parentContext: traceContext }, async () => {
|