Skip to content

Commit 80f11f3

Browse files
runway-github[bot]runway-github[bot]
authored
temp+fix: cp-13.11.2 bump bitcoin (#38437)
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** Updates bitcoin to 1.8.0, which removes onRpcRequest method.. <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/38437?quickstart=1) ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: Removed `onRpcRequest` ([#568](MetaMask/snap-bitcoin-wallet#568)) ## **Related issues** Fixes: Remove `onRpcRequest`. ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/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. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > <sup>[Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) is generating a summary for commit 22174ad. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
1 parent eeca566 commit 80f11f3

File tree

844 files changed

+38007
-39587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

844 files changed

+38007
-39587
lines changed

‎.depcheckrc.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ ignores:
88
- '@lavamoat/webpack'
99
- '@lavamoat/allow-scripts'
1010
- '@babel/runtime'
11-
- 'react-compiler-runtime'
1211
- '@fortawesome/fontawesome-free'
1312
- 'punycode'
1413
# injected via build system
@@ -84,7 +83,6 @@ ignores:
8483
- 'core-js-pure' # polyfills
8584
# babel
8685
- '@babel/plugin-transform-logical-assignment-operators'
87-
- 'babel-plugin-react-compiler'
8886
# used in image optimization script
8987
- 'sharp'
9088
# trezor

‎.eslintrc.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,8 @@ module.exports = {
320320
jsx: true,
321321
},
322322
},
323-
plugins: ['react', 'react-compiler'],
323+
plugins: ['react'],
324324
rules: {
325-
'react-compiler/react-compiler': 'error',
326325
'react/no-unused-prop-types': 'error',
327326
'react/no-unused-state': 'error',
328327
'react/jsx-boolean-value': 'error',
@@ -363,9 +362,8 @@ module.exports = {
363362
jsx: true,
364363
},
365364
},
366-
plugins: ['react', 'react-compiler'],
365+
plugins: ['react'],
367366
rules: {
368-
'react-compiler/react-compiler': 'error',
369367
'react/no-unused-prop-types': 'warn',
370368
'react/no-unused-state': 'warn',
371369
'react/jsx-boolean-value': 'off',

‎.github/scripts/check-template-and-add-labels.ts‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -409,19 +409,7 @@ async function userBelongsToMetaMaskOrg(
409409
// This function checks if the PR description has a changelog entry
410410
function hasChangelogEntry(body: string): boolean {
411411
// Remove HTML comments (including multiline)
412-
let uncommentedBody = body;
413-
let prevBody;
414-
let iterationCount = 0;
415-
const MAX_ITERATIONS = 100;
416-
do {
417-
prevBody = uncommentedBody;
418-
uncommentedBody = uncommentedBody.replace(/<!--[\s\S]*?-->/g, "");
419-
iterationCount++;
420-
if (iterationCount >= MAX_ITERATIONS) {
421-
console.warn(`Reached maximum HTML comment removal iterations (${MAX_ITERATIONS}). Input may be malformed or malicious.`);
422-
break;
423-
}
424-
} while (uncommentedBody !== prevBody);
412+
const uncommentedBody = body.replace(/<!--[\s\S]*?-->/g, "");
425413

426414
// Split body into lines
427415
const lines = uncommentedBody.split(/\r?\n/);

‎.github/workflows/check-pr-max-lines.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ permissions:
1717

1818
jobs:
1919
check-pr-max-lines:
20-
runs-on: ubuntu-latest
21-
steps:
22-
- name: Check PR lines changed
23-
uses: MetaMask/github-tools/.github/actions/pr-line-check@v1
24-
with:
25-
max-lines: '1000'
26-
ignore-patterns: '(\.lock|\.snap|lavamoat\/.*policy\.json)$'
20+
uses: metamask/github-tools/.github/workflows/pr-line-check.yml@main
21+
with:
22+
max_lines: 1000
23+
ignore_patterns: '(\.lock|\.snap|lavamoat\/.*policy\.json)$'

‎.github/workflows/cla.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
url-to-cladocument: 'https://metamask.io/cla'
2828
# This branch can't have protections, commits are made directly to the specified branch.
2929
branch: 'cla-signatures'
30-
allowlist: 'dependabot[bot],metamaskbot,crowdin-bot,runway-github[bot],cursor'
30+
allowlist: 'dependabot[bot],metamaskbot,crowdin-bot,runway-github[bot]'
3131
allow-organization-members: true
3232
blockchain-storage-flag: false

‎.github/workflows/create-release-pr.yml‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,20 @@ jobs:
7676
create-release-pr:
7777
needs: [resolve-bases, resolve-previous-ref]
7878
name: Create Release Pull Request using Github Tools
79-
runs-on: ubuntu-latest
79+
uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@6a04e4d0c8c25680a7543cfcd2e2fb7125b6759c
80+
with:
81+
platform: extension
82+
checkout-base-branch: ${{ needs.resolve-bases.outputs.checkout_base }}
83+
release-pr-base-branch: ${{ needs.resolve-bases.outputs.release_base }}
84+
semver-version: ${{ inputs.semver-version }}
85+
previous-version-ref: ${{ needs.resolve-previous-ref.outputs.previous_ref }}
86+
github-tools-version: 6a04e4d0c8c25680a7543cfcd2e2fb7125b6759c
87+
secrets:
88+
# This token needs write permissions to metamask-extension & read permissions to metamask-planning
89+
# If called from auto-create-release-pr use the PR_TOKEN passed in as an input, if called manually use github secret token values
90+
# (this is due to github limitations on fetching secrets from called workflows).
91+
github-token: ${{ github.event_name == 'workflow_dispatch' && secrets.PR_TOKEN || secrets.github-token }}
92+
google-application-creds-base64: ${{ github.event_name == 'workflow_dispatch' && secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 || secrets.google-application-creds-base64 }}
8093
permissions:
8194
contents: write
8295
pull-requests: write
83-
steps:
84-
- name: Create Release PR
85-
uses: MetaMask/github-tools/.github/actions/[email protected]
86-
with:
87-
platform: extension
88-
checkout-base-branch: ${{ needs.resolve-bases.outputs.checkout_base }}
89-
release-pr-base-branch: ${{ needs.resolve-bases.outputs.release_base }}
90-
semver-version: ${{ inputs.semver-version }}
91-
previous-version-ref: ${{ needs.resolve-previous-ref.outputs.previous_ref }}
92-
# This token needs write permissions to metamask-extension & read permissions to metamask-planning
93-
# If called from auto-create-release-pr use the PR_TOKEN passed in as an input, if called manually use github secret token values
94-
# (this is due to github limitations on fetching secrets from called workflows).
95-
github-token: ${{ github.event_name == 'workflow_dispatch' && secrets.PR_TOKEN || secrets.github-token }}
96-
google-application-creds-base64: ${{ github.event_name == 'workflow_dispatch' && secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 || secrets.google-application-creds-base64 }}

‎.github/workflows/flaky-test-report.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,17 @@ on:
44
schedule:
55
# Once every day from Monday-Friday at 08:00 UTC
66
- cron: 0 8 * * 1-5
7-
workflow_dispatch:
87

98
permissions:
109
contents: read
1110
actions: read
1211

1312
jobs:
1413
flaky-test-report:
15-
runs-on: ubuntu-latest
16-
steps:
17-
- name: Generate flaky test report
18-
uses: MetaMask/github-tools/.github/actions/flaky-test-report@v1
19-
with:
20-
repository: ${{ github.event.repository.name }}
21-
workflow-id: main.yml
22-
github-token: ${{ secrets.GITHUB_TOKEN }}
23-
slack-webhook-flaky-tests: ${{ secrets.SLACK_WEBHOOK_FLAKY_TESTS }}
14+
uses: MetaMask/github-tools/.github/workflows/flaky-test-report.yml@main
15+
with:
16+
repository: ${{ github.event.repository.name }}
17+
workflow_id: main.yml
18+
secrets:
19+
github-token: ${{ secrets.GITHUB_TOKEN }}
20+
slack-webhook-flaky-tests: ${{ secrets.SLACK_WEBHOOK_FLAKY_TESTS }}

‎.github/workflows/main.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -587,12 +587,12 @@ jobs:
587587
588588
# Check E2E jobs only if they should have run
589589
if [[ "${{ needs.needs-e2e.outputs.needs-e2e }}" == "true" ]]; then
590-
if [[ "${{ needs.e2e-chrome.result }}" != "success" ]]; then
591-
echo "E2E Chrome tests did not succeed (result: ${{ needs.e2e-chrome.result }})"
590+
if [[ "${{ needs.e2e-chrome.result }}" == "failure" ]]; then
591+
echo "E2E Chrome tests failed"
592592
exit 1
593593
fi
594-
if [[ "${{ needs.e2e-firefox.result }}" != "success" ]]; then
595-
echo "E2E Firefox tests did not succeed (result: ${{ needs.e2e-firefox.result }})"
594+
if [[ "${{ needs.e2e-firefox.result }}" == "failure" ]]; then
595+
echo "E2E Firefox tests failed"
596596
exit 1
597597
fi
598598
fi

‎.github/workflows/post-merge-validation.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@ name: Post Merge Validation
33
on:
44
schedule:
55
- cron: '0 7 * * *'
6-
workflow_dispatch:
76

87
jobs:
98
post-merge-validation-tracker:
10-
runs-on: ubuntu-latest
11-
steps:
12-
- name: Run post-merge validation
13-
uses: MetaMask/github-tools/.github/actions/post-merge-validation@v1
14-
with:
15-
repo: ${{ github.repository }}
16-
start-hour-utc: '7'
17-
github-token: ${{ secrets.GITHUB_TOKEN }}
18-
google-application-creds-base64: ${{ secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 }}
9+
uses: MetaMask/github-tools/.github/workflows/post-merge-validation.yml@main
10+
with:
11+
repo: ${{ github.repository }}
12+
start_hour_utc: 7
13+
secrets:
14+
github-token: ${{ secrets.GITHUB_TOKEN }}
15+
google-application-creds-base64: ${{ secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 }}

‎.github/workflows/update-release-changelog.yml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,15 @@ jobs:
4242
name: Update changelog
4343
needs: validate-branch
4444
if: needs.validate-branch.outputs.is-valid-release == 'true'
45-
runs-on: ubuntu-latest
4645
permissions:
4746
contents: write
4847
pull-requests: write
49-
steps:
50-
- name: Update Release Changelog
51-
uses: MetaMask/github-tools/.github/actions/[email protected]
52-
with:
53-
release-branch: ${{ github.ref_name }}
54-
repository-url: ${{ github.server_url }}/${{ github.repository }}
55-
platform: extension
56-
previous-version-ref: 'null'
57-
github-tools-version: v1.1.0
58-
github-token: ${{ secrets.PR_TOKEN }}
48+
uses: MetaMask/github-tools/.github/workflows/update-release-changelog.yml@36dc168896c1b496f35fc880ee8a3625b4b837ba
49+
with:
50+
release-branch: ${{ github.ref_name }}
51+
repository-url: ${{ github.server_url }}/${{ github.repository }}
52+
platform: extension
53+
github-tools-version: 36dc168896c1b496f35fc880ee8a3625b4b837ba
54+
previous-version-ref: null
55+
secrets:
56+
github-token: ${{ secrets.PR_TOKEN }}

0 commit comments

Comments
 (0)