feat: Re-simulate focused transactions every 3000 ms #5189
+352
−24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@metamaskbot publish-preview |
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
|
@metamaskbot publish-preview |
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
jpuri
previously approved these changes
Jan 24, 2025
|
@metamaskbot publish-preview |
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
OGPoyraz
force-pushed
the
3922-re-simulate-transactions-for-every-new-block
branch
from
f159aea to
ea69888
Compare
|
@metamaskbot publish-preview |
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
OGPoyraz
changed the title
mcmire
reviewed
Jan 29, 2025
| @@ -1857,6 +1871,29 @@ export class TransactionController extends BaseController< | |||
| return this.getTransaction(txId); | |||
| } | |||
|
|
|||
| /** | |||
| * Update the isFocus state of a transaction. | |||
There was a problem hiding this comment.
This needs a new empty line after this to satisfy lint:
Suggested change
| * Update the isFocus state of a transaction. | |
| * Update the isFocus state of a transaction. | |
| } | ||
| }; | ||
|
|
||
| const intervalId = setInterval(listener, RESIMULATE_INTERVAL_MS); |
There was a problem hiding this comment.
This line is producing a lint warning because setInterval does not await the promise. Perhaps that is intentional and so we need to disable the rule?
Suggested change
| const intervalId = setInterval(listener, RESIMULATE_INTERVAL_MS); | |
| // eslint-disable-next-line @typescript-eslint/no-misused-promises | |
| const intervalId = setInterval(listener, RESIMULATE_INTERVAL_MS); |
Comment on lines
+32
to
+44
| updateSimulationData: (transactionMeta: TransactionMeta) => void; | ||
| }; | ||
|
|
||
| export class ResimulateHelper { | ||
| // Map of transactionId <=> isActive | ||
| readonly #activeResimulations: Map<string, boolean> = new Map(); | ||
|
|
||
| // Map of transactionId <=> intervalId | ||
| readonly #intervalIds: Map<string, NodeJS.Timeout> = new Map(); | ||
|
|
||
| readonly #getTransactions: () => TransactionMeta[]; | ||
|
|
||
| readonly #updateSimulationData: (transactionMeta: TransactionMeta) => void; |
There was a problem hiding this comment.
Does updateSimulationData need to expect a function that returns a Promise?
Suggested change
| updateSimulationData: (transactionMeta: TransactionMeta) => void; | |
| }; | |
| export class ResimulateHelper { | |
| // Map of transactionId <=> isActive | |
| readonly #activeResimulations: Map<string, boolean> = new Map(); | |
| // Map of transactionId <=> intervalId | |
| readonly #intervalIds: Map<string, NodeJS.Timeout> = new Map(); | |
| readonly #getTransactions: () => TransactionMeta[]; | |
| readonly #updateSimulationData: (transactionMeta: TransactionMeta) => void; | |
| updateSimulationData: (transactionMeta: TransactionMeta) => Promise<void>; | |
| }; | |
| export class ResimulateHelper { | |
| // Map of transactionId <=> isActive | |
| readonly #activeResimulations: Map<string, boolean> = new Map(); | |
| // Map of transactionId <=> intervalId | |
| readonly #intervalIds: Map<string, NodeJS.Timeout> = new Map(); | |
| readonly #getTransactions: () => TransactionMeta[]; | |
| readonly #updateSimulationData: (transactionMeta: TransactionMeta) => Promise<void>; |
| @@ -86,7 +86,7 @@ import { | |||
| getTransactionLayer1GasFee, | |||
| updateTransactionLayer1GasFee, | |||
| } from './utils/layer1-gas-fee-flow'; | |||
| import { shouldResimulate } from './utils/resimulate'; | |||
| import { shouldResimulate } from './helpers/ResimulateHelper'; | |||
There was a problem hiding this comment.
In order to keep the list of imports sorted and satisfy lint, this line should be moved up to go below the following line:
import { PendingTransactionTracker } from './helpers/PendingTransactionTracker';
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Explanation
This PR adds
ResimulateHelper, which focuses ontransactionMeta.isFocusedproperty and re-simulates transaction depending on that value.In order to capsulate re-simulation logic, this PR also relocates other utility functions under the new created
ResimulationHelper.tsfile.References
Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3922
Extension PR: MetaMask/metamask-extension#29878
Changelog
@metamask/transaction-controllerisFocusedproperty ontransactionMetaisFocusedproperty is expected to set by client.isFocusedistrue.updateTransactionFocusfunction to update theisFocusedproperty ontransactionMeta.Checklist