temp+fix: replace legacy eth-json-rpc deps (#11952)

## **Description** - This PR is a rebase of #10098, including: * #9925 * #9930 - Bump `@metamask/eth-json-rpc-filters` to `^7.0.0` - Bump `@metamask/json-rpc-engine` to `^10.0.0` - Bump `@metamask/eth-json-rpc-middleware` to `^15.0.0` - Migrate from `json-rpc-middleware-stream` to `@metamask/json-rpc-middleware-stream` - Upgrade `@metamask/providers` from v13 to v16 - Also broken out separately as #12085 - Revert `Internal JSON-RPC error` message change to accomodate for `@metamask/rpc-errors` v7 ## **Related issues** Expected to fix the following issues: - [x] #11163 - [x] #11129 - [ ] #11105 - [ ] #9715 - [ ] #8308 - [x] #7926 - [x] #4621 - [x] #4646 - [ ] #12634 #### Blocked by - [x] #12085 - [x] #12047 - [x] #12024 - [x] #11980 - [x] #12008 - [x] #11978 ## **Manual testing steps** 1. Go to in-app browser 2. Test connect with multiple dapps 3. Perform transaciton on test dapp 1. Go to this page... ## **Screenshots/Recordings** https://github.com/MetaMask/metamask-mobile/assets/46944231/c608d957-6684-40e2-8963-67a11dc610df ### **Before**  ### **After**  ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: Aslau Mario-Daniel <[email protected]> Co-authored-by: tommasini <[email protected]> Co-authored-by: kylanhurt <[email protected]> Co-authored-by: sethkfman <[email protected]> Co-authored-by: Nicolas MASSART <[email protected]> Co-authored-by: Nico MASSART <[email protected]>
MetaMask · Dec 13, 2024 · a3de2ff · a3de2ff
1 parent fd13173
commit a3de2ff
Show file tree

Hide file tree

Showing 13 changed files with 224 additions and 962 deletions.
diff --git a/.github/scripts/bitrise/run-bitrise-e2e-check.ts b/.github/scripts/bitrise/run-bitrise-e2e-check.ts
@@ -8,107 +8,11 @@ import {
 } from '../scripts.types';
 import axios from 'axios';
 
-let octokitInstance: InstanceType<typeof GitHub> | null = null;
-let owner: string;
-let repo: string;
-
 main().catch((error: Error): void => {
   console.error(error);
   process.exit(1);
 });
 
-
-
-function getOctokitInstance(): InstanceType<typeof GitHub> {
-  if (!octokitInstance) {
-    const githubToken = process.env.GITHUB_TOKEN;
-    if (!githubToken) {
-      throw new Error("GitHub token is not set in the environment variables");
-    }
-    octokitInstance = getOctokit(githubToken);
-  }
-  return octokitInstance;
-}
-
-async function upsertStatusCheck(
-  statusCheckName: string,
-  commitHash: string,
-  status: StatusCheckStatusType, 
-  conclusion: CompletedConclusionType | undefined, 
-  summary: string
-): Promise<void> {
-  const octokit = getOctokitInstance();
-
-  // List existing checks
-  const listResponse = await octokit.rest.checks.listForRef({
-    owner,
-    repo,
-    ref: commitHash,
-  });
-
-  if (listResponse.status !== 200) {
-    core.setFailed(
-      `Failed to list checks for commit ${commitHash}, received status code ${listResponse.status}`,
-    );
-    process.exit(1);
-  }
-
-  const existingCheck = listResponse.data.check_runs.find(check => check.name === statusCheckName);
-
-  if (existingCheck) {
-    console.log(`Check already exists: ${existingCheck.name}, updating...`);
-    // Update the existing check
-    const updateCheckResponse = await octokit.rest.checks.update({
-      owner,
-      repo,
-      check_run_id: existingCheck.id,
-      name: statusCheckName,
-      status: status,
-      conclusion: conclusion,
-      output: {
-        title: `${statusCheckName} Status Check`,
-        summary: summary,
-      },
-    });
-
-    if (updateCheckResponse.status !== 200) {
-      core.setFailed(
-        `Failed to update '${statusCheckName}' check with status ${status} for commit ${commitHash}, got status code ${updateCheckResponse.status}`,
-      );
-      process.exit(1);
-    }
-
-    console.log(`Updated existing check: ${statusCheckName} with id ${existingCheck.id} & status ${status} for commit ${commitHash}`);
-
-
-
-  } else {
-    console.log(`Check does not exist: ${statusCheckName}, creating...`);
-    // Create a new status check
-    const createCheckResponse = await octokit.rest.checks.create({
-      owner,
-      repo,
-      name: statusCheckName,
-      head_sha: commitHash,
-      status: status,
-      conclusion: conclusion,
-      started_at: new Date().toISOString(),
-      output: {
-        title: `${statusCheckName} Status Check`,
-        summary: summary,
-      },
-    });
-
-    if (createCheckResponse.status !== 201) {
-      core.setFailed(
-        `Failed to create '${statusCheckName}' check with status ${status} for commit ${commitHash}, got status code ${createCheckResponse.status}`,
-      );
-      process.exit(1);
-    }
-
-    console.log(`Created check: ${statusCheckName} with id ${createCheckResponse.data.id} & status ${status} for commit ${commitHash}`);
-  }
-}
 // Determine whether E2E should run and provide the associated reason
 function shouldRunBitriseE2E(antiLabel: boolean, hasSmokeTestLabel: boolean, isDocs: boolean, isFork: boolean, isMergeQueue: boolean): [boolean, string] {
 
@@ -139,11 +43,7 @@ async function main(): Promise<void> {
   const e2ePipeline = process.env.E2E_PIPELINE;
   const workflowName = process.env.WORKFLOW_NAME;
   const triggerAction = context.payload.action as PullRequestTriggerType;
-  // Assuming context.issue comes populated with owner and repo, as typical with GitHub Actions
-  const { owner: contextOwner, repo: contextRepo, number: pullRequestNumber } = context.issue;
-  owner = contextOwner;
-  repo = contextRepo;
-
+  const { owner, repo, number: pullRequestNumber } = context.issue;
   const removeAndApplyInstructions = `Remove and re-apply the "${e2eLabel}" label to trigger a E2E smoke test on Bitrise.`;
   const mergeFromMainCommitMessagePrefix = `Merge branch 'main' into`;
   const pullRequestLink = `https://github.com/MetaMask/metamask-mobile/pull/${pullRequestNumber}`;
@@ -180,7 +80,7 @@ async function main(): Promise<void> {
   const mqCommitHash = context.payload?.merge_group?.head_sha;
 
 
-  const octokit = getOctokitInstance();
+  const octokit: InstanceType<typeof GitHub> = getOctokit(githubToken);
 
   const { data: prData } = await octokit.rest.pulls.get({
     owner,
@@ -214,18 +114,67 @@ async function main(): Promise<void> {
   if (!mergeQueue && !hasSmokeTestLabel && !hasAntiLabel) {
 
     // Fail Status due to missing labels
-    await upsertStatusCheck(statusCheckName, latestCommitHash, StatusCheckStatusType.Completed, 
-      CompletedConclusionType.Failure, `Failed due to missing labels. Please apply either ${e2eLabel} or ${antiLabel}.`);
-    return
+    const createStatusCheckResponse = await octokit.rest.checks.create({
+      owner,
+      repo,
+      name: statusCheckName,
+      head_sha: latestCommitHash,
+      status: StatusCheckStatusType.Completed,
+      conclusion: CompletedConclusionType.Failure, 
+      started_at: new Date().toISOString(),
+      output: {
+        title: statusCheckTitle,
+        summary: `Failed due to missing labels. Please apply either ${e2eLabel} or ${antiLabel}.`,
+      },
+    });
+
+    if (createStatusCheckResponse.status === 201) {
+      console.log(
+        `Created '${statusCheckName}' check with failed status for commit ${latestCommitHash}`,
+      );
+    } else {
+      core.setFailed(
+        `Failed to create '${statusCheckName}' check with failed status for commit ${latestCommitHash} with status code ${createStatusCheckResponse.status}`,
+      );
+      process.exit(1);
+    }
+    core.setFailed(
+      `At least 1 E2E Label must be Applied either ${e2eLabel} or ${antiLabel}`,
+    );
+    process.exit(1);
   }
 
   if (!shouldRun) {
     console.log(
       `Skipping Bitrise status check. due to the following reason: ${reason}`,
     );
 
-    await upsertStatusCheck(statusCheckName, latestCommitHash, StatusCheckStatusType.Completed, CompletedConclusionType.Success,
-      `Skip run since ${reason}`);
+
+    // Post success status (skipped)
+    const createStatusCheckResponse = await octokit.rest.checks.create({
+      owner,
+      repo,
+      name: statusCheckName,
+      head_sha: latestCommitHash,
+      status: StatusCheckStatusType.Completed,
+      conclusion: CompletedConclusionType.Success, 
+      started_at: new Date().toISOString(),
+      output: {
+        title: statusCheckTitle,
+        summary: `Skip run since ${reason}`,
+      },
+    });
+
+    if (createStatusCheckResponse.status === 201) {
+      console.log(
+        `Created '${statusCheckName}' check with skipped status for commit ${latestCommitHash}`,
+      );
+    } else {
+      core.setFailed(
+        `Failed to create '${statusCheckName}' check with skipped status for commit ${latestCommitHash} with status code ${createStatusCheckResponse.status}`,
+      );
+      process.exit(1);
+    }
     return;
   }
 
@@ -365,9 +314,29 @@ async function main(): Promise<void> {
     // Post pending status
     console.log(`Posting pending status for commit ${latestCommitHash}`);
 
-    await upsertStatusCheck( statusCheckName, latestCommitHash, StatusCheckStatusType.InProgress, undefined, `Test runs in progress... You can view them at ${buildLink}`);
-
+    const createStatusCheckResponse = await octokit.rest.checks.create({
+      owner,
+      repo,
+      name: statusCheckName,
+      head_sha: latestCommitHash,
+      status: StatusCheckStatusType.InProgress,
+      started_at: new Date().toISOString(),
+      output: {
+        title: statusCheckTitle,
+        summary: `Test runs in progress... You can view them at ${buildLink}`,
+      },
+    });
 
+    if (createStatusCheckResponse.status === 201) {
+      console.log(
+        `Created '${statusCheckName}' check for commit ${latestCommitHash}`,
+      );
+    } else {
+      core.setFailed(
+        `Failed to create '${statusCheckName}' check for commit ${latestCommitHash} with status code ${createStatusCheckResponse.status}`,
+      );
+      process.exit(1);
+    }
     return;
   }
 
@@ -414,11 +383,31 @@ async function main(): Promise<void> {
   if (!bitriseComment) {
 
     console.log(`Bitrise comment not detected for commit ${latestCommitHash}`);
+    // Post fail status
+    const createStatusCheckResponse = await octokit.rest.checks.create({
+      owner,
+      repo,
+      name: statusCheckName,
+      head_sha: latestCommitHash,
+      status: StatusCheckStatusType.Completed,
+      conclusion: CompletedConclusionType.Failure,
+      started_at: new Date().toISOString(),
+      output: {
+        title: statusCheckTitle,
+        summary: `No Bitrise comment found for commit ${latestCommitHash}. Try re-applying the '${e2eLabel}' label.`,
+      },
+    });
 
-    await upsertStatusCheck(statusCheckName, latestCommitHash, StatusCheckStatusType.Completed,
-       CompletedConclusionType.Failure, 
-       `No Bitrise comment found for commit ${latestCommitHash}. Try re-applying the '${e2eLabel}' label.`);
-
+    if (createStatusCheckResponse.status === 201) {
+      console.log(
+        `Created '${statusCheckName}' check for commit ${latestCommitHash}`,
+      );
+    } else {
+      core.setFailed(
+        `Failed to create '${statusCheckName}' check for commit ${latestCommitHash} with status code ${createStatusCheckResponse.status}`,
+      );
+      process.exit(1);
+    }
     return;
   }
 
@@ -509,6 +498,27 @@ async function main(): Promise<void> {
   }
 
   // Post status check
-  await upsertStatusCheck(statusCheckName, latestCommitHash, checkStatus.status, checkStatus.conclusion, statusMessage);
+  const createStatusCheckResponse = await octokit.rest.checks.create({
+    owner,
+    repo,
+    name: statusCheckName,
+    head_sha: latestCommitHash,
+    started_at: new Date().toISOString(),
+    output: {
+      title: statusCheckTitle,
+      summary: statusMessage,
+    },
+    ...checkStatus,
+  });
 
+  if (createStatusCheckResponse.status === 201) {
+    console.log(
+      `Created '${statusCheckName}' check for commit ${latestCommitHash}`,
+    );
+  } else {
+    core.setFailed(
+      `Failed to create '${statusCheckName}' check for commit ${latestCommitHash} with status code ${createStatusCheckResponse.status}`,
+    );
+    process.exit(1);
+  }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,80 @@
 
 ## Current Main Branch
 
+## 7.37.1 - Dec 12, 2024
+### Added
+- [#12427](https://github.com/MetaMask/metamask-mobile/pull/12427): feat: implement remote feature flag controller (#12427)
+- [#12650](https://github.com/MetaMask/metamask-mobile/pull/12650): fix: fix swaps button on asset overview page for multichain feature (#12650)
+- [#12507](https://github.com/MetaMask/metamask-mobile/pull/12507): feat: activate portfolio view (#12507)
+- [#12540](https://github.com/MetaMask/metamask-mobile/pull/12540): feat: migrate Base network RPC from https://mainnet.base.org to base-… (#12540)
+- [#12505](https://github.com/MetaMask/metamask-mobile/pull/12505): feat: add aggregated portfolio balance cross chains (#12505)
+- [#12417](https://github.com/MetaMask/metamask-mobile/pull/12417): feat: multichain detect tokens feat (#12417)
+- [#12490](https://github.com/MetaMask/metamask-mobile/pull/12490): feat: 7.37.0 (#12490)
+- [#12419](https://github.com/MetaMask/metamask-mobile/pull/12419): feat: upgrade transaction controller to get incoming transactions using accounts API (#12419)
+- [#12537](https://github.com/MetaMask/metamask-mobile/pull/12537): feat: enable ledger clear signing feature (#12537)
+- [#12622](https://github.com/MetaMask/metamask-mobile/pull/12622): feat: Hide the smart transaction status page if we return a txHash asap (#12622)
+- [#12623](https://github.com/MetaMask/metamask-mobile/pull/12623): chore: update bug template to include feature branches (#12623)
+- [#12244](https://github.com/MetaMask/metamask-mobile/pull/12244): feat(ci): Expo (#12244)
+- [#12459](https://github.com/MetaMask/metamask-mobile/pull/12459): feat: upgrade profile-sync-controller to 1.0.0 (#12459)
+- [#12294](https://github.com/MetaMask/metamask-mobile/pull/12294): feat: Add Bitcoin accounts (Flask Only) (#12294)
+- [#12243](https://github.com/MetaMask/metamask-mobile/pull/12243): feat: cicd e2e label requirements + pr automation (#12243)
+- [#12495](https://github.com/MetaMask/metamask-mobile/pull/12495): feat: Support gas fee flows in swaps (#12495)
+- [#12431](https://github.com/MetaMask/metamask-mobile/pull/12431): feat: multi chain asset list (#12431)
+
+### Changed
+- [#12538](https://github.com/MetaMask/metamask-mobile/pull/12538): chore: Chore/12435 mvp handle engine does not exist (#12538)
+- [#12617](https://github.com/MetaMask/metamask-mobile/pull/12617): docs: Update README.md with new expo instructions (#12617)
+- [#12559](https://github.com/MetaMask/metamask-mobile/pull/12559): test: move remaining modal pages and selectors to their respective folders (#12559)
+- [#12556](https://github.com/MetaMask/metamask-mobile/pull/12556): test: remove redundent tests in quarantine folder (#12556)
+- [#12558](https://github.com/MetaMask/metamask-mobile/pull/12558): test: Create e2e tag for multi chain  (#12558)
+- [#12531](https://github.com/MetaMask/metamask-mobile/pull/12531): test: Move files to Wallet folder (#12531)
+- [#12511](https://github.com/MetaMask/metamask-mobile/pull/12511): test: Move files to Onboarding folder (#12511)
+- [#12512](https://github.com/MetaMask/metamask-mobile/pull/12512): test: address regression pipeline slow down (#12512)
+- [#12513](https://github.com/MetaMask/metamask-mobile/pull/12513): ci: disable security e2e tests (#12513)
+- [#12491](https://github.com/MetaMask/metamask-mobile/pull/12491): chore: chore/7.37.0-Changelog (#12491)
+- [#12602](https://github.com/MetaMask/metamask-mobile/pull/12602): chore: Additional e2e test to support `PortfolioView` (#12602)
+- [#12321](https://github.com/MetaMask/metamask-mobile/pull/12321): refactor: remove global network from transaction controller  (#12321)
+- [#12536](https://github.com/MetaMask/metamask-mobile/pull/12536): test: fix mock server (#12536)
+- [#12288](https://github.com/MetaMask/metamask-mobile/pull/12288): test: add e2e test for security alert api  (#12288)
+- [#12597](https://github.com/MetaMask/metamask-mobile/pull/12597): test(3615): additional e2e scenarios editing permissions and non permitted networks (#12597)
+- [#12488](https://github.com/MetaMask/metamask-mobile/pull/12488): test(3615): add new e2e test for initial dapp connection and non permitted flow (#12488)
+- [#12532](https://github.com/MetaMask/metamask-mobile/pull/12532): refactor: de-anonymize insensitive properties of swaps events (#12532)
+- [#12485](https://github.com/MetaMask/metamask-mobile/pull/12485): chore: Stop suppressing pod install failures (#12485)
+- [#12574](https://github.com/MetaMask/metamask-mobile/pull/12574): chore: Add option to skip pod install setup step (#12574)
+- [#12609](https://github.com/MetaMask/metamask-mobile/pull/12609): chore: update user storage E2E framework (#12609)
+- [#12569](https://github.com/MetaMask/metamask-mobile/pull/12569): chore: transfer ownership of auth & profile sync E2E from notifications to identity (#12569)
+- [#12534](https://github.com/MetaMask/metamask-mobile/pull/12534): chore: change ownership of profile sync from notifications to identity (#12534)
+- [#12543](https://github.com/MetaMask/metamask-mobile/pull/12543): chore: Decrease hot and cold start app to wallet view time (#12543)
+- [#12428](https://github.com/MetaMask/metamask-mobile/pull/12428): chore: Add eth hd keyring and key tree to decrease unlock time (#12428)
+- [#12555](https://github.com/MetaMask/metamask-mobile/pull/12555): chore: Update accounts packages (#12555)
+- [#12563](https://github.com/MetaMask/metamask-mobile/pull/12563): chore: cicd e2e hardening (#12563)
+- [#12554](https://github.com/MetaMask/metamask-mobile/pull/12554): chore: fail status when on no labels for retro-label changes (#12554)
+- [#12295](https://github.com/MetaMask/metamask-mobile/pull/12295): chore: use getShares contract method from stake-sdk for unstake all flow (#12295)
+- [#12551](https://github.com/MetaMask/metamask-mobile/pull/12551): chore: Bump Snaps packages (#12551)
+
+### Fixed
+- [#12659](https://github.com/MetaMask/metamask-mobile/pull/12659): fix: fix token details navigation (#12659)
+- [#12624](https://github.com/MetaMask/metamask-mobile/pull/12624): fix: add new translations (#12624)
+- [#12373](https://github.com/MetaMask/metamask-mobile/pull/12373): fix: circular dependencies engine-network-handleNetworkSwitch (#12373)
+- [#12663](https://github.com/MetaMask/metamask-mobile/pull/12663): fix: disable flaky tests on incoming-transactions.spec (#12663)
+- [#12598](https://github.com/MetaMask/metamask-mobile/pull/12598): fix: disable mock poc test (#12598)
+- [#12230](https://github.com/MetaMask/metamask-mobile/pull/12230): fix: Jest timer error in unit test (#12230)
+- [#12626](https://github.com/MetaMask/metamask-mobile/pull/12626): fix: fix flaky test (#12626)
+- [#12372](https://github.com/MetaMask/metamask-mobile/pull/12372): fix: abstract out circular dependencies between engine and networks util (#12372)
+- [#12641](https://github.com/MetaMask/metamask-mobile/pull/12641): fix: fix network selector (#12641)
+- [#12637](https://github.com/MetaMask/metamask-mobile/pull/12637): fix: fix native tokens filter when all networks is selected (#12637)
+- [#12529](https://github.com/MetaMask/metamask-mobile/pull/12529): fix: fix NFTs disappearing after killing app (#12529)
+- [#12562](https://github.com/MetaMask/metamask-mobile/pull/12562): fix: Move `AssetPollingProvider` from Root to Nav/Main/index.js (#12562)
+- [#12607](https://github.com/MetaMask/metamask-mobile/pull/12607): fix: e2e regression gas api (#12607)
+- [#12460](https://github.com/MetaMask/metamask-mobile/pull/12460): fix: add source when local PPOM fails (#12460)
+- [#12199](https://github.com/MetaMask/metamask-mobile/pull/12199): fix: 10967 User able to add Ledger account with existing account name (#12199)
+- [#12566](https://github.com/MetaMask/metamask-mobile/pull/12566): fix(12527): sdk connection with unknown url causes a bug (#12566)
+- [#12405](https://github.com/MetaMask/metamask-mobile/pull/12405): fix(431-2): active network icon has too much margin and adding optional prop (#12405)
+- [#12591](https://github.com/MetaMask/metamask-mobile/pull/12591): fix: add resolution for express to fix failing audit on path-to-regexp (#12591)
+- [#12567](https://github.com/MetaMask/metamask-mobile/pull/12567): fix: update input handling in useInputHandler to support BACK key functionality (#12567)
+- [#12630](https://github.com/MetaMask/metamask-mobile/pull/12630): fix: hide tokens without balance for multichain (#12630)
+
+
 ## 7.37.0 - Nov 28, 2024
 ### Added
 - [#12091](https://github.com/MetaMask/metamask-mobile/pull/12091): feat: 2020 Add a performance test for iOS in Bitrise (#12091)

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -178,8 +178,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionName "7.37.0"
-        versionCode 1512
+        versionName "7.38.0"
+        versionCode 1514
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"