m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 11:22:43 +02:00
Code

Revert "patch lavamoat files to make v10.26.0 compatible with v78 of chrome (#18053)"

Browse Source 
This reverts commit 8c550e78e9.
This commit is contained in:
PeterYinusa 2023-03-14 12:06:48 +00:00
parent 6cc7ab212e
commit 094c5582e6
7 changed files with 9 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch
View File

File diff suppressed because one or more lines are too long

14
.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch
View File

@ -1,14 +0,0 @@
diff --git a/src/kernelCoreTemplate.js b/src/kernelCoreTemplate.js
index 255b2637167de9e5da435fe2f7ea364cfb22f86b..c229f5067a64d0a2705fa2f07085b6cac42bca9c 100644
--- a/src/kernelCoreTemplate.js
+++ b/src/kernelCoreTemplate.js
@@ -124,7 +124,8 @@
if (shouldAvoidProp(propsToAvoid, prop)) {
continue
}
- if (Object.getOwnPropertyDescriptor(globalRef, prop)?.configurable === false) {
+ const globalRefPropertyDescriptor = Object.getOwnPropertyDescriptor(globalRef, prop);
+ if (globalRefPropertyDescriptor && globalRefPropertyDescriptor.configurable === false) {
continue
}
const desc = {

16
.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch
View File

@ -1,16 +0,0 @@
diff --git a/src/kernelCoreTemplate.js b/src/kernelCoreTemplate.js
index c9916f0889c17f850bffe8e5c02b3f804c9ed810..55edb49c936f28b928f74150c748fe80a9add896 100644
--- a/src/kernelCoreTemplate.js
+++ b/src/kernelCoreTemplate.js
@@ -138,9 +138,9 @@
continue
}
let desc = Object.getOwnPropertyDescriptor(globalRef, prop)
- if (desc?.configurable === true) {
+ if (desc && desc.configurable === true) {
desc = { configurable: false, set, get }
- } else if (desc?.writable === true) {
+ } else if (desc && desc.writable === true) {
const p = new Proxy(obj, { getPrototypeOf: get, get, set } )
desc = { configurable: false, writable: false, value: p }
} else {

2
app/scripts/use-snow.js
View File

@ -3,6 +3,6 @@
const log = console.log.bind(console);
const msg = 'SNOW INTERCEPTED NEW WINDOW CREATION IN METAMASK APP: ';
window.top.SNOW((win) => {
log(msg, win, win && win.frameElement);
log(msg, win, win?.frameElement);
});
})();

1
development/build/index.js
View File

@ -94,7 +94,6 @@ async function defineAndRunBuildTasks() {
'navigator',
'harden',
'console',
'location',
// globals chrome driver needs to function (test env)
/cdc_[a-zA-Z0-9]+_[a-zA-Z]+/iu,
'performance',

6
package.json
View File

@ -202,11 +202,7 @@
"async-done@~1.3.2": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
"async-done@^1.2.0": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
"async-done@^1.2.2": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
"fast-json-patch@^3.1.1": "patch:fast-json-patch@npm%3A3.1.1#./.yarn/patches/fast-json-patch-npm-3.1.1-7e8bb70a45.patch",
"lavamoat-core@^14.0.0": "patch:lavamoat-core@npm%3A14.0.0#./.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch",
"lavamoat-core@^12.3.0": "patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch",
"lavamoat-core@^12.4.0": "patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch",
"@lavamoat/snow@^1.4.1": "patch:@lavamoat/snow@npm%3A1.4.1#./.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch"
"fast-json-patch@^3.1.1": "patch:fast-json-patch@npm%3A3.1.1#./.yarn/patches/fast-json-patch-npm-3.1.1-7e8bb70a45.patch"
},
"dependencies": {
"@babel/runtime": "^7.5.5",

47
yarn.lock
View File

@ -3347,7 +3347,7 @@ __metadata:
languageName: node
linkType: hard
"@lavamoat/snow@npm:1.4.1":
"@lavamoat/snow@npm:^1.4.1":
version: 1.4.1
resolution: "@lavamoat/snow@npm:1.4.1"
dependencies:
@ -3356,15 +3356,6 @@ __metadata:
languageName: node
linkType: hard
"@lavamoat/snow@patch:@lavamoat/snow@npm%3A1.4.1#./.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch::locator=metamask-crx%40workspace%3A.":
version: 1.4.1
resolution: "@lavamoat/snow@patch:@lavamoat/snow@npm%3A1.4.1#./.yarn/patches/@lavamoat-snow-npm-1.4.1-405a48e593.patch::version=1.4.1&hash=a60c54&locator=metamask-crx%40workspace%3A."
dependencies:
is-cross-origin: ^1.0.1
checksum: 41bdc22e178a6af18bd1419648ca17b3d214f91e0e8ae714d614b6fb8fa02cf4699d4e488c65855b9b4b91c4d4f29868e5e095883636fdece56d699027eaaa1b
languageName: node
linkType: hard
"@material-ui/core@npm:^4.11.0":
version: 4.11.0
resolution: "@material-ui/core@npm:4.11.0"
@ -22813,30 +22804,6 @@ __metadata:
languageName: node
linkType: hard
"lavamoat-core@npm:12.4.0":
version: 12.4.0
resolution: "lavamoat-core@npm:12.4.0"
dependencies:
fromentries: ^1.2.0
json-stable-stringify: ^1.0.1
lavamoat-tofu: ^6.0.2
merge-deep: ^3.0.2
checksum: 432a8968035370feb51e50f35306e7f85015e3b56440dbd41b6d3eec7f4bc82c3d1f16c6a627549df2665499c49bcb6e55fa697bccc6839bac1de12804019c1d
languageName: node
linkType: hard
"lavamoat-core@npm:14.0.0":
version: 14.0.0
resolution: "lavamoat-core@npm:14.0.0"
dependencies:
fromentries: ^1.2.0
json-stable-stringify: ^1.0.1
lavamoat-tofu: ^6.0.2
merge-deep: ^3.0.2
checksum: 16c2402aceba339ab25b830d476e95078edc1c978ef2623497ecb07f6b5eb8241541f67755a06cf3562680c1834b69d7e86ca421848b670378ad4fb0d62923ad
languageName: node
linkType: hard
"lavamoat-core@npm:^10.0.1":
version: 10.1.2
resolution: "lavamoat-core@npm:10.1.2"
@ -22850,27 +22817,27 @@ __metadata:
languageName: node
linkType: hard
"lavamoat-core@patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch::locator=metamask-crx%40workspace%3A.":
"lavamoat-core@npm:^12.3.0, lavamoat-core@npm:^12.4.0":
version: 12.4.0
resolution: "lavamoat-core@patch:lavamoat-core@npm%3A12.4.0#./.yarn/patches/lavamoat-core-npm-12.4.0-cecca1a9b5.patch::version=12.4.0&hash=05194f&locator=metamask-crx%40workspace%3A."
resolution: "lavamoat-core@npm:12.4.0"
dependencies:
fromentries: ^1.2.0
json-stable-stringify: ^1.0.1
lavamoat-tofu: ^6.0.2
merge-deep: ^3.0.2
checksum: 746968dafef3290c0513af9f4524912df1ffd5fe7e071580e4c81dfa4375b73d4e5b6fbe68f1b8a15f5aa5fb9d1edbdd0befe423be7bdab9b09da5eb0f5ebf55
checksum: 432a8968035370feb51e50f35306e7f85015e3b56440dbd41b6d3eec7f4bc82c3d1f16c6a627549df2665499c49bcb6e55fa697bccc6839bac1de12804019c1d
languageName: node
linkType: hard
"lavamoat-core@patch:lavamoat-core@npm%3A14.0.0#./.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch::locator=metamask-crx%40workspace%3A.":
"lavamoat-core@npm:^14.0.0":
version: 14.0.0
resolution: "lavamoat-core@patch:lavamoat-core@npm%3A14.0.0#./.yarn/patches/lavamoat-core-npm-14.0.0-0f5bdac846.patch::version=14.0.0&hash=fbc9b0&locator=metamask-crx%40workspace%3A."
resolution: "lavamoat-core@npm:14.0.0"
dependencies:
fromentries: ^1.2.0
json-stable-stringify: ^1.0.1
lavamoat-tofu: ^6.0.2
merge-deep: ^3.0.2
checksum: ea6be14fbfba7f285d7a9238d78db1d3eb6a91a1b5f382152c1ce0fef1708d55fe4e730aa2663d0b36dd2c7e2abc926d79f2b8e7ce3bcfe0e4ddf7d4634e59f5
checksum: 16c2402aceba339ab25b830d476e95078edc1c978ef2623497ecb07f6b5eb8241541f67755a06cf3562680c1834b69d7e86ca421848b670378ad4fb0d62923ad
languageName: node
linkType: hard