Skip to content

Commit cb9d34e

Browse files
matteoscuratimatteoscurati
authored
Merge branch 'main' into fix/update-focus-outline-menu-item
2 parents ef08de1 + bdcd207 commit cb9d34e

File tree

10 files changed

+376
-251
lines changed

10 files changed

+376
-251
lines changed

‎app/scripts/ui.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import 'react-devtools';
1515
import PortStream from 'extension-port-stream';
1616
import browser from 'webextension-polyfill';
1717

18-
import StreamProvider from 'web3-stream-provider';
18+
import { StreamProvider } from '@metamask/providers';
19+
import { createIdRemapMiddleware } from '@metamask/json-rpc-engine';
1920
import log from 'loglevel';
2021
// TODO: Remove restricted import
2122
// eslint-disable-next-line import/no-restricted-paths
@@ -359,11 +360,14 @@ function connectToAccountManager(connectionStream) {
359360
* @param {PortDuplexStream} connectionStream - PortStream instance establishing a background connection
360361
*/
361362
function setupWeb3Connection(connectionStream) {
362-
const providerStream = new StreamProvider();
363-
providerStream.pipe(connectionStream).pipe(providerStream);
363+
const providerStream = new StreamProvider(connectionStream, {
364+
rpcMiddleware: [createIdRemapMiddleware()],
365+
});
364366
connectionStream.on('error', console.error.bind(console));
365367
providerStream.on('error', console.error.bind(console));
366-
global.ethereumProvider = providerStream;
368+
providerStream.initialize().then(() => {
369+
global.ethereumProvider = providerStream;
370+
});
367371
}
368372

369373
/**

‎lavamoat/browserify/beta/policy.json

+80-46
Original file line numberDiff line numberDiff line change
@@ -1015,19 +1015,6 @@
10151015
"packages": {
10161016
"@metamask/safe-event-emitter": true,
10171017
"@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true,
1018-
"@metamask/ppom-validator>json-rpc-random-id": true,
1019-
"pify": true
1020-
}
1021-
},
1022-
"@metamask/network-controller>@metamask/eth-block-tracker": {
1023-
"globals": {
1024-
"clearTimeout": true,
1025-
"console.error": true,
1026-
"setTimeout": true
1027-
},
1028-
"packages": {
1029-
"@metamask/safe-event-emitter": true,
1030-
"@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
10311018
"@metamask/ppom-validator>json-rpc-random-id": true
10321019
}
10331020
},
@@ -1228,9 +1215,10 @@
12281215
},
12291216
"packages": {
12301217
"@babel/runtime": true,
1218+
"@ethersproject/bignumber": true,
1219+
"@ethersproject/contracts": true,
1220+
"@ethersproject/providers": true,
12311221
"@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
1232-
"eth-method-registry>@metamask/ethjs-contract": true,
1233-
"eth-method-registry>@metamask/ethjs-query": true,
12341222
"@metamask/safe-event-emitter": true,
12351223
"bn.js": true,
12361224
"@metamask/eth-token-tracker>deep-equal": true,
@@ -1475,7 +1463,7 @@
14751463
"packages": {
14761464
"@metamask/base-controller": true,
14771465
"@metamask/controller-utils": true,
1478-
"@metamask/network-controller>@metamask/eth-block-tracker": true,
1466+
"@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
14791467
"@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
14801468
"@metamask/eth-json-rpc-middleware": true,
14811469
"@metamask/eth-json-rpc-provider": true,
@@ -1652,6 +1640,35 @@
16521640
"@metamask/profile-sync-controller>siwe": true
16531641
}
16541642
},
1643+
"@metamask/providers": {
1644+
"globals": {
1645+
"CustomEvent": true,
1646+
"Event": true,
1647+
"addEventListener": true,
1648+
"chrome.runtime.connect": true,
1649+
"console": true,
1650+
"dispatchEvent": true,
1651+
"document.createElement": true,
1652+
"document.readyState": true,
1653+
"ethereum": "write",
1654+
"location.hostname": true,
1655+
"removeEventListener": true,
1656+
"web3": true
1657+
},
1658+
"packages": {
1659+
"@metamask/json-rpc-engine": true,
1660+
"@metamask/json-rpc-middleware-stream": true,
1661+
"@metamask/object-multiplex": true,
1662+
"@metamask/rpc-errors": true,
1663+
"@metamask/safe-event-emitter": true,
1664+
"@metamask/providers>@metamask/utils": true,
1665+
"@metamask/providers>detect-browser": true,
1666+
"@metamask/providers>extension-port-stream": true,
1667+
"eslint>fast-deep-equal": true,
1668+
"@metamask/providers>is-stream": true,
1669+
"readable-stream": true
1670+
}
1671+
},
16551672
"@metamask/queued-request-controller": {
16561673
"packages": {
16571674
"@metamask/base-controller": true,
@@ -2040,21 +2057,6 @@
20402057
"semver": true
20412058
}
20422059
},
2043-
"@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
2044-
"globals": {
2045-
"TextDecoder": true,
2046-
"TextEncoder": true
2047-
},
2048-
"packages": {
2049-
"@metamask/utils>@metamask/superstruct": true,
2050-
"@noble/hashes": true,
2051-
"@metamask/utils>@scure/base": true,
2052-
"browserify>buffer": true,
2053-
"nock>debug": true,
2054-
"@metamask/utils>pony-cause": true,
2055-
"semver": true
2056-
}
2057-
},
20582060
"@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": {
20592061
"globals": {
20602062
"TextDecoder": true,
@@ -2370,6 +2372,21 @@
23702372
"semver": true
23712373
}
23722374
},
2375+
"@metamask/providers>@metamask/utils": {
2376+
"globals": {
2377+
"TextDecoder": true,
2378+
"TextEncoder": true
2379+
},
2380+
"packages": {
2381+
"@metamask/utils>@metamask/superstruct": true,
2382+
"@noble/hashes": true,
2383+
"@metamask/utils>@scure/base": true,
2384+
"browserify>buffer": true,
2385+
"nock>debug": true,
2386+
"@metamask/utils>pony-cause": true,
2387+
"semver": true
2388+
}
2389+
},
23732390
"@metamask/rate-limit-controller>@metamask/utils": {
23742391
"globals": {
23752392
"TextDecoder": true,
@@ -3769,6 +3786,15 @@
37693786
"@metamask/ppom-validator>elliptic>minimalistic-assert": true
37703787
}
37713788
},
3789+
"@metamask/providers>detect-browser": {
3790+
"globals": {
3791+
"document": true,
3792+
"navigator": true
3793+
},
3794+
"packages": {
3795+
"process": true
3796+
}
3797+
},
37723798
"crypto-browserify>diffie-hellman": {
37733799
"packages": {
37743800
"bn.js": true,
@@ -4058,6 +4084,12 @@
40584084
"extension-port-stream>readable-stream": true
40594085
}
40604086
},
4087+
"@metamask/providers>extension-port-stream": {
4088+
"packages": {
4089+
"browserify>buffer": true,
4090+
"@metamask/providers>extension-port-stream>readable-stream": true
4091+
}
4092+
},
40614093
"fast-json-patch": {
40624094
"globals": {
40634095
"addEventListener": true,
@@ -5343,6 +5375,23 @@
53435375
"browserify>string_decoder": true
53445376
}
53455377
},
5378+
"@metamask/providers>extension-port-stream>readable-stream": {
5379+
"globals": {
5380+
"AbortController": true,
5381+
"AbortSignal": true,
5382+
"AggregateError": true,
5383+
"Blob": true,
5384+
"ERR_INVALID_ARG_TYPE": true,
5385+
"queueMicrotask": true
5386+
},
5387+
"packages": {
5388+
"@lavamoat/lavapack>readable-stream>abort-controller": true,
5389+
"browserify>buffer": true,
5390+
"webpack>events": true,
5391+
"process": true,
5392+
"browserify>string_decoder": true
5393+
}
5394+
},
53465395
"@metamask/snaps-controllers>readable-web-to-node-stream": {
53475396
"packages": {
53485397
"readable-stream": true
@@ -5764,11 +5813,6 @@
57645813
"crypto": true
57655814
}
57665815
},
5767-
"web3-stream-provider>uuid": {
5768-
"globals": {
5769-
"crypto": true
5770-
}
5771-
},
57725816
"@metamask/snaps-utils>validate-npm-package-name": {
57735817
"packages": {
57745818
"@metamask/snaps-utils>validate-npm-package-name>builtins": true
@@ -5814,16 +5858,6 @@
58145858
"XMLHttpRequest": true
58155859
}
58165860
},
5817-
"web3-stream-provider": {
5818-
"globals": {
5819-
"setTimeout": true
5820-
},
5821-
"packages": {
5822-
"readable-stream": true,
5823-
"browserify>util": true,
5824-
"web3-stream-provider>uuid": true
5825-
}
5826-
},
58275861
"@metamask/controllers>web3": {
58285862
"globals": {
58295863
"XMLHttpRequest": true

0 commit comments

Comments
 (0)