Skip to content

feat(transaction-controller): pass isInternal: true at internal call sites #42275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
matthewwalsh0 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(transaction-controller): pass isInternal: true at internal call sites #42275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion app/scripts/messenger-client-init/bridge-status-controller-init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,15 @@ export const BridgeStatusControllerInit: MessengerClientInitFunction<
isGasFeeSponsored: false,
isGasFeeIncluded: false,
disable7702: true,
isInternal: true,
},
...rest,
);
}
return transactionController.addTransactionBatch(request, ...rest);
return transactionController.addTransactionBatch(
{ ...request, isInternal: true },
...rest,
);
},

config: {
Expand Down
8 changes: 5 additions & 3 deletions app/scripts/messenger-client-init/messengers/static-assets-controller-messenger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
import type { ControllerGetStateAction } from '@metamask/base-controller';
import { Messenger, MessengerEvents } from '@metamask/messenger';
import type { NetworkControllerFindNetworkClientIdByChainIdAction } from '@metamask/network-controller';
import { AccountsControllerGetSelectedAccountAction } from '@metamask/accounts-controller';
import {
TokensControllerState,
TokensControllerAddTokensAction,
} from '@metamask/assets-controllers';
import { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';

import { RootMessenger } from '../../lib/messenger';
import { type StaticAssetsControllerMessenger as StaticAssetsControllerMessengerType } from '../../controllers/static-assets-controller';
import {
type StaticAssetsControllerMessenger as StaticAssetsControllerMessengerType,
type StaticAssetsControllerActions,
} from '../../controllers/static-assets-controller';

type TokensControllerGetStateAction = ControllerGetStateAction<
'TokensController',
TokensControllerState
>;

type AllowedActions =
| AccountsControllerGetSelectedAccountAction
| StaticAssetsControllerActions
| NetworkControllerFindNetworkClientIdByChainIdAction
| TokensControllerGetStateAction
| TokensControllerAddTokensAction;
Expand Down
5 changes: 3 additions & 2 deletions app/scripts/metamask-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3377,7 +3377,7 @@ export default class MetamaskController extends EventEmitter {
addTransaction(
this.getAddTransactionRequest({
transactionParams,
transactionOptions,
transactionOptions: { ...transactionOptions, isInternal: true },
waitForSubmit: false,
}),
),
Expand All @@ -3388,7 +3388,7 @@ export default class MetamaskController extends EventEmitter {
addTransaction(
this.getAddTransactionRequest({
transactionParams,
transactionOptions,
transactionOptions: { ...transactionOptions, isInternal: true },
waitForSubmit: true,
}),
),
Expand Down Expand Up @@ -9793,6 +9793,7 @@ export default class MetamaskController extends EventEmitter {
transactionParams,
transactionOptions: {
...options,
isInternal: true,
origin: 'metamask',
requireApproval: true,
},
Expand Down
Loading
Loading