Skip to content

Commit 00a5db7

Browse files
authored
chore(deps): bump @metamask/eth-trezor-keyring to ^6.0.0 (#27689)
<!-- 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** This PR bumps `@metamask/eth-trezor-keyring` from `^3.1.3` to `^6.0.0`. ``` ## [6.0.0] ### Added - **BREAKING:** Add ESM build ([#40](MetaMask/accounts#40)) - It's no longer possible to import files from `./dist` directly. ## [5.0.0] ### Changed - **BREAKING**: Bump `@metamask/eth-sig-util` dependency from `^7.0.3` to `^8.0.0` ([#79](MetaMask/accounts#79)) - `signTypedData` no longer support `number` for addresses, see [here](https://github.com/MetaMask/eth-sig-util/blob/main/CHANGELOG.md#800). ## [4.0.0] ### Changed - **BREAKING**: `addAccounts` will now only return newly created accounts ([#64](MetaMask/accounts#64)) - This keyring was initially returning every accounts (previous and new ones), which is different from what is expected in the [`Keyring` interface].(https://github.com/MetaMask/utils/blob/v9.2.1/src/keyring.ts#L65) ``` <!-- 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/27689?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** These changes directly impact Trezor devices: 1. Add one or more Trezor accounts 2. Sign message 3. Sign typed data 4. Sign transaction 5. Remove Trezor accounts ## **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/develop/.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/develop/.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.
1 parent ec75a8b commit 00a5db7

File tree

6 files changed

+222
-79
lines changed

6 files changed

+222
-79
lines changed

lavamoat/browserify/beta/policy.json

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@
550550
"console": true
551551
},
552552
"packages": {
553-
"@swc/helpers>tslib": true
553+
"tslib": true
554554
}
555555
},
556556
"@metamask/notification-services-controller>firebase>@firebase/messaging": {
@@ -584,7 +584,7 @@
584584
"@metamask/notification-services-controller>firebase>@firebase/installations": true,
585585
"@metamask/notification-services-controller>firebase>@firebase/util": true,
586586
"@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
587-
"@swc/helpers>tslib": true
587+
"tslib": true
588588
}
589589
},
590590
"@metamask/notification-services-controller>firebase>@firebase/util": {
@@ -634,7 +634,7 @@
634634
"ethereumjs-util>ethereum-cryptography>bs58check": true,
635635
"buffer": true,
636636
"browserify>buffer": true,
637-
"@swc/helpers>tslib": true
637+
"tslib": true
638638
}
639639
},
640640
"@keystonehq/metamask-airgapped-keyring": {
@@ -815,6 +815,12 @@
815815
"@metamask/eth-snap-keyring>@metamask/eth-sig-util>@metamask/abi-utils>@metamask/utils": true
816816
}
817817
},
818+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util>@metamask/abi-utils": {
819+
"packages": {
820+
"@metamask/utils>@metamask/superstruct": true,
821+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util>@metamask/utils": true
822+
}
823+
},
818824
"@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/abi-utils": {
819825
"packages": {
820826
"@metamask/utils>@metamask/superstruct": true,
@@ -1121,6 +1127,17 @@
11211127
"@metamask/eth-sig-util>tweetnacl": true
11221128
}
11231129
},
1130+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util": {
1131+
"packages": {
1132+
"@ethereumjs/tx>@ethereumjs/util": true,
1133+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util>@metamask/abi-utils": true,
1134+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util>@metamask/utils": true,
1135+
"@metamask/utils>@scure/base": true,
1136+
"browserify>buffer": true,
1137+
"@ethereumjs/tx>ethereum-cryptography": true,
1138+
"@metamask/eth-sig-util>tweetnacl": true
1139+
}
1140+
},
11241141
"@metamask/keyring-controller>@metamask/eth-sig-util": {
11251142
"packages": {
11261143
"@ethereumjs/tx>@ethereumjs/util": true,
@@ -1191,6 +1208,7 @@
11911208
"packages": {
11921209
"@ethereumjs/tx": true,
11931210
"@ethereumjs/tx>@ethereumjs/util": true,
1211+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true,
11941212
"@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true,
11951213
"@trezor/connect-web": true,
11961214
"browserify>buffer": true,
@@ -2061,6 +2079,21 @@
20612079
"semver": true
20622080
}
20632081
},
2082+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util>@metamask/utils": {
2083+
"globals": {
2084+
"TextDecoder": true,
2085+
"TextEncoder": true
2086+
},
2087+
"packages": {
2088+
"@metamask/utils>@metamask/superstruct": true,
2089+
"@noble/hashes": true,
2090+
"@metamask/utils>@scure/base": true,
2091+
"browserify>buffer": true,
2092+
"nock>debug": true,
2093+
"@metamask/utils>pony-cause": true,
2094+
"semver": true
2095+
}
2096+
},
20642097
"@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": {
20652098
"globals": {
20662099
"TextDecoder": true,
@@ -2684,13 +2717,13 @@
26842717
"packages": {
26852718
"@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
26862719
"@trezor/connect-web>@trezor/utils": true,
2687-
"@swc/helpers>tslib": true
2720+
"tslib": true
26882721
}
26892722
},
26902723
"@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": {
26912724
"packages": {
2692-
"@metamask/eth-sig-util": true,
2693-
"@swc/helpers>tslib": true
2725+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true,
2726+
"tslib": true
26942727
}
26952728
},
26962729
"@trezor/connect-web": {
@@ -2721,7 +2754,7 @@
27212754
"@trezor/connect-web>@trezor/connect": true,
27222755
"@trezor/connect-web>@trezor/utils": true,
27232756
"webpack>events": true,
2724-
"@swc/helpers>tslib": true
2757+
"tslib": true
27252758
}
27262759
},
27272760
"@trezor/connect-web>@trezor/connect": {
@@ -2730,7 +2763,7 @@
27302763
"@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
27312764
"@trezor/connect-web>@trezor/connect>@trezor/transport": true,
27322765
"@trezor/connect-web>@trezor/utils": true,
2733-
"@swc/helpers>tslib": true
2766+
"tslib": true
27342767
}
27352768
},
27362769
"@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": {
@@ -2747,7 +2780,7 @@
27472780
},
27482781
"packages": {
27492782
"process": true,
2750-
"@swc/helpers>tslib": true,
2783+
"tslib": true,
27512784
"@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": true
27522785
}
27532786
},
@@ -2756,7 +2789,7 @@
27562789
"@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
27572790
"browserify>buffer": true,
27582791
"@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": true,
2759-
"@swc/helpers>tslib": true
2792+
"tslib": true
27602793
}
27612794
},
27622795
"@trezor/connect-web>@trezor/connect>@trezor/schema-utils": {
@@ -2786,7 +2819,7 @@
27862819
"@trezor/connect-web>@trezor/utils>bignumber.js": true,
27872820
"browserify>buffer": true,
27882821
"webpack>events": true,
2789-
"@swc/helpers>tslib": true
2822+
"tslib": true
27902823
}
27912824
},
27922825
"@welldone-software/why-did-you-render": {
@@ -2899,7 +2932,7 @@
28992932
"setTimeout": true
29002933
},
29012934
"packages": {
2902-
"@swc/helpers>tslib": true
2935+
"tslib": true
29032936
}
29042937
},
29052938
"@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
@@ -2908,7 +2941,7 @@
29082941
"setTimeout": true
29092942
},
29102943
"packages": {
2911-
"@swc/helpers>tslib": true
2944+
"tslib": true
29122945
}
29132946
},
29142947
"string.prototype.matchall>es-abstract>available-typed-arrays": {
@@ -3810,7 +3843,7 @@
38103843
"setTimeout": true
38113844
},
38123845
"packages": {
3813-
"@swc/helpers>tslib": true
3846+
"tslib": true
38143847
}
38153848
},
38163849
"browserify>util>which-typed-array>for-each": {
@@ -5324,7 +5357,7 @@
53245357
"document.getSelection": true
53255358
}
53265359
},
5327-
"@swc/helpers>tslib": {
5360+
"tslib": {
53285361
"globals": {
53295362
"SuppressedError": true,
53305363
"define": true
@@ -5412,7 +5445,7 @@
54125445
"packages": {
54135446
"react-focus-lock>use-sidecar>detect-node-es": true,
54145447
"react": true,
5415-
"@swc/helpers>tslib": true
5448+
"tslib": true
54165449
}
54175450
},
54185451
"readable-stream>util-deprecate": {

lavamoat/browserify/flask/policy.json

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@
550550
"console": true
551551
},
552552
"packages": {
553-
"@swc/helpers>tslib": true
553+
"tslib": true
554554
}
555555
},
556556
"@metamask/notification-services-controller>firebase>@firebase/messaging": {
@@ -584,7 +584,7 @@
584584
"@metamask/notification-services-controller>firebase>@firebase/installations": true,
585585
"@metamask/notification-services-controller>firebase>@firebase/util": true,
586586
"@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
587-
"@swc/helpers>tslib": true
587+
"tslib": true
588588
}
589589
},
590590
"@metamask/notification-services-controller>firebase>@firebase/util": {
@@ -634,7 +634,7 @@
634634
"ethereumjs-util>ethereum-cryptography>bs58check": true,
635635
"buffer": true,
636636
"browserify>buffer": true,
637-
"@swc/helpers>tslib": true
637+
"tslib": true
638638
}
639639
},
640640
"@keystonehq/metamask-airgapped-keyring": {
@@ -815,6 +815,12 @@
815815
"@metamask/eth-snap-keyring>@metamask/eth-sig-util>@metamask/abi-utils>@metamask/utils": true
816816
}
817817
},
818+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util>@metamask/abi-utils": {
819+
"packages": {
820+
"@metamask/utils>@metamask/superstruct": true,
821+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util>@metamask/utils": true
822+
}
823+
},
818824
"@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/abi-utils": {
819825
"packages": {
820826
"@metamask/utils>@metamask/superstruct": true,
@@ -1121,6 +1127,17 @@
11211127
"@metamask/eth-sig-util>tweetnacl": true
11221128
}
11231129
},
1130+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util": {
1131+
"packages": {
1132+
"@ethereumjs/tx>@ethereumjs/util": true,
1133+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util>@metamask/abi-utils": true,
1134+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util>@metamask/utils": true,
1135+
"@metamask/utils>@scure/base": true,
1136+
"browserify>buffer": true,
1137+
"@ethereumjs/tx>ethereum-cryptography": true,
1138+
"@metamask/eth-sig-util>tweetnacl": true
1139+
}
1140+
},
11241141
"@metamask/keyring-controller>@metamask/eth-sig-util": {
11251142
"packages": {
11261143
"@ethereumjs/tx>@ethereumjs/util": true,
@@ -1191,6 +1208,7 @@
11911208
"packages": {
11921209
"@ethereumjs/tx": true,
11931210
"@ethereumjs/tx>@ethereumjs/util": true,
1211+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true,
11941212
"@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true,
11951213
"@trezor/connect-web": true,
11961214
"browserify>buffer": true,
@@ -2061,6 +2079,21 @@
20612079
"semver": true
20622080
}
20632081
},
2082+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util>@metamask/utils": {
2083+
"globals": {
2084+
"TextDecoder": true,
2085+
"TextEncoder": true
2086+
},
2087+
"packages": {
2088+
"@metamask/utils>@metamask/superstruct": true,
2089+
"@noble/hashes": true,
2090+
"@metamask/utils>@scure/base": true,
2091+
"browserify>buffer": true,
2092+
"nock>debug": true,
2093+
"@metamask/utils>pony-cause": true,
2094+
"semver": true
2095+
}
2096+
},
20642097
"@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": {
20652098
"globals": {
20662099
"TextDecoder": true,
@@ -2684,13 +2717,13 @@
26842717
"packages": {
26852718
"@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
26862719
"@trezor/connect-web>@trezor/utils": true,
2687-
"@swc/helpers>tslib": true
2720+
"tslib": true
26882721
}
26892722
},
26902723
"@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": {
26912724
"packages": {
2692-
"@metamask/eth-sig-util": true,
2693-
"@swc/helpers>tslib": true
2725+
"@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true,
2726+
"tslib": true
26942727
}
26952728
},
26962729
"@trezor/connect-web": {
@@ -2721,7 +2754,7 @@
27212754
"@trezor/connect-web>@trezor/connect": true,
27222755
"@trezor/connect-web>@trezor/utils": true,
27232756
"webpack>events": true,
2724-
"@swc/helpers>tslib": true
2757+
"tslib": true
27252758
}
27262759
},
27272760
"@trezor/connect-web>@trezor/connect": {
@@ -2730,7 +2763,7 @@
27302763
"@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
27312764
"@trezor/connect-web>@trezor/connect>@trezor/transport": true,
27322765
"@trezor/connect-web>@trezor/utils": true,
2733-
"@swc/helpers>tslib": true
2766+
"tslib": true
27342767
}
27352768
},
27362769
"@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": {
@@ -2747,7 +2780,7 @@
27472780
},
27482781
"packages": {
27492782
"process": true,
2750-
"@swc/helpers>tslib": true,
2783+
"tslib": true,
27512784
"@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": true
27522785
}
27532786
},
@@ -2756,7 +2789,7 @@
27562789
"@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
27572790
"browserify>buffer": true,
27582791
"@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": true,
2759-
"@swc/helpers>tslib": true
2792+
"tslib": true
27602793
}
27612794
},
27622795
"@trezor/connect-web>@trezor/connect>@trezor/schema-utils": {
@@ -2786,7 +2819,7 @@
27862819
"@trezor/connect-web>@trezor/utils>bignumber.js": true,
27872820
"browserify>buffer": true,
27882821
"webpack>events": true,
2789-
"@swc/helpers>tslib": true
2822+
"tslib": true
27902823
}
27912824
},
27922825
"@welldone-software/why-did-you-render": {
@@ -2899,7 +2932,7 @@
28992932
"setTimeout": true
29002933
},
29012934
"packages": {
2902-
"@swc/helpers>tslib": true
2935+
"tslib": true
29032936
}
29042937
},
29052938
"@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
@@ -2908,7 +2941,7 @@
29082941
"setTimeout": true
29092942
},
29102943
"packages": {
2911-
"@swc/helpers>tslib": true
2944+
"tslib": true
29122945
}
29132946
},
29142947
"string.prototype.matchall>es-abstract>available-typed-arrays": {
@@ -3810,7 +3843,7 @@
38103843
"setTimeout": true
38113844
},
38123845
"packages": {
3813-
"@swc/helpers>tslib": true
3846+
"tslib": true
38143847
}
38153848
},
38163849
"browserify>util>which-typed-array>for-each": {
@@ -5324,7 +5357,7 @@
53245357
"document.getSelection": true
53255358
}
53265359
},
5327-
"@swc/helpers>tslib": {
5360+
"tslib": {
53285361
"globals": {
53295362
"SuppressedError": true,
53305363
"define": true
@@ -5412,7 +5445,7 @@
54125445
"packages": {
54135446
"react-focus-lock>use-sidecar>detect-node-es": true,
54145447
"react": true,
5415-
"@swc/helpers>tslib": true
5448+
"tslib": true
54165449
}
54175450
},
54185451
"readable-stream>util-deprecate": {

0 commit comments

Comments
 (0)