Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/transaction-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Extend `isSimulationEnabled` option to accept an optional `TransactionMeta` argument, enabling callback consumers to inspect the relevant transaction ([#9800](https://github.com/MetaMask/core/pull/9800))

## [69.5.1]

### Changed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2662,6 +2662,30 @@ describe('TransactionController', () => {
});
});

it('passes the transaction meta to the isSimulationEnabled callback', async () => {
const isSimulationEnabled = jest.fn().mockReturnValue(true);

const { controller } = setupController({
options: { isSimulationEnabled },
});

const { transactionMeta } = await controller.addTransaction(
{
from: ACCOUNT_MOCK,
to: ACCOUNT_MOCK,
},
{
networkClientId: NETWORK_CLIENT_ID_MOCK,
},
);

await flushPromises();

expect(isSimulationEnabled).toHaveBeenCalledWith(
expect.objectContaining({ id: transactionMeta.id }),
);
});

it('unless approval not required', async () => {
getBalanceChangesMock.mockResolvedValueOnce({
simulationData: SIMULATION_DATA_RESULT_MOCK,
Expand Down
10 changes: 5 additions & 5 deletions packages/transaction-controller/src/TransactionController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ export type TransactionControllerOptions = {
isFirstTimeInteractionEnabled?: () => boolean;

/** Whether new transactions will be automatically simulated. */
isSimulationEnabled?: () => boolean;
isSimulationEnabled?: (transactionMeta?: TransactionMeta) => boolean;

/** Whether timeout checking is enabled for a transaction. */
isTimeoutEnabled?: (transactionMeta: TransactionMeta) => boolean;
Expand Down Expand Up @@ -750,7 +750,7 @@ export class TransactionController extends BaseController<

readonly #isFirstTimeInteractionEnabled: () => boolean;

readonly #isSimulationEnabled: () => boolean;
readonly #isSimulationEnabled: (transactionMeta?: TransactionMeta) => boolean;

readonly #isSwapsDisabled: boolean;

Expand Down Expand Up @@ -4039,7 +4039,7 @@ export class TransactionController extends BaseController<
validateTxParams(transactionMeta.txParams);
}

if (!skipResimulateCheck && this.#isSimulationEnabled()) {
if (!skipResimulateCheck && this.#isSimulationEnabled(transactionMeta)) {
resimulateResponse = shouldResimulate(
originalTransactionMeta,
transactionMeta,
Expand Down Expand Up @@ -4109,7 +4109,7 @@ export class TransactionController extends BaseController<
this.#simulationRequestTokens.set(transactionId, simulationRequestToken);

try {
const isSimulationEnabled = this.#isSimulationEnabled();
const isSimulationEnabled = this.#isSimulationEnabled(transactionMeta);
const isBalanceChangesSkipped =
this.#isBalanceChangesSkipped(transactionMeta);

Expand Down Expand Up @@ -4327,7 +4327,7 @@ export class TransactionController extends BaseController<

await updateGas({
isCustomNetwork,
isSimulationEnabled: this.#isSimulationEnabled(),
isSimulationEnabled: this.#isSimulationEnabled(transactionMeta),
getSimulationConfig: this.#getSimulationConfig,
messenger: this.messenger,
txMeta: transactionMeta,
Expand Down
2 changes: 1 addition & 1 deletion packages/transaction-controller/src/utils/batch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ type AddTransactionBatchRequest = {
) => PendingTransactionTracker;
getSimulationConfig: GetSimulationConfig;
getTransaction: (id: string) => TransactionMeta;
isSimulationEnabled: () => boolean;
isSimulationEnabled: (transactionMeta?: TransactionMeta) => boolean;
messenger: TransactionControllerMessenger;
publishBatchHook?: PublishBatchHook;
publishTransaction: (transactionMeta: TransactionMeta) => Promise<Hex>;
Expand Down