Enable the flag exactOptionalPropertyTypes

src/ComposableController.ts

@@ -59,7 +59,10 @@ export class ComposableController extends BaseController<never, any> {
     );
     this.initialize();
     this.controllers = controllers;
-    this.messagingSystem = messenger;
+    if (messenger) {
+      this.messagingSystem = messenger;
+    }
+
     this.controllers.forEach((controller) => {
       const { name } = controller;
       if ((controller as BaseController<any, any>).subscribe !== undefined) {

src/ControllerMessenger.ts

@@ -620,8 +620,8 @@ export class ControllerMessenger<
     >({
       controllerMessenger: this,
       name,
-      allowedActions,
-      allowedEvents,
+      ...(allowedActions ? { allowedActions } : {}),
+      ...(allowedEvents ? { allowedEvents } : {}),
     });
   }
 }

src/assets/CollectiblesController.ts

@@ -1069,7 +1069,9 @@ export class CollectiblesController extends BaseController<
       }
     }
 
-    collectible.isCurrentlyOwned = isOwned;
+    if (isOwned) {
+      collectible.isCurrentlyOwned = isOwned;
+    }
 
     if (batch === true) {
       return collectible;
@@ -1084,7 +1086,9 @@ export class CollectiblesController extends BaseController<
         item.address.toLowerCase() === address.toLowerCase(),
     );
     if (collectibleToUpdate) {
-      collectibleToUpdate.isCurrentlyOwned = isOwned;
+      if (isOwned) {
+        collectibleToUpdate.isCurrentlyOwned = isOwned;
+      }
       this.updateNestedCollectibleState(
         collectibles,
         ALL_COLLECTIBLES_STATE_KEY,

src/assets/TokensController.ts

@@ -218,7 +218,13 @@ export class TokensController extends BaseController<
       address = toChecksumHexAddress(address);
       const { tokens, ignoredTokens } = this.state;
       const isERC721 = await this._detectIsERC721(address);
-      const newEntry: Token = { address, symbol, decimals, image, isERC721 };
+      const newEntry: Token = {
+        address,
+        symbol,
+        decimals,
+        ...(image ? { image } : {}),
+        isERC721,
+      };
       const previousEntry = tokens.find(
         (token) => token.address.toLowerCase() === address.toLowerCase(),
       );
@@ -276,8 +282,8 @@ export class TokensController extends BaseController<
           address: checksumAddress,
           symbol,
           decimals,
-          image,
-          isERC721,
+          ...(image ? { image } : {}),
+          ...(isERC721 ? { isERC721 } : {}),
         };
         const previousEntry = tokens.find(
           (token) =>

src/gas/GasFeeController.test.ts

@@ -185,7 +185,7 @@ describe('GasFeeController', () => {
       getCurrentNetworkEIP1559Compatibility: getIsEIP1559Compatible, // change this for networkController.state.properties.isEIP1559Compatible ???
       legacyAPIEndpoint,
       EIP1559APIEndpoint,
-      clientId,
+      ...(clientId ? { clientId } : {}),
     });
   }
 

src/gas/GasFeeController.ts

@@ -328,7 +328,10 @@ export class GasFeeController extends BaseController<
     this.currentChainId = this.getChainId();
     const provider = getProvider();
     this.ethQuery = new EthQuery(provider);
-    this.clientId = clientId;
+    if (clientId) {
+      this.clientId = clientId;
+    }
+
     onNetworkStateChange(async () => {
       const newProvider = getProvider();
       const newChainId = this.getChainId();

src/keyring/KeyringController.test.ts

@@ -756,10 +756,7 @@ describe('KeyringController', () => {
           maxFeePerGas: '0x2540be400',
           maxPriorityFeePerGas: '0x3b9aca00',
           nonce: '0x68',
-          r: undefined,
-          s: undefined,
           to: '0x0c54fccd2e384b4bb6f2e405bf5cbc15a017aafb',
-          v: undefined,
           value: '0x0',
           type: 2,
         },

src/keyring/KeyringController.ts

@@ -188,7 +188,9 @@ export class KeyringController extends BaseController<
     this.syncIdentities = syncIdentities;
     this.updateIdentities = updateIdentities;
     this.setSelectedAddress = setSelectedAddress;
-    this.setAccountLabel = setAccountLabel;
+    if (setAccountLabel) {
+      this.setAccountLabel = setAccountLabel;
+    }
     this.initialize();
     this.fullUpdate();
   }

src/message-manager/MessageManager.ts

@@ -111,7 +111,7 @@ export class MessageManager extends AbstractMessageManager<
    * @returns The id of the newly created message.
    */
   addUnapprovedMessage(messageParams: MessageParams, req?: OriginalRequest) {
-    if (req) {
+    if (req?.origin) {
       messageParams.origin = req.origin;
     }
     messageParams.data = normalizeMessageData(messageParams.data);

src/message-manager/PersonalMessageManager.ts

@@ -115,7 +115,7 @@ export class PersonalMessageManager extends AbstractMessageManager<
     messageParams: PersonalMessageParams,
     req?: OriginalRequest,
   ) {
-    if (req) {
+    if (req?.origin) {
       messageParams.origin = req.origin;
     }
     messageParams.data = normalizeMessageData(messageParams.data);

src/message-manager/TypedMessageManager.ts

@@ -152,7 +152,7 @@ export class TypedMessageManager extends AbstractMessageManager<
       metamaskId: messageId,
       version,
     };
-    if (req) {
+    if (req?.origin) {
       messageParams.origin = req.origin;
     }
     const messageData: TypedMessage = {

src/network/NetworkController.ts

@@ -308,7 +308,11 @@ export class NetworkController extends BaseController<
     this.update({
       provider: {
         ...this.state.provider,
-        ...{ type: RPC, ticker, rpcTarget, chainId, nickname },
+        type: RPC,
+        rpcTarget,
+        chainId,
+        ...(ticker ? { ticker } : {}),
+        ...(nickname ? { nickname } : {}),
       },
     });
     this.refreshNetwork();

src/permissions/PermissionController.ts

@@ -1582,7 +1582,7 @@ export class PermissionController<
       );
 
       const permissionOptions = {
-        caveats,
+        ...(caveats ? { caveats } : {}),
         invoker: origin,
         target: targetName,
       };

src/permissions/errors.ts

@@ -14,7 +14,7 @@ export function unauthorized(opts: UnauthorizedArg) {
   return ethErrors.provider.unauthorized({
     message:
       'Unauthorized to perform action. Try requesting the required permission(s) first. For more information, see: https://docs.metamask.io/guide/rpc-api.html#permissions',
-    data: opts.data,
+    ...(opts.data ? { data: opts.data } : {}),
   });
 }
 
@@ -47,10 +47,7 @@ type InvalidParamsArg = {
  * @returns The built error
  */
 export function invalidParams(opts: InvalidParamsArg) {
-  return ethErrors.rpc.invalidParams({
-    data: opts.data,
-    message: opts.message,
-  });
+  return ethErrors.rpc.invalidParams(opts);
 }
 
 /**
@@ -76,7 +73,10 @@ export function internalError<Data extends Record<string, unknown>>(
   message: string,
   data?: Data,
 ): EthereumRpcError<Data> {
-  return ethErrors.rpc.internal({ message, data });
+  return ethErrors.rpc.internal({
+    ...(message ? { message } : {}),
+    ...(data ? { data } : {}),
+  });
 }
 
 export class InvalidSubjectIdentifierError extends Error {

src/transaction/TransactionController.ts

@@ -508,11 +508,11 @@ export class TransactionController extends BaseController<
       id: random(),
       networkID: network,
       chainId: provider.chainId,
-      origin,
+      ...(origin ? { origin } : {}),
       status: TransactionStatus.unapproved as TransactionStatus.unapproved,
       time: Date.now(),
       transaction,
-      deviceConfirmedOn,
+      ...(deviceConfirmedOn ? { deviceConfirmedOn } : {}),
       verifiedOnBlockchain: false,
     };
 
@@ -591,7 +591,7 @@ export class TransactionController extends BaseController<
     }
 
     const customChainParams = {
-      name,
+      ...(name ? { name } : {}),
       chainId: parseInt(chainId, undefined),
       networkId: parseInt(networkId, undefined),
     };
@@ -978,10 +978,9 @@ export class TransactionController extends BaseController<
       return { gas: '0x5208', gasPrice };
     }
 
-    // if data, should be hex string format
-    estimatedTransaction.data = !data
-      ? data
-      : /* istanbul ignore next */ addHexPrefix(data);
+    if (data) {
+      estimatedTransaction.data = addHexPrefix(data);
+    }
 
     // 3. If this is a contract address, safely estimate gas using RPC
     estimatedTransaction.value =

src/transaction/mocks/txsMock.ts

@@ -465,7 +465,6 @@ export const txsInStateWithOutdatedGasDataMock = (
       data: '0x',
       gas: '624874',
       gasPrice: '20000000000',
-      gasUsed: undefined,
       nonce: '0x12',
       to: '0x881d40237659c251811cec9c364ef91dc08d300c',
       value: '0x0',
@@ -483,7 +482,6 @@ export const txsInStateWithOutdatedGasDataMock = (
       data: '0x',
       gas: '0x51d68',
       gasPrice: '0x2540be400',
-      gasUsed: undefined,
       nonce: '0x12',
       to: '0x6bf137f335ea1b8f193b8f6ea92561a60d23a207',
       value: '100000000000000000',
@@ -507,7 +505,6 @@ export const txsInStateWithOutdatedStatusAndGasDataMock = (
       data: '0x',
       gas: '624874',
       gasPrice: '20000000000',
-      gasUsed: undefined,
       nonce: '0x12',
       to: '0x881d40237659c251811cec9c364ef91dc08d300c',
       value: '0x0',
@@ -525,7 +522,6 @@ export const txsInStateWithOutdatedStatusAndGasDataMock = (
       data: '0x',
       gas: '0x51d68',
       gasPrice: '0x2540be400',
-      gasUsed: undefined,
       nonce: '0x12',
       to: '0x6bf137f335ea1b8f193b8f6ea92561a60d23a207',
       value: '100000000000000000',

src/user/PreferencesController.ts

@@ -245,11 +245,22 @@ export class PreferencesController extends BaseController<
     }
     const newFrequestRpc: FrequentRpc = {
       rpcUrl: url,
-      chainId,
-      ticker,
-      nickname,
-      rpcPrefs,
     };
+    if (chainId) {
+      newFrequestRpc.chainId = chainId;
+    }
+
+    if (ticker) {
+      newFrequestRpc.ticker = ticker;
+    }
+
+    if (nickname) {
+      newFrequestRpc.nickname = nickname;
+    }
+
+    if (rpcPrefs) {
+      newFrequestRpc.rpcPrefs = rpcPrefs;
+    }
     frequentRpcList.push(newFrequestRpc);
     this.update({ frequentRpcList: [...frequentRpcList] });
   }

src/util.ts

@@ -844,7 +844,7 @@ export function getIpfsCIDv1AndPath(ipfsUrl: string): {
   // because most cid v0s appear to be incompatible with IPFS subdomains
   return {
     cid: CID.parse(cid).toV1().toString(),
-    path,
+    ...(path ? { path } : {}),
   };
 }
 

tsconfig.json

@@ -2,6 +2,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "esModuleInterop": true,
+    "exactOptionalPropertyTypes": true,
     "inlineSources": true,
     "module": "commonjs",
     "moduleResolution": "node",