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

Merge branch 'develop' into master-sync

Browse Source
This commit is contained in:
Mark Stacey 2023-04-04 09:28:14 -02:30 committed by GitHub
commit 8f4651332f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/controllers/network/network-controller.js
View File

@ -5,7 +5,7 @@ import log from 'loglevel';
import {
createSwappableProxy,
createEventEmitterProxy,
} from 'swappable-obj-proxy';
} from '@metamask/swappable-obj-proxy';
import EthQuery from 'eth-query';
// ControllerMessenger is referred to in the JSDocs
// eslint-disable-next-line no-unused-vars

4
lavamoat/browserify/desktop/policy.json
View File

@ -878,8 +878,8 @@
},
"packages": {
"@metamask/desktop>@metamask/obs-store>through2": true,
"browserify>stream-browserify": true,
"json-rpc-engine>@metamask/safe-event-emitter": true
"@metamask/safe-event-emitter": true,
"browserify>stream-browserify": true
}
},
"@metamask/desktop>@metamask/obs-store>through2": {

4
lavamoat/browserify/flask/policy.json
View File

@ -878,8 +878,8 @@
},
"packages": {
"@metamask/desktop>@metamask/obs-store>through2": true,
"browserify>stream-browserify": true,
"json-rpc-engine>@metamask/safe-event-emitter": true
"@metamask/safe-event-emitter": true,
"browserify>stream-browserify": true
}
},
"@metamask/desktop>@metamask/obs-store>through2": {

2
package.json
View File

@ -263,6 +263,7 @@
"@metamask/snaps-ui": "^0.32.2",
"@metamask/snaps-utils": "^0.32.2",
"@metamask/subject-metadata-controller": "^1.0.0",
"@metamask/swappable-obj-proxy": "^2.1.0",
"@metamask/utils": "^5.0.0",
"@ngraveio/bc-ur": "^1.1.6",
"@popperjs/core": "^2.4.0",
@ -351,7 +352,6 @@
"reselect": "^3.0.1",
"ses": "^0.12.4",
"single-call-balance-checker-abi": "^1.0.0",
"swappable-obj-proxy": "^1.1.0",
"unicode-confusables": "^0.1.1",
"uuid": "^8.3.2",
"valid-url": "^1.0.9",

16
yarn.lock
View File

@ -4467,6 +4467,13 @@ __metadata:
languageName: node
linkType: hard
"@metamask/swappable-obj-proxy@npm:^2.1.0":
version: 2.1.0
resolution: "@metamask/swappable-obj-proxy@npm:2.1.0"
checksum: b15cebee7fb189d1143d3a755a38a7d88f56f91e1277425a51f63c50c432dfb4e6e22650ef67474ae4ef2a97344231af00be6780f126c47d401a23c8a8fb3c9c
languageName: node
linkType: hard
"@metamask/test-dapp@npm:^5.6.0":
version: 5.6.0
resolution: "@metamask/test-dapp@npm:5.6.0"
@ -24315,6 +24322,7 @@ __metadata:
"@metamask/snaps-ui": ^0.32.2
"@metamask/snaps-utils": ^0.32.2
"@metamask/subject-metadata-controller": ^1.0.0
"@metamask/swappable-obj-proxy": ^2.1.0
"@metamask/test-dapp": ^5.6.0
"@metamask/utils": ^5.0.0
"@ngraveio/bc-ur": ^1.1.6
@ -24553,7 +24561,6 @@ __metadata:
string.prototype.matchall: ^4.0.2
style-loader: ^0.21.0
stylelint: ^13.6.1
swappable-obj-proxy: ^1.1.0
terser: ^5.7.0
through2: ^4.0.2
ts-node: ^10.5.0
@ -32606,13 +32613,6 @@ __metadata:
languageName: node
linkType: hard
"swappable-obj-proxy@npm:^1.1.0":
version: 1.1.0
resolution: "swappable-obj-proxy@npm:1.1.0"
checksum: 6b1d087e6d03fdb89f94bcb251a407d832964813ed9129f46096dcf99fdbd44398dadbed941dcaeb8d07b89e400fd603f9a589aa01938916b1d0d2a1c9906c65
languageName: node
linkType: hard
"symbol-observable@npm:^2.0.3":
version: 2.0.3
resolution: "symbol-observable@npm:2.0.3"