Skip to content

Commit

Permalink
Merge branch 'blockaid_default_announcement' of github.com:MetaMask/m…
Browse files Browse the repository at this point in the history 
…etamask-extension into blockaid_default_announcement
  • Loading branch information
@jpuri
jpuri committed Jan 10, 2024
2 parents a11601f + 363ff01 commit 9cc54ae
Show file tree
Hide file tree
Showing 22 changed files with 888 additions and 672 deletions.
18 changes: 10 additions & 8 deletions lavamoat/browserify/beta/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2418,7 +2418,6 @@
"HTMLElement": true,
"HTMLImageElement": true,
"HTMLVideoElement": true,
"URL.createObjectURL": true,
"clearTimeout": true,
"console.error": true,
"console.warn": true,
Expand All @@ -2432,17 +2431,20 @@
},
"@zxing/library": {
"globals": {
"HTMLImageElement": true,
"HTMLVideoElement": true,
"TextDecoder": true,
"TextEncoder": true,
"URL.createObjectURL": true,
"btoa": true,
"clearTimeout": true,
"define": true,
"document.createElement": true,
"document.createElementNS": true,
"document.getElementById": true,
"navigator.mediaDevices.enumerateDevices": true,
"navigator.mediaDevices.getUserMedia": true,
"console.log": true,
"console.warn": true,
"document": true,
"navigator": true,
"setTimeout": true
},
"packages": {
"@zxing/library>ts-custom-error": true
}
},
"addons-linter>sha.js": {
Expand Down
18 changes: 10 additions & 8 deletions lavamoat/browserify/desktop/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2675,7 +2675,6 @@
"HTMLElement": true,
"HTMLImageElement": true,
"HTMLVideoElement": true,
"URL.createObjectURL": true,
"clearTimeout": true,
"console.error": true,
"console.warn": true,
Expand All @@ -2689,17 +2688,20 @@
},
"@zxing/library": {
"globals": {
"HTMLImageElement": true,
"HTMLVideoElement": true,
"TextDecoder": true,
"TextEncoder": true,
"URL.createObjectURL": true,
"btoa": true,
"clearTimeout": true,
"define": true,
"document.createElement": true,
"document.createElementNS": true,
"document.getElementById": true,
"navigator.mediaDevices.enumerateDevices": true,
"navigator.mediaDevices.getUserMedia": true,
"console.log": true,
"console.warn": true,
"document": true,
"navigator": true,
"setTimeout": true
},
"packages": {
"@zxing/library>ts-custom-error": true
}
},
"addons-linter>sha.js": {
Expand Down
18 changes: 10 additions & 8 deletions lavamoat/browserify/flask/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2729,7 +2729,6 @@
"HTMLElement": true,
"HTMLImageElement": true,
"HTMLVideoElement": true,
"URL.createObjectURL": true,
"clearTimeout": true,
"console.error": true,
"console.warn": true,
Expand All @@ -2743,17 +2742,20 @@
},
"@zxing/library": {
"globals": {
"HTMLImageElement": true,
"HTMLVideoElement": true,
"TextDecoder": true,
"TextEncoder": true,
"URL.createObjectURL": true,
"btoa": true,
"clearTimeout": true,
"define": true,
"document.createElement": true,
"document.createElementNS": true,
"document.getElementById": true,
"navigator.mediaDevices.enumerateDevices": true,
"navigator.mediaDevices.getUserMedia": true,
"console.log": true,
"console.warn": true,
"document": true,
"navigator": true,
"setTimeout": true
},
"packages": {
"@zxing/library>ts-custom-error": true
}
},
"addons-linter>sha.js": {
Expand Down
18 changes: 10 additions & 8 deletions lavamoat/browserify/main/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2652,7 +2652,6 @@
"HTMLElement": true,
"HTMLImageElement": true,
"HTMLVideoElement": true,
"URL.createObjectURL": true,
"clearTimeout": true,
"console.error": true,
"console.warn": true,
Expand All @@ -2666,17 +2665,20 @@
},
"@zxing/library": {
"globals": {
"HTMLImageElement": true,
"HTMLVideoElement": true,
"TextDecoder": true,
"TextEncoder": true,
"URL.createObjectURL": true,
"btoa": true,
"clearTimeout": true,
"define": true,
"document.createElement": true,
"document.createElementNS": true,
"document.getElementById": true,
"navigator.mediaDevices.enumerateDevices": true,
"navigator.mediaDevices.getUserMedia": true,
"console.log": true,
"console.warn": true,
"document": true,
"navigator": true,
"setTimeout": true
},
"packages": {
"@zxing/library>ts-custom-error": true
}
},
"addons-linter>sha.js": {
Expand Down
18 changes: 10 additions & 8 deletions lavamoat/browserify/mmi/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2730,7 +2730,6 @@
"HTMLElement": true,
"HTMLImageElement": true,
"HTMLVideoElement": true,
"URL.createObjectURL": true,
"clearTimeout": true,
"console.error": true,
"console.warn": true,
Expand All @@ -2744,17 +2743,20 @@
},
"@zxing/library": {
"globals": {
"HTMLImageElement": true,
"HTMLVideoElement": true,
"TextDecoder": true,
"TextEncoder": true,
"URL.createObjectURL": true,
"btoa": true,
"clearTimeout": true,
"define": true,
"document.createElement": true,
"document.createElementNS": true,
"document.getElementById": true,
"navigator.mediaDevices.enumerateDevices": true,
"navigator.mediaDevices.getUserMedia": true,
"console.log": true,
"console.warn": true,
"document": true,
"navigator": true,
"setTimeout": true
},
"packages": {
"@zxing/library>ts-custom-error": true
}
},
"addons-linter>sha.js": {
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
"dist:mmi:debug": "yarn dist --build-type mmi --apply-lavamoat=false",
"build": "yarn lavamoat:build",
"build:dev": "node development/build/index.js",
"start:test": "BLOCKAID_FILE_CDN=static.metafi-dev.codefi.network/api/v1/confirmations/ppom SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build:dev testDev --apply-lavamoat=false --snow=false",
"start:test": "BLOCKAID_FILE_CDN=static.metafi.codefi.network/api/v1/confirmations/ppom SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build:dev testDev --apply-lavamoat=false --snow=false",
"start:test:flask": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build:dev testDev --build-type flask --apply-lavamoat=false --snow=false",
"start:test:mv3": "ENABLE_MV3=true SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build:dev testDev",
"benchmark:chrome": "SELENIUM_BROWSER=chrome ts-node test/e2e/benchmark.js",
"mv3:stats:chrome": "SELENIUM_BROWSER=chrome ENABLE_MV3=true ts-node test/e2e/mv3-perf-stats/index.js",
"user-actions-benchmark:chrome": "SELENIUM_BROWSER=chrome ts-node test/e2e/user-actions-benchmark.js",
"benchmark:firefox": "SELENIUM_BROWSER=firefox ts-node test/e2e/benchmark.js",
"build:test": "BLOCKAID_FILE_CDN=static.metafi-dev.codefi.network/api/v1/confirmations/ppom SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build test",
"build:test": "BLOCKAID_FILE_CDN=static.metafi.codefi.network/api/v1/confirmations/ppom SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build test",
"build:test:flask": "yarn build test --build-type flask",
"build:test:mmi": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' yarn build test --build-type mmi",
"build:test:mv3": "ENABLE_MV3=true SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build test",
Expand Down Expand Up @@ -224,7 +224,7 @@
},
"dependencies": {
"@babel/runtime": "^7.23.2",
"@blockaid/ppom_release": "^1.3.3",
"@blockaid/ppom_release": "^1.4.0",
"@ensdomains/content-hash": "^2.5.6",
"@ethereumjs/common": "^3.1.1",
"@ethereumjs/tx": "^4.1.1",
Expand All @@ -250,7 +250,7 @@
"@metamask/address-book-controller": "^3.0.0",
"@metamask/announcement-controller": "^4.0.0",
"@metamask/approval-controller": "^5.1.0",
"@metamask/assets-controllers": "^23.0.0",
"@metamask/assets-controllers": "^24.0.0",
"@metamask/base-controller": "^4.0.0",
"@metamask/browser-passworder": "^4.3.0",
"@metamask/contract-metadata": "^2.3.1",
Expand Down Expand Up @@ -306,8 +306,8 @@
"@sentry/types": "^7.53.0",
"@sentry/utils": "^7.53.0",
"@trezor/connect-web": "9.0.11",
"@zxing/browser": "^0.0.10",
"@zxing/library": "0.8.0",
"@zxing/browser": "^0.1.4",
"@zxing/library": "0.20.0",
"await-semaphore": "^0.1.1",
"base32-encode": "^1.2.0",
"base64-js": "^1.5.1",
Expand Down
Loading

0 comments on commit 9cc54ae

Please sign in to comment.