Skip to content

Commit 5d34d68

Browse files
pedronfigueiredoadonesky1metamaskbot
authored
Update assets controllers to version 16 (#21380)
## **Description** Updates assets controllers on the extension to the latest version. --------- Co-authored-by: Alex <[email protected]> Co-authored-by: MetaMask Bot <[email protected]>
1 parent 359409c commit 5d34d68

File tree

8 files changed

+299
-146
lines changed

8 files changed

+299
-146
lines changed

app/scripts/metamask-controller.js

+3
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,9 @@ export default class MetamaskController extends EventEmitter {
595595
source,
596596
},
597597
}),
598+
getNetworkClientById: this.networkController.getNetworkClientById.bind(
599+
this.networkController,
600+
),
598601
},
599602
{},
600603
initState.NftController,

lavamoat/browserify/beta/policy.json

+29-20
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,7 @@
768768
},
769769
"@metamask/assets-controllers": {
770770
"globals": {
771+
"AbortController": true,
771772
"Headers": true,
772773
"URL": true,
773774
"clearInterval": true,
@@ -782,15 +783,15 @@
782783
"@ethersproject/contracts": true,
783784
"@ethersproject/providers": true,
784785
"@metamask/assets-controllers>@metamask/abi-utils": true,
785-
"@metamask/assets-controllers>@metamask/rpc-errors": true,
786+
"@metamask/assets-controllers>@metamask/polling-controller": true,
786787
"@metamask/assets-controllers>@metamask/utils": true,
787-
"@metamask/assets-controllers>abort-controller": true,
788788
"@metamask/assets-controllers>multiformats": true,
789789
"@metamask/base-controller": true,
790790
"@metamask/contract-metadata": true,
791791
"@metamask/controller-utils": true,
792792
"@metamask/controller-utils>@metamask/eth-query": true,
793793
"@metamask/metamask-eth-abis": true,
794+
"@metamask/providers>@metamask/rpc-errors": true,
794795
"eth-json-rpc-filters>async-mutex": true,
795796
"ethereumjs-util": true,
796797
"single-call-balance-checker-abi": true,
@@ -817,22 +818,16 @@
817818
"superstruct": true
818819
}
819820
},
820-
"@metamask/assets-controllers>@metamask/rpc-errors": {
821-
"packages": {
822-
"@metamask/assets-controllers>@metamask/rpc-errors>@metamask/utils": true,
823-
"eth-rpc-errors>fast-safe-stringify": true
824-
}
825-
},
826-
"@metamask/assets-controllers>@metamask/rpc-errors>@metamask/utils": {
821+
"@metamask/assets-controllers>@metamask/polling-controller": {
827822
"globals": {
828-
"TextDecoder": true,
829-
"TextEncoder": true
823+
"clearTimeout": true,
824+
"console.error": true,
825+
"setTimeout": true
830826
},
831827
"packages": {
832-
"browserify>buffer": true,
833-
"nock>debug": true,
834-
"semver": true,
835-
"superstruct": true
828+
"@metamask/base-controller": true,
829+
"@metamask/snaps-utils>fast-json-stable-stringify": true,
830+
"uuid": true
836831
}
837832
},
838833
"@metamask/assets-controllers>@metamask/utils": {
@@ -848,11 +843,6 @@
848843
"superstruct": true
849844
}
850845
},
851-
"@metamask/assets-controllers>abort-controller": {
852-
"globals": {
853-
"AbortController": true
854-
}
855-
},
856846
"@metamask/assets-controllers>multiformats": {
857847
"globals": {
858848
"TextDecoder": true,
@@ -1992,6 +1982,25 @@
19921982
"ethereumjs-util>ethereum-cryptography>hash.js": true
19931983
}
19941984
},
1985+
"@metamask/providers>@metamask/rpc-errors": {
1986+
"packages": {
1987+
"@metamask/providers>@metamask/rpc-errors>@metamask/utils": true,
1988+
"eth-rpc-errors>fast-safe-stringify": true
1989+
}
1990+
},
1991+
"@metamask/providers>@metamask/rpc-errors>@metamask/utils": {
1992+
"globals": {
1993+
"TextDecoder": true,
1994+
"TextEncoder": true
1995+
},
1996+
"packages": {
1997+
"@metamask/key-tree>@noble/hashes": true,
1998+
"browserify>buffer": true,
1999+
"nock>debug": true,
2000+
"semver": true,
2001+
"superstruct": true
2002+
}
2003+
},
19952004
"@metamask/rpc-methods": {
19962005
"packages": {
19972006
"@metamask/key-tree": true,

lavamoat/browserify/desktop/policy.json

+29-20
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,7 @@
768768
},
769769
"@metamask/assets-controllers": {
770770
"globals": {
771+
"AbortController": true,
771772
"Headers": true,
772773
"URL": true,
773774
"clearInterval": true,
@@ -782,15 +783,15 @@
782783
"@ethersproject/contracts": true,
783784
"@ethersproject/providers": true,
784785
"@metamask/assets-controllers>@metamask/abi-utils": true,
785-
"@metamask/assets-controllers>@metamask/rpc-errors": true,
786+
"@metamask/assets-controllers>@metamask/polling-controller": true,
786787
"@metamask/assets-controllers>@metamask/utils": true,
787-
"@metamask/assets-controllers>abort-controller": true,
788788
"@metamask/assets-controllers>multiformats": true,
789789
"@metamask/base-controller": true,
790790
"@metamask/contract-metadata": true,
791791
"@metamask/controller-utils": true,
792792
"@metamask/controller-utils>@metamask/eth-query": true,
793793
"@metamask/metamask-eth-abis": true,
794+
"@metamask/providers>@metamask/rpc-errors": true,
794795
"eth-json-rpc-filters>async-mutex": true,
795796
"ethereumjs-util": true,
796797
"single-call-balance-checker-abi": true,
@@ -817,22 +818,16 @@
817818
"superstruct": true
818819
}
819820
},
820-
"@metamask/assets-controllers>@metamask/rpc-errors": {
821-
"packages": {
822-
"@metamask/assets-controllers>@metamask/rpc-errors>@metamask/utils": true,
823-
"eth-rpc-errors>fast-safe-stringify": true
824-
}
825-
},
826-
"@metamask/assets-controllers>@metamask/rpc-errors>@metamask/utils": {
821+
"@metamask/assets-controllers>@metamask/polling-controller": {
827822
"globals": {
828-
"TextDecoder": true,
829-
"TextEncoder": true
823+
"clearTimeout": true,
824+
"console.error": true,
825+
"setTimeout": true
830826
},
831827
"packages": {
832-
"browserify>buffer": true,
833-
"nock>debug": true,
834-
"semver": true,
835-
"superstruct": true
828+
"@metamask/base-controller": true,
829+
"@metamask/snaps-utils>fast-json-stable-stringify": true,
830+
"uuid": true
836831
}
837832
},
838833
"@metamask/assets-controllers>@metamask/utils": {
@@ -848,11 +843,6 @@
848843
"superstruct": true
849844
}
850845
},
851-
"@metamask/assets-controllers>abort-controller": {
852-
"globals": {
853-
"AbortController": true
854-
}
855-
},
856846
"@metamask/assets-controllers>multiformats": {
857847
"globals": {
858848
"TextDecoder": true,
@@ -2149,6 +2139,25 @@
21492139
"readable-stream": true
21502140
}
21512141
},
2142+
"@metamask/providers>@metamask/rpc-errors": {
2143+
"packages": {
2144+
"@metamask/providers>@metamask/rpc-errors>@metamask/utils": true,
2145+
"eth-rpc-errors>fast-safe-stringify": true
2146+
}
2147+
},
2148+
"@metamask/providers>@metamask/rpc-errors>@metamask/utils": {
2149+
"globals": {
2150+
"TextDecoder": true,
2151+
"TextEncoder": true
2152+
},
2153+
"packages": {
2154+
"@metamask/key-tree>@noble/hashes": true,
2155+
"browserify>buffer": true,
2156+
"nock>debug": true,
2157+
"semver": true,
2158+
"superstruct": true
2159+
}
2160+
},
21522161
"@metamask/rate-limit-controller": {
21532162
"globals": {
21542163
"setTimeout": true

lavamoat/browserify/flask/policy.json

+29-20
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,7 @@
768768
},
769769
"@metamask/assets-controllers": {
770770
"globals": {
771+
"AbortController": true,
771772
"Headers": true,
772773
"URL": true,
773774
"clearInterval": true,
@@ -782,15 +783,15 @@
782783
"@ethersproject/contracts": true,
783784
"@ethersproject/providers": true,
784785
"@metamask/assets-controllers>@metamask/abi-utils": true,
785-
"@metamask/assets-controllers>@metamask/rpc-errors": true,
786+
"@metamask/assets-controllers>@metamask/polling-controller": true,
786787
"@metamask/assets-controllers>@metamask/utils": true,
787-
"@metamask/assets-controllers>abort-controller": true,
788788
"@metamask/assets-controllers>multiformats": true,
789789
"@metamask/base-controller": true,
790790
"@metamask/contract-metadata": true,
791791
"@metamask/controller-utils": true,
792792
"@metamask/controller-utils>@metamask/eth-query": true,
793793
"@metamask/metamask-eth-abis": true,
794+
"@metamask/providers>@metamask/rpc-errors": true,
794795
"eth-json-rpc-filters>async-mutex": true,
795796
"ethereumjs-util": true,
796797
"single-call-balance-checker-abi": true,
@@ -817,22 +818,16 @@
817818
"superstruct": true
818819
}
819820
},
820-
"@metamask/assets-controllers>@metamask/rpc-errors": {
821-
"packages": {
822-
"@metamask/assets-controllers>@metamask/rpc-errors>@metamask/utils": true,
823-
"eth-rpc-errors>fast-safe-stringify": true
824-
}
825-
},
826-
"@metamask/assets-controllers>@metamask/rpc-errors>@metamask/utils": {
821+
"@metamask/assets-controllers>@metamask/polling-controller": {
827822
"globals": {
828-
"TextDecoder": true,
829-
"TextEncoder": true
823+
"clearTimeout": true,
824+
"console.error": true,
825+
"setTimeout": true
830826
},
831827
"packages": {
832-
"browserify>buffer": true,
833-
"nock>debug": true,
834-
"semver": true,
835-
"superstruct": true
828+
"@metamask/base-controller": true,
829+
"@metamask/snaps-utils>fast-json-stable-stringify": true,
830+
"uuid": true
836831
}
837832
},
838833
"@metamask/assets-controllers>@metamask/utils": {
@@ -848,11 +843,6 @@
848843
"superstruct": true
849844
}
850845
},
851-
"@metamask/assets-controllers>abort-controller": {
852-
"globals": {
853-
"AbortController": true
854-
}
855-
},
856846
"@metamask/assets-controllers>multiformats": {
857847
"globals": {
858848
"TextDecoder": true,
@@ -2195,6 +2185,25 @@
21952185
"readable-stream": true
21962186
}
21972187
},
2188+
"@metamask/providers>@metamask/rpc-errors": {
2189+
"packages": {
2190+
"@metamask/providers>@metamask/rpc-errors>@metamask/utils": true,
2191+
"eth-rpc-errors>fast-safe-stringify": true
2192+
}
2193+
},
2194+
"@metamask/providers>@metamask/rpc-errors>@metamask/utils": {
2195+
"globals": {
2196+
"TextDecoder": true,
2197+
"TextEncoder": true
2198+
},
2199+
"packages": {
2200+
"@metamask/key-tree>@noble/hashes": true,
2201+
"browserify>buffer": true,
2202+
"nock>debug": true,
2203+
"semver": true,
2204+
"superstruct": true
2205+
}
2206+
},
21982207
"@metamask/rate-limit-controller": {
21992208
"globals": {
22002209
"setTimeout": true

lavamoat/browserify/main/policy.json

+29-20
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,7 @@
768768
},
769769
"@metamask/assets-controllers": {
770770
"globals": {
771+
"AbortController": true,
771772
"Headers": true,
772773
"URL": true,
773774
"clearInterval": true,
@@ -782,15 +783,15 @@
782783
"@ethersproject/contracts": true,
783784
"@ethersproject/providers": true,
784785
"@metamask/assets-controllers>@metamask/abi-utils": true,
785-
"@metamask/assets-controllers>@metamask/rpc-errors": true,
786+
"@metamask/assets-controllers>@metamask/polling-controller": true,
786787
"@metamask/assets-controllers>@metamask/utils": true,
787-
"@metamask/assets-controllers>abort-controller": true,
788788
"@metamask/assets-controllers>multiformats": true,
789789
"@metamask/base-controller": true,
790790
"@metamask/contract-metadata": true,
791791
"@metamask/controller-utils": true,
792792
"@metamask/controller-utils>@metamask/eth-query": true,
793793
"@metamask/metamask-eth-abis": true,
794+
"@metamask/providers>@metamask/rpc-errors": true,
794795
"eth-json-rpc-filters>async-mutex": true,
795796
"ethereumjs-util": true,
796797
"single-call-balance-checker-abi": true,
@@ -817,22 +818,16 @@
817818
"superstruct": true
818819
}
819820
},
820-
"@metamask/assets-controllers>@metamask/rpc-errors": {
821-
"packages": {
822-
"@metamask/assets-controllers>@metamask/rpc-errors>@metamask/utils": true,
823-
"eth-rpc-errors>fast-safe-stringify": true
824-
}
825-
},
826-
"@metamask/assets-controllers>@metamask/rpc-errors>@metamask/utils": {
821+
"@metamask/assets-controllers>@metamask/polling-controller": {
827822
"globals": {
828-
"TextDecoder": true,
829-
"TextEncoder": true
823+
"clearTimeout": true,
824+
"console.error": true,
825+
"setTimeout": true
830826
},
831827
"packages": {
832-
"browserify>buffer": true,
833-
"nock>debug": true,
834-
"semver": true,
835-
"superstruct": true
828+
"@metamask/base-controller": true,
829+
"@metamask/snaps-utils>fast-json-stable-stringify": true,
830+
"uuid": true
836831
}
837832
},
838833
"@metamask/assets-controllers>@metamask/utils": {
@@ -848,11 +843,6 @@
848843
"superstruct": true
849844
}
850845
},
851-
"@metamask/assets-controllers>abort-controller": {
852-
"globals": {
853-
"AbortController": true
854-
}
855-
},
856846
"@metamask/assets-controllers>multiformats": {
857847
"globals": {
858848
"TextDecoder": true,
@@ -2124,6 +2114,25 @@
21242114
"readable-stream": true
21252115
}
21262116
},
2117+
"@metamask/providers>@metamask/rpc-errors": {
2118+
"packages": {
2119+
"@metamask/providers>@metamask/rpc-errors>@metamask/utils": true,
2120+
"eth-rpc-errors>fast-safe-stringify": true
2121+
}
2122+
},
2123+
"@metamask/providers>@metamask/rpc-errors>@metamask/utils": {
2124+
"globals": {
2125+
"TextDecoder": true,
2126+
"TextEncoder": true
2127+
},
2128+
"packages": {
2129+
"@metamask/key-tree>@noble/hashes": true,
2130+
"browserify>buffer": true,
2131+
"nock>debug": true,
2132+
"semver": true,
2133+
"superstruct": true
2134+
}
2135+
},
21272136
"@metamask/rate-limit-controller": {
21282137
"globals": {
21292138
"setTimeout": true

0 commit comments

Comments
 (0)