-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
…27688) <!-- 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** <!-- 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? --> This PR bumps the `@metamask/eth-ledger-bridge-keyring` dependency to `^5.0.1`. [](https://codespaces.new/MetaMask/metamask-extension/pull/27688?quickstart=1) ## **Related issues** Unblocks: #26840 ## **Manual testing steps** This changes directly impacts Ledger devices: 1. Add one or more ledger accounts 2. Sign message 3. Sign typed data 4. Sign transaction 5. Remove Ledger accounts ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** **Add account and sign** https://github.com/user-attachments/assets/d685a416-6931-4aae-b207-e263ac235064 **Forget device** https://github.com/user-attachments/assets/0e11216a-04e1-4166-af4e-e7847d1b2809 ## **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.
](https://codespaces.new/MetaMask/metamask-extension/pull/27688?quickstart=1){kind=link}
- Loading branch information
1 parent
0be3a41
commit 7b3f951
Showing
8 changed files
with
980 additions
and
72 deletions.
There are no files selected for viewing
15 changes: 15 additions & 0 deletions
15
.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/lib/message/EIP712/index.js b/lib/message/EIP712/index.js | ||
| index 5443ac06d4ef29028e3acce98210949da2ef9263..57ec8615340a9285290ad5d2c2522ed19af2d0fc 100644 | ||
| --- a/lib/message/EIP712/index.js | ||
| +++ b/lib/message/EIP712/index.js | ||
| @@ -28,8 +28,8 @@ const ethers_1 = require("ethers"); | ||
| const axios_1 = __importDefault(require("axios")); | ||
| const sha224_1 = __importDefault(require("crypto-js/sha224")); | ||
| const live_env_1 = require("@ledgerhq/live-env"); | ||
| -const eip712_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/data/eip712")); | ||
| -const eip712_v2_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/data/eip712_v2")); | ||
| +const eip712_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/lib/data/eip712")); | ||
| +const eip712_v2_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/lib/data/eip712_v2")); | ||
| // As defined in [spec](https://eips.ethereum.org/EIPS/eip-712), the properties below are all required. | ||
| function isEIP712Message(message) { | ||
| return (!!message && |
65 changes: 65 additions & 0 deletions
65
.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| diff --git a/lib/modules/EIP712/index.js b/lib/modules/EIP712/index.js | ||
| index bbca23c9a596b2b300aca0f323bad277a4190def..c85cb18c3d6ff049c442d358b4d834c04a49951f 100644 | ||
| --- a/lib/modules/EIP712/index.js | ||
| +++ b/lib/modules/EIP712/index.js | ||
| @@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); | ||
| exports.signEIP712HashedMessage = exports.signEIP712Message = void 0; | ||
| /* eslint-disable @typescript-eslint/no-duplicate-enum-values */ | ||
| const semver_1 = __importDefault(require("semver")); | ||
| -const index_1 = require("@ledgerhq/evm-tools/message/EIP712/index"); | ||
| +const index_1 = require("@ledgerhq/evm-tools/lib/message/EIP712/index"); | ||
| const erc20_1 = require("../../services/ledger/erc20"); | ||
| const utils_1 = require("../../utils"); | ||
| const loadConfig_1 = require("../../services/ledger/loadConfig"); | ||
| diff --git a/lib/modules/EIP712/utils.js b/lib/modules/EIP712/utils.js | ||
| index 4f09ea8a24ae4f175f1a4d2d40999d36ffa2a915..1cc7de0d5ffd2b980741ad6d85a75792085c031b 100644 | ||
| --- a/lib/modules/EIP712/utils.js | ||
| +++ b/lib/modules/EIP712/utils.js | ||
| @@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { | ||
| Object.defineProperty(exports, "__esModule", { value: true }); | ||
| exports.getPayloadForFilterV2 = exports.getFilterDisplayNameAndSigBuffers = exports.getAppAndVersion = exports.getCoinRefTokensMap = exports.makeTypeEntryStructBuffer = exports.constructTypeDescByteString = exports.destructTypeFromString = exports.EIP712_TYPE_ENCODERS = exports.EIP712_TYPE_PROPERTIES = void 0; | ||
| const bignumber_js_1 = __importDefault(require("bignumber.js")); | ||
| -const index_1 = require("@ledgerhq/evm-tools/message/index"); | ||
| +const index_1 = require("@ledgerhq/evm-tools/lib/message/index"); | ||
| const utils_1 = require("../../utils"); | ||
| /** | ||
| * @ignore for the README | ||
| diff --git a/lib/services/ledger/erc20.js b/lib/services/ledger/erc20.js | ||
| index 8fdedf8037b2684ab6d48fd279a0c014b074b676..c10cea22504a4d3cd72bfac51463e5664639d20e 100644 | ||
| --- a/lib/services/ledger/erc20.js | ||
| +++ b/lib/services/ledger/erc20.js | ||
| @@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); | ||
| exports.byContractAddressAndChainId = exports.findERC20SignaturesInfo = void 0; | ||
| const axios_1 = __importDefault(require("axios")); | ||
| const logs_1 = require("@ledgerhq/logs"); | ||
| -const index_1 = require("@ledgerhq/cryptoassets-evm-signatures/data/evm/index"); | ||
| +const index_1 = require("@ledgerhq/cryptoassets-evm-signatures/lib/data/evm/index"); | ||
| const loadConfig_1 = require("./loadConfig"); | ||
| const asContractAddress = (addr) => { | ||
| const a = addr.toLowerCase(); | ||
| diff --git a/lib/services/ledger/index.js b/lib/services/ledger/index.js | ||
| index 8385537236dfc98902376b29f712e9f7b605091a..6641b951b0c7e477fe5622c724ee22b9e5272213 100644 | ||
| --- a/lib/services/ledger/index.js | ||
| +++ b/lib/services/ledger/index.js | ||
| @@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); | ||
| // This implements the resolution of a Transaction using Ledger's own API | ||
| const logs_1 = require("@ledgerhq/logs"); | ||
| const abi_1 = require("@ethersproject/abi"); | ||
| -const index_1 = require("@ledgerhq/domain-service/signers/index"); | ||
| +const index_1 = require("@ledgerhq/domain-service/lib/signers/index"); | ||
| const erc20_1 = require("./erc20"); | ||
| const contracts_1 = require("./contracts"); | ||
| const nfts_1 = require("./nfts"); | ||
| diff --git a/lib/utils.js b/lib/utils.js | ||
| index 027089bf09c047b34af79e3dea253d5335d336f3..1c5da628db47a33099532973de9ea634a1ee65df 100644 | ||
| --- a/lib/utils.js | ||
| +++ b/lib/utils.js | ||
| @@ -2,7 +2,7 @@ | ||
| Object.defineProperty(exports, "__esModule", { value: true }); | ||
| exports.mergeResolutions = exports.nftSelectors = exports.tokenSelectors = exports.intAsHexBytes = exports.decodeTxInfo = exports.maybeHexBuffer = exports.hexBuffer = exports.splitPath = exports.padHexString = exports.ERC1155_CLEAR_SIGNED_SELECTORS = exports.ERC721_CLEAR_SIGNED_SELECTORS = exports.ERC20_CLEAR_SIGNED_SELECTORS = void 0; | ||
| const bignumber_js_1 = require("bignumber.js"); | ||
| -const index_1 = require("@ledgerhq/evm-tools/selectors/index"); | ||
| +const index_1 = require("@ledgerhq/evm-tools/lib/selectors/index"); | ||
| Object.defineProperty(exports, "ERC20_CLEAR_SIGNED_SELECTORS", { enumerable: true, get: function () { return index_1.ERC20_CLEAR_SIGNED_SELECTORS; } }); | ||
| Object.defineProperty(exports, "ERC721_CLEAR_SIGNED_SELECTORS", { enumerable: true, get: function () { return index_1.ERC721_CLEAR_SIGNED_SELECTORS; } }); | ||
| Object.defineProperty(exports, "ERC1155_CLEAR_SIGNED_SELECTORS", { enumerable: true, get: function () { return index_1.ERC1155_CLEAR_SIGNED_SELECTORS; } }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.