-
Notifications
You must be signed in to change notification settings - Fork 5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into master-sync
- Loading branch information
Showing
747 changed files
with
17,689 additions
and
13,648 deletions.
There are no files selected for viewing
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
This file was deleted.
Oops, something went wrong.
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
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,29 @@ | ||
| name: 'Close stale issues and PRs' | ||
|
|
||
| # run every 2 hours | ||
| on: | ||
| schedule: | ||
| - cron: '0 */2 * * *' | ||
|
|
||
| jobs: | ||
| stale: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| issues: write | ||
| pull-requests: write | ||
| steps: | ||
| - uses: actions/stale@72afbce2b0dbd1d903bb142cebe2d15dc307ae57 | ||
| with: | ||
| stale-issue-label: 'stale' | ||
| only-issue-labels: 'type-bug' | ||
| exempt-issue-labels: 'type-security' | ||
| days-before-issue-stale: 90 | ||
| stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity in the last 90 days. It will be closed in 45 days if there is no further activity. The MetaMask team intends on reviewing this issue before close, and removing the stale label if it is still a bug. We welcome new comments on this issue. We do not intend on closing issues if they report bugs that are still reproducible. Thank you for your contributions.' | ||
| days-before-issue-close: 45 | ||
| close-issue-message: 'This issue was closed because there has been no follow up activity in the last 45 days. If you feel this was closed in error, please reopen and provide evidence on the latest release of the extension. Thank you for your contributions.' | ||
| stale-pr-label: 'stale' | ||
| days-before-pr-stale: 60 | ||
| stale-pr-message: 'This PR has been automatically marked as stale because it has not had recent activity in the last 60 days. It will be closed in 14 days. Thank you for your contributions.' | ||
| days-before-pr-close: 14 | ||
| close-pr-message: 'This PR was closed because there has been no follow up activity in the last 14 days. Thank you for your contributions.' | ||
| operations-per-run: 600 |
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
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
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
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 |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| # All of these are defaults except singleQuote and endOfLine, but we specify them | ||
| # for explicitness | ||
| endOfLine: auto | ||
| singleQuote: true | ||
| trailingComma: all |
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
46 changes: 46 additions & 0 deletions
46
.yarn/patches/@metamask-keyring-controller-npm-7.0.0-962008b200.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,46 @@ | ||
| diff --git a/dist/KeyringController.d.ts b/dist/KeyringController.d.ts | ||
| index 82de83a7bb1ad14bb23f3b6274e0c4d5bb773382..86a09b3f604f6feb26e2c7edbdcb0abebd4bae20 100644 | ||
| --- a/dist/KeyringController.d.ts | ||
| +++ b/dist/KeyringController.d.ts | ||
| @@ -1,10 +1,11 @@ | ||
| import type { TxData, TypedTransaction } from '@ethereumjs/tx'; | ||
| -import { type MetaMaskKeyring as QRKeyring, type IKeyringState as IQRKeyringState } from '@keystonehq/metamask-airgapped-keyring'; | ||
| +import type { MetaMaskKeyring as QRKeyring, IKeyringState as IQRKeyringState } from '@keystonehq/metamask-airgapped-keyring'; | ||
| import type { RestrictedControllerMessenger } from '@metamask/base-controller'; | ||
| import { BaseControllerV2 } from '@metamask/base-controller'; | ||
| import type { PersonalMessageParams, TypedMessageParams } from '@metamask/message-manager'; | ||
| import type { PreferencesController } from '@metamask/preferences-controller'; | ||
| -import { type Hex, type Keyring, type Json } from '@metamask/utils'; | ||
| +import type { Hex, Keyring, Json } from '@metamask/utils'; | ||
| +import type { KeyringController as EthKeyringController } from '@metamask/eth-keyring-controller'; | ||
| import type { Patch } from 'immer'; | ||
| declare const name = "KeyringController"; | ||
| /** | ||
| @@ -135,6 +136,10 @@ export declare class KeyringController extends BaseControllerV2<typeof name, Key | ||
| * @param opts.state - Initial state to set on this controller. | ||
| */ | ||
| constructor({ removeIdentity, syncIdentities, updateIdentities, setSelectedAddress, setAccountLabel, encryptor, keyringBuilders, cacheEncryptionKey, messenger, state, }: KeyringControllerOptions); | ||
| + /** | ||
| + * Gets the internal keyring controller. | ||
| + */ | ||
| + getEthKeyringController(): EthKeyringController; | ||
| /** | ||
| * Adds a new account to the default (first) HD seed phrase keyring. | ||
| * | ||
| diff --git a/dist/KeyringController.js b/dist/KeyringController.js | ||
| index 54d39d266425b45ed1008cecb16e78cf831c75d7..0ddded415bf71716c27ed3bf7bd1c5a79b11be13 100644 | ||
| --- a/dist/KeyringController.js | ||
| +++ b/dist/KeyringController.js | ||
| @@ -153,6 +153,12 @@ class KeyringController extends base_controller_1.BaseControllerV2 { | ||
| this.setSelectedAddress = setSelectedAddress; | ||
| this.setAccountLabel = setAccountLabel; | ||
| } | ||
| + /** | ||
| + * Gets the internal keyring controller. | ||
| + */ | ||
| + getEthKeyringController() { | ||
| + return __classPrivateFieldGet(this, _KeyringController_keyring, "f"); | ||
| + } | ||
| /** | ||
| * Adds a new account to the default (first) HD seed phrase keyring. | ||
| * |
17 changes: 0 additions & 17 deletions
17
.yarn/patches/@metamask-signature-controller-npm-4.0.1-013e64c9fd.patch
This file was deleted.
Oops, something went wrong.
26 changes: 26 additions & 0 deletions
26
.yarn/patches/@metamask-signature-controller-npm-5.3.0-225628460b.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,26 @@ | ||
| diff --git a/dist/SignatureController.js b/dist/SignatureController.js | ||
| index a2f064efa2a2700db00767daa4ce6bd22b1932c4..17edb51b6c526f27fb4c19f2d2fda3d7140c66b4 100644 | ||
| --- a/dist/SignatureController.js | ||
| +++ b/dist/SignatureController.js | ||
| @@ -283,8 +283,11 @@ _SignatureController_keyringController = new WeakMap(), _SignatureController_isE | ||
| resultCallbacks = acceptResult.resultCallbacks; | ||
| } | ||
| catch (_a) { | ||
| + signaturePromise.catch(() => { | ||
| + // Expecting reject error but throwing manually rather than waiting | ||
| + }); | ||
| __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_cancelAbstractMessage).call(this, messageManager, messageId); | ||
| - throw eth_rpc_errors_1.ethErrors.provider.userRejectedRequest('User rejected the request.'); | ||
| + throw eth_rpc_errors_1.ethErrors.provider.userRejectedRequest(`MetaMask ${messageName} Signature: User denied message signature.`); | ||
| } | ||
| yield signMessage(messageParamsWithId, signingOpts); | ||
| const signatureResult = yield signaturePromise; | ||
| @@ -305,7 +308,7 @@ _SignatureController_keyringController = new WeakMap(), _SignatureController_isE | ||
| return __awaiter(this, void 0, void 0, function* () { | ||
| return yield __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_signAbstractMessage).call(this, __classPrivateFieldGet(this, _SignatureController_personalMessageManager, "f"), controller_utils_1.ApprovalType.PersonalSign, msgParams, (cleanMsgParams) => __awaiter(this, void 0, void 0, function* () { return yield __classPrivateFieldGet(this, _SignatureController_keyringController, "f").signPersonalMessage(cleanMsgParams); })); | ||
| }); | ||
| -}, _SignatureController_signTypedMessage = function _SignatureController_signTypedMessage(msgParams, | ||
| +}, _SignatureController_signTypedMessage = function _SignatureController_signTypedMessage(msgParams, | ||
| /* istanbul ignore next */ | ||
| opts = { parseJsonData: true }) { | ||
| return __awaiter(this, void 0, void 0, function* () { |
Oops, something went wrong.