From dd8341168462008e2e4adb99bc9f7691a123a9c8 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Thu, 6 Jun 2024 23:12:36 +0000 Subject: [PATCH 01/14] test(transaction-controller): refactor provider injection to lookup table --- .../src/TransactionController.test.ts | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index 213fb8dc7c..24e1db9e3e 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -306,12 +306,15 @@ function waitForTransactionFinished( const MOCK_PREFERENCES = { state: { selectedAddress: 'foo' } }; const INFURA_PROJECT_ID = '341eacb578dd44a1a049cbc5f6fd4035'; -const MAINNET_PROVIDER = new HttpProvider( - `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, -); -const PALM_PROVIDER = new HttpProvider( - `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, -); +const HTTP_PROVIDERS = { + goerli: new HttpProvider(`https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`), + mainnet: new HttpProvider(`https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`), + palm: new HttpProvider(`https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`), + /* + linea: new HttpProvider(`https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`), + linea_goerli: new HttpProvider(`https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`), + */ +} type MockNetwork = { chainId: Hex; @@ -323,8 +326,8 @@ type MockNetwork = { const MOCK_NETWORK: MockNetwork = { chainId: ChainId.goerli, - provider: MAINNET_PROVIDER, - blockTracker: buildMockBlockTracker('0x102833C', MAINNET_PROVIDER), + provider: HTTP_PROVIDERS.goerli, + blockTracker: buildMockBlockTracker('0x102833C', HTTP_PROVIDERS.mainnet), state: { selectedNetworkClientId: NetworkType.goerli, networksMetadata: { @@ -345,8 +348,8 @@ const MOCK_NETWORK: MockNetwork = { const MOCK_MAINNET_NETWORK: MockNetwork = { chainId: ChainId.mainnet, - provider: MAINNET_PROVIDER, - blockTracker: buildMockBlockTracker('0x102833C', MAINNET_PROVIDER), + provider: HTTP_PROVIDERS.mainnet, + blockTracker: buildMockBlockTracker('0x102833C', HTTP_PROVIDERS.mainnet), state: { selectedNetworkClientId: NetworkType.mainnet, networksMetadata: { @@ -367,8 +370,8 @@ const MOCK_MAINNET_NETWORK: MockNetwork = { const MOCK_LINEA_MAINNET_NETWORK: MockNetwork = { chainId: ChainId['linea-mainnet'], - provider: PALM_PROVIDER, - blockTracker: buildMockBlockTracker('0xA6EDFC', PALM_PROVIDER), + provider: HTTP_PROVIDERS.palm, + blockTracker: buildMockBlockTracker('0xA6EDFC', HTTP_PROVIDERS.palm), state: { selectedNetworkClientId: NetworkType['linea-mainnet'], networksMetadata: { @@ -389,8 +392,8 @@ const MOCK_LINEA_MAINNET_NETWORK: MockNetwork = { const MOCK_LINEA_GOERLI_NETWORK: MockNetwork = { chainId: ChainId['linea-goerli'], - provider: PALM_PROVIDER, - blockTracker: buildMockBlockTracker('0xA6EDFC', PALM_PROVIDER), + provider: HTTP_PROVIDERS.palm, + blockTracker: buildMockBlockTracker('0xA6EDFC', HTTP_PROVIDERS.palm), state: { selectedNetworkClientId: NetworkType['linea-goerli'], networksMetadata: { From 55194c8eed40f00f472ae829cf6a9c69c9148ac2 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Thu, 6 Jun 2024 23:16:25 +0000 Subject: [PATCH 02/14] chore: use separate blockTrackers/providers per network in test previously a single provider referencing "palm mainnet" stood in for all except ethereum-mainnet --- .../src/TransactionController.test.ts | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index 24e1db9e3e..a17fee65e3 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -307,14 +307,23 @@ function waitForTransactionFinished( const MOCK_PREFERENCES = { state: { selectedAddress: 'foo' } }; const INFURA_PROJECT_ID = '341eacb578dd44a1a049cbc5f6fd4035'; const HTTP_PROVIDERS = { - goerli: new HttpProvider(`https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`), - mainnet: new HttpProvider(`https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`), - palm: new HttpProvider(`https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`), - /* - linea: new HttpProvider(`https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`), - linea_goerli: new HttpProvider(`https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`), - */ -} + goerli: new HttpProvider( + `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + ), + mainnet: new HttpProvider( + `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + ), + linea: new HttpProvider( + `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + ), + linea_goerli: new HttpProvider( + `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + ), + custom: new HttpProvider(`http://127.0.0.123:456/ethrpc?apiKey=foobar`), + palm: new HttpProvider( + `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + ), +}; type MockNetwork = { chainId: Hex; @@ -370,8 +379,8 @@ const MOCK_MAINNET_NETWORK: MockNetwork = { const MOCK_LINEA_MAINNET_NETWORK: MockNetwork = { chainId: ChainId['linea-mainnet'], - provider: HTTP_PROVIDERS.palm, - blockTracker: buildMockBlockTracker('0xA6EDFC', HTTP_PROVIDERS.palm), + provider: HTTP_PROVIDERS.linea, + blockTracker: buildMockBlockTracker('0xA6EDFC', HTTP_PROVIDERS.linea), state: { selectedNetworkClientId: NetworkType['linea-mainnet'], networksMetadata: { @@ -392,8 +401,8 @@ const MOCK_LINEA_MAINNET_NETWORK: MockNetwork = { const MOCK_LINEA_GOERLI_NETWORK: MockNetwork = { chainId: ChainId['linea-goerli'], - provider: HTTP_PROVIDERS.palm, - blockTracker: buildMockBlockTracker('0xA6EDFC', HTTP_PROVIDERS.palm), + provider: HTTP_PROVIDERS.linea_goerli, + blockTracker: buildMockBlockTracker('0xA6EDFC', HTTP_PROVIDERS.linea_goerli), state: { selectedNetworkClientId: NetworkType['linea-goerli'], networksMetadata: { From 6a9f42451f603ae514fd8b2843acd733547f80b7 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Tue, 28 May 2024 10:19:13 +0000 Subject: [PATCH 03/14] chore(transaction-controller): reinit providers and blocktrackers between tests --- .../src/helpers/MultichainTrackingHelper.test.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts b/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts index b43488f3b8..69119be8e2 100644 --- a/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts +++ b/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts @@ -222,6 +222,16 @@ function newMultichainTrackingHelper( describe('MultichainTrackingHelper', () => { beforeEach(() => { jest.resetAllMocks(); + + for (const network of [ + 'mainnet', + 'goerli', + 'sepolia', + 'customNetworkClientId-1', + ] as const) { + MOCK_BLOCK_TRACKERS[network] = buildMockBlockTracker(network); + MOCK_PROVIDERS[network] = buildMockProvider(network); + } }); describe('onNetworkStateChange', () => { From 0b3bcaf432c65d36c9b6e609837d0cd257b74ec6 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 10 Jun 2024 00:42:33 +0000 Subject: [PATCH 04/14] testfix(transaction-controllers): use goerli provider for goerli blockTracker --- .../transaction-controller/src/TransactionController.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index a17fee65e3..0da8116166 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -336,7 +336,7 @@ type MockNetwork = { const MOCK_NETWORK: MockNetwork = { chainId: ChainId.goerli, provider: HTTP_PROVIDERS.goerli, - blockTracker: buildMockBlockTracker('0x102833C', HTTP_PROVIDERS.mainnet), + blockTracker: buildMockBlockTracker('0x102833C', HTTP_PROVIDERS.goerli), state: { selectedNetworkClientId: NetworkType.goerli, networksMetadata: { From 204f54a4bd83f15f12d2d75b8bcfb2e78c91c028 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 10 Jun 2024 00:43:34 +0000 Subject: [PATCH 05/14] test(transaction-controllers): use non-production URLs for mock rpc providers --- .../src/TransactionController.test.ts | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index 0da8116166..ee93026c92 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -305,24 +305,18 @@ function waitForTransactionFinished( } const MOCK_PREFERENCES = { state: { selectedAddress: 'foo' } }; -const INFURA_PROJECT_ID = '341eacb578dd44a1a049cbc5f6fd4035'; +const INFURA_PROJECT_ID = 'testinfuraid'; const HTTP_PROVIDERS = { - goerli: new HttpProvider( - `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, - ), - mainnet: new HttpProvider( - `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, - ), - linea: new HttpProvider( - `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, - ), + goerli: new HttpProvider(`https://goerli.ethrpc.test/${INFURA_PROJECT_ID}`), + mainnet: new HttpProvider(`https://mainnet.ethrpc.test/${INFURA_PROJECT_ID}`), + linea: new HttpProvider(`https://linea.ethrpc.test/${INFURA_PROJECT_ID}`), linea_goerli: new HttpProvider( - `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + `https://linea-goerli.ethrpc.test/${INFURA_PROJECT_ID}`, ), - custom: new HttpProvider(`http://127.0.0.123:456/ethrpc?apiKey=foobar`), - palm: new HttpProvider( - `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + custom: new HttpProvider( + `http://127.0.0.123:456/ethrpc?apiKey=foobar&somekey=someval`, ), + palm: new HttpProvider(`https://palm.ethrpc.test/${INFURA_PROJECT_ID}`), }; type MockNetwork = { From 08009179f6e29403c7479c24edfe249544f00932 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 10 Jun 2024 01:28:31 +0000 Subject: [PATCH 06/14] Revert "test(transaction-controllers): use non-production URLs for mock rpc providers" This reverts commit 75219784f4e04dedbb3b8175424b294be1b9d30e. --- .../src/TransactionController.test.ts | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index ee93026c92..0da8116166 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -305,18 +305,24 @@ function waitForTransactionFinished( } const MOCK_PREFERENCES = { state: { selectedAddress: 'foo' } }; -const INFURA_PROJECT_ID = 'testinfuraid'; +const INFURA_PROJECT_ID = '341eacb578dd44a1a049cbc5f6fd4035'; const HTTP_PROVIDERS = { - goerli: new HttpProvider(`https://goerli.ethrpc.test/${INFURA_PROJECT_ID}`), - mainnet: new HttpProvider(`https://mainnet.ethrpc.test/${INFURA_PROJECT_ID}`), - linea: new HttpProvider(`https://linea.ethrpc.test/${INFURA_PROJECT_ID}`), + goerli: new HttpProvider( + `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + ), + mainnet: new HttpProvider( + `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + ), + linea: new HttpProvider( + `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + ), linea_goerli: new HttpProvider( - `https://linea-goerli.ethrpc.test/${INFURA_PROJECT_ID}`, + `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, ), - custom: new HttpProvider( - `http://127.0.0.123:456/ethrpc?apiKey=foobar&somekey=someval`, + custom: new HttpProvider(`http://127.0.0.123:456/ethrpc?apiKey=foobar`), + palm: new HttpProvider( + `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, ), - palm: new HttpProvider(`https://palm.ethrpc.test/${INFURA_PROJECT_ID}`), }; type MockNetwork = { From 6357b5b83a99228591b9fbfcc9df63a9fa67f967 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 10 Jun 2024 01:29:27 +0000 Subject: [PATCH 07/14] chore(transaction-controller): use fake infura api key in test --- .../transaction-controller/src/TransactionController.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index 0da8116166..15bbe5f8ca 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -305,7 +305,7 @@ function waitForTransactionFinished( } const MOCK_PREFERENCES = { state: { selectedAddress: 'foo' } }; -const INFURA_PROJECT_ID = '341eacb578dd44a1a049cbc5f6fd4035'; +const INFURA_PROJECT_ID = 'testinfuraid'; const HTTP_PROVIDERS = { goerli: new HttpProvider( `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, From 53a3f7ddd8fdaecf492fc2d118d4541b104ceac1 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 10 Jun 2024 02:28:27 +0000 Subject: [PATCH 08/14] testfix(transactoin-controller): use network-specific endpoints for http providers instead of `palm-mainnet` for all networks --- .../src/TransactionController.test.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index 15bbe5f8ca..0668b46f8d 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -307,17 +307,13 @@ function waitForTransactionFinished( const MOCK_PREFERENCES = { state: { selectedAddress: 'foo' } }; const INFURA_PROJECT_ID = 'testinfuraid'; const HTTP_PROVIDERS = { - goerli: new HttpProvider( - `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, - ), + goerli: new HttpProvider(`https://goerli.infura.io/v3/${INFURA_PROJECT_ID}`), mainnet: new HttpProvider( `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, ), - linea: new HttpProvider( - `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, - ), + linea: new HttpProvider(`https://linea.infura.io/v3/${INFURA_PROJECT_ID}`), linea_goerli: new HttpProvider( - `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + `https://linea-goerli.infura.io/v3/${INFURA_PROJECT_ID}`, ), custom: new HttpProvider(`http://127.0.0.123:456/ethrpc?apiKey=foobar`), palm: new HttpProvider( From 3bfdfb23fb58f74c0de814ac3732c67a8e8595d7 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 10 Jun 2024 02:45:12 +0000 Subject: [PATCH 09/14] chore(transaction-controller): agnostic on infura_project_id being identical across provider urls --- .../transaction-controller/src/TransactionController.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index 0668b46f8d..422d889af5 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -307,7 +307,7 @@ function waitForTransactionFinished( const MOCK_PREFERENCES = { state: { selectedAddress: 'foo' } }; const INFURA_PROJECT_ID = 'testinfuraid'; const HTTP_PROVIDERS = { - goerli: new HttpProvider(`https://goerli.infura.io/v3/${INFURA_PROJECT_ID}`), + goerli: new HttpProvider('https://goerli.infura.io/v3/goerli-pid'), mainnet: new HttpProvider( `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, ), From 99aaf731ad7ea3de4963dc66f3980a347ddff354 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 10 Jun 2024 02:51:36 +0000 Subject: [PATCH 10/14] chore(transaction-controller): agnostic on infura_project_id being identical across provider urls --- .../transaction-controller/src/TransactionController.test.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index 422d889af5..01d1ad9c2f 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -308,9 +308,7 @@ const MOCK_PREFERENCES = { state: { selectedAddress: 'foo' } }; const INFURA_PROJECT_ID = 'testinfuraid'; const HTTP_PROVIDERS = { goerli: new HttpProvider('https://goerli.infura.io/v3/goerli-pid'), - mainnet: new HttpProvider( - `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, - ), + mainnet: new HttpProvider('https://mainnet.infura.io/v3/mainnet-pid'), linea: new HttpProvider(`https://linea.infura.io/v3/${INFURA_PROJECT_ID}`), linea_goerli: new HttpProvider( `https://linea-goerli.infura.io/v3/${INFURA_PROJECT_ID}`, From 26fce73333b435c6c691847955e72d056866993d Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 10 Jun 2024 02:58:55 +0000 Subject: [PATCH 11/14] Revert "chore(transaction-controller): agnostic on infura_project_id being identical across provider urls" This reverts commit c7a2791badf55c6bfd5b685deaf4a8969ab5052c. --- .../transaction-controller/src/TransactionController.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index 01d1ad9c2f..422d889af5 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -308,7 +308,9 @@ const MOCK_PREFERENCES = { state: { selectedAddress: 'foo' } }; const INFURA_PROJECT_ID = 'testinfuraid'; const HTTP_PROVIDERS = { goerli: new HttpProvider('https://goerli.infura.io/v3/goerli-pid'), - mainnet: new HttpProvider('https://mainnet.infura.io/v3/mainnet-pid'), + mainnet: new HttpProvider( + `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, + ), linea: new HttpProvider(`https://linea.infura.io/v3/${INFURA_PROJECT_ID}`), linea_goerli: new HttpProvider( `https://linea-goerli.infura.io/v3/${INFURA_PROJECT_ID}`, From ed8abd7c0b98de294d6de005db7eb5fbbea83fb1 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 10 Jun 2024 03:00:19 +0000 Subject: [PATCH 12/14] chore(transaction-controller): agnostic on infura_project_id being identical across provider urls --- .../src/TransactionController.test.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index 422d889af5..8677b6bf69 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -311,14 +311,10 @@ const HTTP_PROVIDERS = { mainnet: new HttpProvider( `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, ), - linea: new HttpProvider(`https://linea.infura.io/v3/${INFURA_PROJECT_ID}`), - linea_goerli: new HttpProvider( - `https://linea-goerli.infura.io/v3/${INFURA_PROJECT_ID}`, - ), + linea: new HttpProvider('https://linea.infura.io/v3/linea-pid'), + linea_goerli: new HttpProvider('https://linea-g.infura.io/v3/linea-g-pid'), custom: new HttpProvider(`http://127.0.0.123:456/ethrpc?apiKey=foobar`), - palm: new HttpProvider( - `https://palm-mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, - ), + palm: new HttpProvider('https://palm-mainnet.infura.io/v3/palm-pid'), }; type MockNetwork = { From e7fe855f908b09a7c13ddea078310ab3bdb13da9 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 10 Jun 2024 03:08:09 +0000 Subject: [PATCH 13/14] chore: add TODO comment --- .../transaction-controller/src/TransactionController.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index 8677b6bf69..e56638d652 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -308,6 +308,7 @@ const MOCK_PREFERENCES = { state: { selectedAddress: 'foo' } }; const INFURA_PROJECT_ID = 'testinfuraid'; const HTTP_PROVIDERS = { goerli: new HttpProvider('https://goerli.infura.io/v3/goerli-pid'), + // TODO: Investigate and address why tests break when mainet has a different INFURA_PROJECT_ID mainnet: new HttpProvider( `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, ), From a8b210c3f54bd81e2ed2a107a108785840d8b4b8 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 10 Jun 2024 17:55:35 +0000 Subject: [PATCH 14/14] lint:fix --- .../src/TransactionController.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index e56638d652..88a60cfc10 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -313,7 +313,7 @@ const HTTP_PROVIDERS = { `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`, ), linea: new HttpProvider('https://linea.infura.io/v3/linea-pid'), - linea_goerli: new HttpProvider('https://linea-g.infura.io/v3/linea-g-pid'), + lineaGoerli: new HttpProvider('https://linea-g.infura.io/v3/linea-g-pid'), custom: new HttpProvider(`http://127.0.0.123:456/ethrpc?apiKey=foobar`), palm: new HttpProvider('https://palm-mainnet.infura.io/v3/palm-pid'), }; @@ -394,8 +394,8 @@ const MOCK_LINEA_MAINNET_NETWORK: MockNetwork = { const MOCK_LINEA_GOERLI_NETWORK: MockNetwork = { chainId: ChainId['linea-goerli'], - provider: HTTP_PROVIDERS.linea_goerli, - blockTracker: buildMockBlockTracker('0xA6EDFC', HTTP_PROVIDERS.linea_goerli), + provider: HTTP_PROVIDERS.lineaGoerli, + blockTracker: buildMockBlockTracker('0xA6EDFC', HTTP_PROVIDERS.lineaGoerli), state: { selectedNetworkClientId: NetworkType['linea-goerli'], networksMetadata: {