Remove infuraKeySecret from constructor

MetaMask · Mar 26, 2024 · 14be4d0 · 14be4d0
1 parent 831fa3a
commit 14be4d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/packages/gas-fee-controller/src/GasFeeController.test.ts b/packages/gas-fee-controller/src/GasFeeController.test.ts
@@ -228,15 +228,13 @@ describe('GasFeeController', () => {
    * @param options.interval - The polling interval.
    * @param options.state - The initial GasFeeController state
    * @param options.infuraAPIKey - The Infura API key.
-   * @param options.infuraAPIKeySecret - The Infura API key secret.
    */
   async function setupGasFeeController({
     getIsEIP1559Compatible = jest.fn().mockResolvedValue(true),
     getCurrentNetworkLegacyGasAPICompatibility = jest
       .fn()
       .mockReturnValue(false),
     infuraAPIKey = 'INFURA_API_KEY',
-    infuraAPIKeySecret = 'INFURA_API_KEY_SECRET',
     clientId,
     getChainId,
     networkControllerState = {},
@@ -251,7 +249,6 @@ describe('GasFeeController', () => {
     state?: GasFeeState;
     interval?: number;
     infuraAPIKey?: string;
-    infuraAPIKeySecret?: string;
   } = {}) {
     const controllerMessenger = getControllerMessenger();
     networkController = await setupNetworkController({
@@ -270,7 +267,6 @@ describe('GasFeeController', () => {
       clientId,
       interval,
       infuraAPIKey,
-      infuraAPIKeySecret,
     });
   }
 

diff --git a/packages/gas-fee-controller/src/GasFeeController.ts b/packages/gas-fee-controller/src/GasFeeController.ts
@@ -305,7 +305,6 @@ export class GasFeeController extends StaticIntervalPollingController<
    * @param options.clientId - The client ID used to identify to the gas estimation API who is
    * asking for estimates.
    * @param options.infuraAPIKey - The Infura API key used for infura API requests.
-   * @param options.infuraAPIKeySecret - The Infura API key secret used for infura API requests.
    */
   constructor({
     interval = 15000,
@@ -319,7 +318,6 @@ export class GasFeeController extends StaticIntervalPollingController<
     onNetworkDidChange,
     clientId,
     infuraAPIKey,
-    infuraAPIKeySecret,
   }: {
     interval?: number;
     messenger: GasFeeMessenger;
@@ -332,7 +330,6 @@ export class GasFeeController extends StaticIntervalPollingController<
     onNetworkDidChange?: (listener: (state: NetworkState) => void) => void;
     clientId?: string;
     infuraAPIKey: string;
-    infuraAPIKeySecret: string;
   }) {
     super({
       name,
@@ -353,10 +350,7 @@ export class GasFeeController extends StaticIntervalPollingController<
     this.EIP1559APIEndpoint = `${GAS_API_BASE_URL}/networks/<chain_id>/suggestedGasFees`;
     this.legacyAPIEndpoint = `${GAS_API_BASE_URL}/networks/<chain_id>/gasPrices`;
     this.clientId = clientId;
-    this.infuraAuthToken = buildInfuraAuthToken(
-      infuraAPIKey,
-      infuraAPIKeySecret,
-    );
+    this.infuraAuthToken = buildInfuraAuthToken(infuraAPIKey);
 
     this.ethQuery = new EthQuery(this.#getProvider());
 

diff --git a/packages/gas-fee-controller/src/gas-util.ts b/packages/gas-fee-controller/src/gas-util.ts
@@ -196,16 +196,11 @@ export function calculateTimeEstimate(
  * Build an infura auth token from the given API key and secret.
  *
  * @param infuraAPIKey - The Infura API key.
- * @param infuraAPIKeySecret - The Infura API key secret.
  * @returns The base64 encoded auth token.
  */
-export function buildInfuraAuthToken(
-  infuraAPIKey: string,
-  infuraAPIKeySecret: string,
-) {
-  return Buffer.from(`${infuraAPIKey}:${infuraAPIKeySecret}`).toString(
-    'base64',
-  );
+export function buildInfuraAuthToken(infuraAPIKey: string) {
+  // We intentionally leave the password empty, as Infura does not require one
+  return Buffer.from(`${infuraAPIKey}:`).toString('base64');
 }
 
 /**