Skip to content
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

Jump to bottom

chore: Normalize transaction controller patch #7213

Merged
merged 4 commits into from
Sep 18, 2023
Merged

chore: Normalize transaction controller patch #7213

merged 4 commits into from
Sep 18, 2023

Conversation

Gudahtt
Copy link
Member

@Gudahtt Gudahtt commented Sep 13, 2023

Development & PR Process

  1. Follow MetaMask Mobile Coding Standards
  2. Add release-xx label to identify the PR slated for a upcoming release (will be used in release discussion)
  3. Add needs-dev-review label when work is completed
  4. Add the appropiate QA label when dev review is completed
    • needs-qa: PR requires manual QA.
    • No QA/E2E only: PR does not require any manual QA effort. Prior to merging, ensure that you have successful end-to-end test runs in Bitrise.
    • Spot check on release build: PR does not require feature QA but needs non-automated verification. In the description section, provide test scenarios. Add screenshots, and or recordings of what was tested.
  5. Add QA Passed label when QA has signed off (Only required if the PR was labeled with needs-qa)
  6. Add your team's label, i.e. label starting with team- (or external-contributor label if your not a MetaMask employee)

Description

The transaction controller patch has been re-generated following a set of steps that has been documented in the patch itself. This resolves inconsistencies present in the patch resulting from different workflows being used to update it. This includes no functional changes.

Issue

This relates to https://github.com/MetaMask/mobile-planning/issues/1226 (this makes it possible to minimize the diff for the patch changes needed as part of the next controller upgrades)

Checklist

  • There is a related GitHub issue
  • Tests are included if applicable
  • Any added code is fully documented

@Gudahtt Gudahtt marked this pull request as ready for review September 13, 2023 18:49
@Gudahtt Gudahtt requested a review from a team as a code owner September 13, 2023 18:49
@Gudahtt Gudahtt added needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) team-mobile-platform labels Sep 13, 2023
@Gudahtt Gudahtt marked this pull request as draft September 13, 2023 19:11
@Gudahtt
Copy link
Member Author

Gudahtt commented Sep 13, 2023

Moving into draft because it conflicts with #7209 which is more urgent. After that is merged, I can update the patch and mark this as ready for review

@Gudahtt Gudahtt force-pushed the normalize-transaction-controller-patch branch from fac41eb to 254eb7c Compare September 14, 2023 00:21
@codecov-commenter
Copy link

codecov-commenter commented Sep 14, 2023 •
edited

Codecov Report

Patch and project coverage have no change.

Comparison is base (31744a1) 33.02% compared to head (501e7d0) 33.02%.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #7213   +/-   ##
=======================================
  Coverage   33.02%   33.02%           
=======================================
  Files        1004     1004           
  Lines       26888    26888           
  Branches     2131     2131           
=======================================
  Hits         8881     8881           
- Misses      17571    17573    +2     
+ Partials      436      434    -2

see 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Gudahtt Gudahtt force-pushed the normalize-transaction-controller-patch branch 2 times, most recently from e910c17 to f66f215 Compare September 14, 2023 12:23
@Gudahtt Gudahtt marked this pull request as ready for review September 14, 2023 12:25
@Gudahtt
Copy link
Member Author

Gudahtt commented Sep 14, 2023

Passing E2E smoke tests on iOS: https://app.bitrise.io/build/b5bf427a-a45c-4f21-85bc-c03659cd4cc7 (android is currently not passing on main for most builds due to a segfault)

@jpuri
Copy link
Contributor

jpuri commented Sep 14, 2023

The patch has been updated here also: #7035 (comment)

jpuri
jpuri previously approved these changes Sep 14, 2023
View reviewed changes
@Gudahtt Gudahtt force-pushed the normalize-transaction-controller-patch branch 2 times, most recently from a432377 to c72b85f Compare September 15, 2023 18:06
@Gudahtt
Copy link
Member Author

Gudahtt commented Sep 15, 2023

This has been rebased, and updated with the changes from #7226 (which added a script to automate transaction controller patch updates, and improved the patch instructions)

@Gudahtt
Copy link
Member Author

Gudahtt commented Sep 15, 2023

Passing E2E test run: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/efba570c-d0f1-477f-a1df-671528a96335

@Gudahtt Gudahtt added the No QA Needed/E2E Only Apply this label when your PR does not need any QA effort. label Sep 15, 2023
@Gudahtt
chore: Normalize transaction controller patch
8e5351f 
The transaction controller patch has been re-generated following a set
of steps that has been documented in the patch itself. This resolves
inconsistencies present in the patch resulting from different workflows
being used to update it. This includes no functional changes.
@Gudahtt
Update patch with incoming transaction changes
4c09009
@Gudahtt
Remove mocks and sourcemaps
37c073d
@Gudahtt
Update the patch using the new patch:tx script
501e7d0 
The process for updating the transaction controller patch has been
automated with the `patch:tx` script. This script follows the same
steps I had used, except that the patch comment is now in a separate
file and the instructions have been improved.
@Gudahtt Gudahtt force-pushed the normalize-transaction-controller-patch branch from c72b85f to 501e7d0 Compare September 16, 2023 17:25
@sonarcloud
Copy link

sonarcloud bot commented Sep 16, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

Cal-L
Cal-L approved these changes Sep 18, 2023
View reviewed changes
Copy link
Contributor

@Cal-L Cal-L left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Cal-L Cal-L removed the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Sep 18, 2023
@Gudahtt
Copy link
Member Author

Gudahtt commented Sep 18, 2023

Updated E2E test run: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/3eb9602f-a475-4823-9f3b-6e320935423d

@Gudahtt Gudahtt merged commit 0468877 into main Sep 18, 2023
25 checks passed
@Gudahtt Gudahtt deleted the normalize-transaction-controller-patch branch September 18, 2023 15:31
@github-actions github-actions bot locked and limited conversation to collaborators Sep 18, 2023
@metamaskbot metamaskbot added the release-7.8.0 Issue or pull request that will be included in release 7.8.0 label Sep 18, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@matthewwalsh0 matthewwalsh0 matthewwalsh0 left review comments

@Cal-L Cal-L Cal-L approved these changes

@jpuri jpuri jpuri left review comments

Assignees
No one assigned
Labels
No QA Needed/E2E Only Apply this label when your PR does not need any QA effort. release-7.8.0 Issue or pull request that will be included in release 7.8.0 team-mobile-platform
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Gudahtt @codecov-commenter @jpuri @Cal-L @matthewwalsh0 @metamaskbot