m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

Restore support for Linea networks (#20011)

Browse Source 
When the NetworkController in this repo was replaced with
`@metamask/network-controller`, support for Linea networks was lost
as it did not support it at that time. `@metamask/network-controller`
has since been updated, so this commit bumps that package to restore
support.
This commit is contained in:
Elliot Winkler 2023-07-13 16:57:31 -06:00 committed by Dan J Miller
parent ccc4cf1bb9
commit 65946c47c4
8 changed files with 43 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.iyarc
View File

@ -9,3 +9,7 @@ GHSA-p8p7-x288-28g6
# Not easily patched
# Minimal risk to us because we're using lockdown which also prevents this case of prototype pollution
GHSA-h755-8qp9-cq85
# tough-cookie
# this will go away soon when we get rid of web3-provider-engine
GHSA-72xf-g2v4-qvf3

22
lavamoat/browserify/beta/policy.json
View File

@ -1621,7 +1621,7 @@
},
"packages": {
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
"@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
"eth-rpc-errors": true,
"json-rpc-engine": true,
"node-fetch": true
@ -1639,26 +1639,6 @@
"superstruct": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
"globals": {
"URL": true,
"btoa": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
"@metamask/safe-event-emitter": true,
"browserify>browser-resolve": true,
"eth-rpc-errors": true,
"json-rpc-engine": true,
"lavamoat>json-stable-stringify": true,
"vinyl>clone": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider": {
"packages": {
"@metamask/safe-event-emitter": true,

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

@ -1747,7 +1747,7 @@
},
"packages": {
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
"@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
"eth-rpc-errors": true,
"json-rpc-engine": true,
"node-fetch": true
@ -1765,26 +1765,6 @@
"superstruct": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
"globals": {
"URL": true,
"btoa": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
"@metamask/safe-event-emitter": true,
"browserify>browser-resolve": true,
"eth-rpc-errors": true,
"json-rpc-engine": true,
"lavamoat>json-stable-stringify": true,
"vinyl>clone": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider": {
"packages": {
"@metamask/safe-event-emitter": true,

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

@ -1747,7 +1747,7 @@
},
"packages": {
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
"@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
"eth-rpc-errors": true,
"json-rpc-engine": true,
"node-fetch": true
@ -1765,26 +1765,6 @@
"superstruct": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
"globals": {
"URL": true,
"btoa": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
"@metamask/safe-event-emitter": true,
"browserify>browser-resolve": true,
"eth-rpc-errors": true,
"json-rpc-engine": true,
"lavamoat>json-stable-stringify": true,
"vinyl>clone": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider": {
"packages": {
"@metamask/safe-event-emitter": true,

22
lavamoat/browserify/main/policy.json
View File

@ -1621,7 +1621,7 @@
},
"packages": {
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
"@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
"eth-rpc-errors": true,
"json-rpc-engine": true,
"node-fetch": true
@ -1639,26 +1639,6 @@
"superstruct": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
"globals": {
"URL": true,
"btoa": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
"@metamask/safe-event-emitter": true,
"browserify>browser-resolve": true,
"eth-rpc-errors": true,
"json-rpc-engine": true,
"lavamoat>json-stable-stringify": true,
"vinyl>clone": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider": {
"packages": {
"@metamask/safe-event-emitter": true,

22
lavamoat/browserify/mmi/policy.json
View File

@ -1842,7 +1842,7 @@
},
"packages": {
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
"@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
"eth-rpc-errors": true,
"json-rpc-engine": true,
"node-fetch": true
@ -1860,26 +1860,6 @@
"superstruct": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
"globals": {
"URL": true,
"btoa": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
"@metamask/safe-event-emitter": true,
"browserify>browser-resolve": true,
"eth-rpc-errors": true,
"json-rpc-engine": true,
"lavamoat>json-stable-stringify": true,
"vinyl>clone": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider": {
"packages": {
"@metamask/safe-event-emitter": true,

4
package.json
View File

@ -230,7 +230,7 @@
"@metamask/base-controller": "^3.1.0",
"@metamask/browser-passworder": "^4.1.0",
"@metamask/contract-metadata": "^2.3.1",
"@metamask/controller-utils": "^4.1.0",
"@metamask/controller-utils": "^4.2.0",
"@metamask/design-tokens": "^1.12.0",
"@metamask/desktop": "^0.3.0",
"@metamask/eth-json-rpc-middleware": "^11.0.0",
@ -246,7 +246,7 @@
"@metamask/logo": "^3.1.1",
"@metamask/message-manager": "^7.0.2",
"@metamask/metamask-eth-abis": "^3.0.0",
"@metamask/network-controller": "^10.3.0",
"@metamask/network-controller": "^10.3.1",
"@metamask/notification-controller": "^3.0.0",
"@metamask/obs-store": "^8.1.0",
"@metamask/permission-controller": "^4.0.0",

71
yarn.lock
View File

@ -4007,9 +4007,9 @@ __metadata:
languageName: node
linkType: hard
"@metamask/controller-utils@npm:^4.0.0, @metamask/controller-utils@npm:^4.0.1, @metamask/controller-utils@npm:^4.1.0":
version: 4.1.0
resolution: "@metamask/controller-utils@npm:4.1.0"
"@metamask/controller-utils@npm:^4.0.0, @metamask/controller-utils@npm:^4.0.1, @metamask/controller-utils@npm:^4.1.0, @metamask/controller-utils@npm:^4.2.0":
version: 4.2.0
resolution: "@metamask/controller-utils@npm:4.2.0"
dependencies:
"@metamask/utils": ^5.0.2
"@spruceid/siwe-parser": 1.1.3
@ -4020,7 +4020,7 @@ __metadata:
ethereumjs-util: ^7.0.10
ethjs-unit: ^0.1.6
fast-deep-equal: ^3.1.3
checksum: b4975e6ca860b691931254aa749e8c4faddd04279609cf197155b38150e55da0e966bf9b2d61ee1cd070f79d16e0305d5a0ff1747e0b4ab2e1c3ab46ca84e4d7
checksum: e71779577c37038e6e605a43ef6b9c1af82e0b3887a72c01f48ae1e4e2005116fc9d09c8b690139478c04dd2929e227642c5fd80cfbc81814d667c415c714228
languageName: node
linkType: hard
@ -4121,16 +4121,16 @@ __metadata:
languageName: node
linkType: hard
"@metamask/eth-json-rpc-infura@npm:^8.0.0":
version: 8.1.0
resolution: "@metamask/eth-json-rpc-infura@npm:8.1.0"
"@metamask/eth-json-rpc-infura@npm:^8.1.0":
version: 8.1.1
resolution: "@metamask/eth-json-rpc-infura@npm:8.1.1"
dependencies:
"@metamask/utils": ^3.0.1
eth-json-rpc-middleware: ^9.0.0
"@metamask/eth-json-rpc-provider": ^1.0.0
"@metamask/utils": ^4.0.0
eth-rpc-errors: ^4.0.3
json-rpc-engine: ^6.1.0
node-fetch: ^2.6.7
checksum: fd09383e2b3c16187b8889b53bfc431fc7ea4f6483acc23ddf77f2fd771ad0fbff41d6a62d4b05833e7cda66adafe0cb3730d7c0e9575b89683b71a82ab1ee1f
checksum: ab4ce53fcc1586344824d58aed4d71412b015466f697758b4849e186038ae1730c9765935dfaf1a9131ff1a8f0f36dcb66fd50355ed95ac7a4bf0bc18c4c2696
languageName: node
linkType: hard
@ -4378,13 +4378,13 @@ __metadata:
languageName: node
linkType: hard
"@metamask/network-controller@npm:^10.2.0, @metamask/network-controller@npm:^10.3.0":
version: 10.3.0
resolution: "@metamask/network-controller@npm:10.3.0"
"@metamask/network-controller@npm:^10.2.0, @metamask/network-controller@npm:^10.3.0, @metamask/network-controller@npm:^10.3.1":
version: 10.3.1
resolution: "@metamask/network-controller@npm:10.3.1"
dependencies:
"@metamask/base-controller": ^3.0.0
"@metamask/controller-utils": ^4.1.0
"@metamask/eth-json-rpc-infura": ^8.0.0
"@metamask/base-controller": ^3.1.0
"@metamask/controller-utils": ^4.2.0
"@metamask/eth-json-rpc-infura": ^8.1.0
"@metamask/eth-json-rpc-middleware": ^11.0.0
"@metamask/eth-json-rpc-provider": ^1.0.0
"@metamask/swappable-obj-proxy": ^2.1.0
@ -4397,7 +4397,7 @@ __metadata:
immer: ^9.0.6
json-rpc-engine: ^6.1.0
uuid: ^8.3.2
checksum: 0c48625af9c18be3ed2a433209db770bab02e667e251be1ef4c1f61a62c25907536ff740712bdfd799ac923a4a6bb9df5430ead8d4215507bbf30dcc7a40d53c
checksum: 62adb90b02eae1236f9c1c3ceb70c9de0f4e390c3b68ced0c81b0b867dced7814d5d805cdfb6e0ccc9e62b82fac762f70c204f08feb3f3ee5647610d079cbdd7
languageName: node
linkType: hard
@ -4968,7 +4968,7 @@ __metadata:
languageName: node
linkType: hard
"@metamask/utils@npm:^3.0.1, @metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.4.1":
"@metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.4.1":
version: 3.6.0
resolution: "@metamask/utils@npm:3.6.0"
dependencies:
@ -4980,6 +4980,18 @@ __metadata:
languageName: node
linkType: hard
"@metamask/utils@npm:^4.0.0":
version: 4.0.0
resolution: "@metamask/utils@npm:4.0.0"
dependencies:
"@types/debug": ^4.1.7
debug: ^4.3.4
semver: ^7.3.8
superstruct: ^1.0.3
checksum: 6d4edca78fe1f66504ed5e5ca021a67f4b4e0893e86484c746b87039c2161c39d3b8bd8e4b9235ddfd023b2d76dd54210af94ec5550e27bc4ad9c0d7d5f3f231
languageName: node
linkType: hard
"@metamask/utils@npm:^5.0.0, @metamask/utils@npm:^5.0.1, @metamask/utils@npm:^5.0.2":
version: 5.0.2
resolution: "@metamask/utils@npm:5.0.2"
@ -15997,25 +16009,6 @@ __metadata:
languageName: node
linkType: hard
"eth-json-rpc-middleware@npm:^9.0.0":
version: 9.0.1
resolution: "eth-json-rpc-middleware@npm:9.0.1"
dependencies:
"@metamask/eth-sig-util": ^5.0.0
"@metamask/safe-event-emitter": ^2.0.0
"@metamask/utils": ^3.0.3
btoa: ^1.2.1
clone: ^2.1.1
eth-block-tracker: ^5.0.1
eth-rpc-errors: ^4.0.3
json-rpc-engine: ^6.1.0
json-stable-stringify: ^1.0.1
node-fetch: ^2.6.7
pify: ^3.0.0
checksum: 9512829a6958df6ef739b891a0c0804b51a140407fd2e3ddaaa6b18d975796646cfcf7f7305a18beb7903db09e0c7a91b06dc5434b6bd2d6cdb85d992d9fd3ab
languageName: node
linkType: hard
"eth-lattice-keyring@npm:^0.12.4":
version: 0.12.4
resolution: "eth-lattice-keyring@npm:0.12.4"
@ -24484,7 +24477,7 @@ __metadata:
"@metamask/base-controller": ^3.1.0
"@metamask/browser-passworder": ^4.1.0
"@metamask/contract-metadata": ^2.3.1
"@metamask/controller-utils": ^4.1.0
"@metamask/controller-utils": ^4.2.0
"@metamask/design-tokens": ^1.12.0
"@metamask/desktop": ^0.3.0
"@metamask/eslint-config": ^9.0.0
@ -24506,7 +24499,7 @@ __metadata:
"@metamask/logo": ^3.1.1
"@metamask/message-manager": ^7.0.2
"@metamask/metamask-eth-abis": ^3.0.0
"@metamask/network-controller": ^10.3.0
"@metamask/network-controller": ^10.3.1
"@metamask/notification-controller": ^3.0.0
"@metamask/obs-store": ^8.1.0
"@metamask/permission-controller": ^4.0.0