Skip to content

Commit 18ec699

Browse files
legobeatdanjm
legobeat
authored and
danjm
committed
fix: @metamask/smart-transactions-controller@^10.0.1->^10.1.1 (#25030)
This effectively relates to two separate fixes for issues with polling behavior. - https://github.com/MetaMask/smart-transactions-controller/releases/tag/v10.1.1 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25030?quickstart=1) - Follow-up to and aligns with #24861 - #24913 - MetaMask/smart-transactions-controller@v10.0.1...v10.1.1 - MetaMask/smart-transactions-controller#347 - MetaMask/smart-transactions-controller#339 - MetaMask/smart-transactions-controller#342 - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.
1 parent 3464aea commit 18ec699

File tree

7 files changed

+1010
-238
lines changed

7 files changed

+1010
-238
lines changed

‎lavamoat/browserify/beta/policy.json

+170-41
Original file line numberDiff line numberDiff line change
@@ -983,8 +983,8 @@
983983
},
984984
"packages": {
985985
"@metamask/eth-json-rpc-filters>@metamask/eth-query": true,
986+
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": true,
986987
"@metamask/name-controller>async-mutex": true,
987-
"@metamask/providers>@metamask/json-rpc-engine": true,
988988
"@metamask/safe-event-emitter": true,
989989
"pify": true
990990
}
@@ -995,6 +995,13 @@
995995
"watchify>xtend": true
996996
}
997997
},
998+
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
999+
"packages": {
1000+
"@metamask/providers>@metamask/rpc-errors": true,
1001+
"@metamask/safe-event-emitter": true,
1002+
"@metamask/utils": true
1003+
}
1004+
},
9981005
"@metamask/eth-json-rpc-middleware": {
9991006
"globals": {
10001007
"URL": true,
@@ -1004,17 +1011,24 @@
10041011
"packages": {
10051012
"@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
10061013
"@metamask/eth-sig-util": true,
1007-
"@metamask/providers>@metamask/json-rpc-engine": true,
10081014
"@metamask/providers>@metamask/rpc-errors": true,
1015+
"@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
10091016
"@metamask/utils": true,
10101017
"pify": true,
10111018
"sass-loader>klona": true
10121019
}
10131020
},
1014-
"@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": {
1021+
"@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": {
1022+
"globals": {
1023+
"clearTimeout": true,
1024+
"console.error": true,
1025+
"setTimeout": true
1026+
},
10151027
"packages": {
1016-
"@metamask/providers>@metamask/json-rpc-engine": true,
1017-
"@metamask/safe-event-emitter": true
1028+
"@metamask/eth-query>json-rpc-random-id": true,
1029+
"@metamask/safe-event-emitter": true,
1030+
"@metamask/utils": true,
1031+
"pify": true
10181032
}
10191033
},
10201034
"@metamask/eth-keyring-controller": {
@@ -1672,9 +1686,9 @@
16721686
"@metamask/network-controller>@metamask/base-controller": true,
16731687
"@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
16741688
"@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
1675-
"@metamask/network-controller>@metamask/json-rpc-engine": true,
16761689
"@metamask/network-controller>@metamask/swappable-obj-proxy": true,
16771690
"@metamask/providers>@metamask/rpc-errors": true,
1691+
"@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
16781692
"@metamask/utils": true,
16791693
"browserify>assert": true,
16801694
"uuid": true
@@ -1693,26 +1707,32 @@
16931707
"setTimeout": true
16941708
},
16951709
"packages": {
1696-
"@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true,
1697-
"@metamask/providers>@metamask/json-rpc-engine": true,
1710+
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
1711+
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
16981712
"@metamask/providers>@metamask/rpc-errors": true,
16991713
"@metamask/utils": true,
17001714
"node-fetch": true
17011715
}
17021716
},
1703-
"@metamask/network-controller>@metamask/eth-json-rpc-provider": {
1717+
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": {
17041718
"packages": {
1705-
"@metamask/network-controller>@metamask/json-rpc-engine": true,
1719+
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
17061720
"@metamask/safe-event-emitter": true
17071721
}
17081722
},
1709-
"@metamask/network-controller>@metamask/json-rpc-engine": {
1723+
"@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
17101724
"packages": {
17111725
"@metamask/providers>@metamask/rpc-errors": true,
17121726
"@metamask/safe-event-emitter": true,
17131727
"@metamask/utils": true
17141728
}
17151729
},
1730+
"@metamask/network-controller>@metamask/eth-json-rpc-provider": {
1731+
"packages": {
1732+
"@metamask/safe-event-emitter": true,
1733+
"@metamask/snaps-controllers>@metamask/json-rpc-engine": true
1734+
}
1735+
},
17161736
"@metamask/notification-controller>nanoid": {
17171737
"globals": {
17181738
"crypto.getRandomValues": true
@@ -1748,9 +1768,9 @@
17481768
"packages": {
17491769
"@metamask/controller-utils": true,
17501770
"@metamask/permission-controller>@metamask/base-controller": true,
1751-
"@metamask/permission-controller>@metamask/json-rpc-engine": true,
17521771
"@metamask/permission-controller>nanoid": true,
17531772
"@metamask/providers>@metamask/rpc-errors": true,
1773+
"@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
17541774
"@metamask/utils": true,
17551775
"deep-freeze-strict": true,
17561776
"immer": true
@@ -1764,13 +1784,6 @@
17641784
"immer": true
17651785
}
17661786
},
1767-
"@metamask/permission-controller>@metamask/json-rpc-engine": {
1768-
"packages": {
1769-
"@metamask/providers>@metamask/rpc-errors": true,
1770-
"@metamask/safe-event-emitter": true,
1771-
"@metamask/utils": true
1772-
}
1773-
},
17741787
"@metamask/permission-controller>nanoid": {
17751788
"globals": {
17761789
"crypto.getRandomValues": true
@@ -1860,13 +1873,6 @@
18601873
"ethereumjs-util>ethereum-cryptography>hash.js": true
18611874
}
18621875
},
1863-
"@metamask/providers>@metamask/json-rpc-engine": {
1864-
"packages": {
1865-
"@metamask/providers>@metamask/rpc-errors": true,
1866-
"@metamask/safe-event-emitter": true,
1867-
"@metamask/utils": true
1868-
}
1869-
},
18701876
"@metamask/providers>@metamask/rpc-errors": {
18711877
"packages": {
18721878
"@metamask/utils": true,
@@ -1877,8 +1883,8 @@
18771883
"packages": {
18781884
"@metamask/providers>@metamask/rpc-errors": true,
18791885
"@metamask/queued-request-controller>@metamask/base-controller": true,
1880-
"@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
18811886
"@metamask/selected-network-controller": true,
1887+
"@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
18821888
"@metamask/utils": true
18831889
}
18841890
},
@@ -1890,13 +1896,6 @@
18901896
"immer": true
18911897
}
18921898
},
1893-
"@metamask/queued-request-controller>@metamask/json-rpc-engine": {
1894-
"packages": {
1895-
"@metamask/providers>@metamask/rpc-errors": true,
1896-
"@metamask/safe-event-emitter": true,
1897-
"@metamask/utils": true
1898-
}
1899-
},
19001899
"@metamask/rpc-methods-flask>nanoid": {
19011900
"globals": {
19021901
"crypto.getRandomValues": true
@@ -1989,11 +1988,11 @@
19891988
},
19901989
"packages": {
19911990
"@ethersproject/abi>@ethersproject/bytes": true,
1992-
"@metamask/controller-utils": true,
19931991
"@metamask/eth-query": true,
1994-
"@metamask/gas-fee-controller>@metamask/polling-controller": true,
19951992
"@metamask/smart-transactions-controller>@ethereumjs/tx": true,
19961993
"@metamask/smart-transactions-controller>@ethereumjs/util": true,
1994+
"@metamask/smart-transactions-controller>@metamask/controller-utils": true,
1995+
"@metamask/smart-transactions-controller>@metamask/polling-controller": true,
19971996
"@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
19981997
"@metamask/smart-transactions-controller>bignumber.js": true,
19991998
"browserify>buffer": true,
@@ -2050,11 +2049,99 @@
20502049
"immer": true
20512050
}
20522051
},
2052+
"@metamask/smart-transactions-controller>@metamask/controller-utils": {
2053+
"globals": {
2054+
"URL": true,
2055+
"console.error": true,
2056+
"fetch": true,
2057+
"setTimeout": true
2058+
},
2059+
"packages": {
2060+
"@metamask/controller-utils>@spruceid/siwe-parser": true,
2061+
"@metamask/ethjs>@metamask/ethjs-unit": true,
2062+
"@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true,
2063+
"@metamask/utils": true,
2064+
"bn.js": true,
2065+
"browserify>buffer": true,
2066+
"eslint>fast-deep-equal": true,
2067+
"eth-ens-namehash": true
2068+
}
2069+
},
2070+
"@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": {
2071+
"globals": {
2072+
"console.warn": true
2073+
},
2074+
"packages": {
2075+
"@ethereumjs/tx>@ethereumjs/rlp": true,
2076+
"@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
2077+
"@ethereumjs/tx>ethereum-cryptography": true,
2078+
"browserify>buffer": true,
2079+
"browserify>insert-module-globals>is-buffer": true,
2080+
"webpack>events": true
2081+
}
2082+
},
20532083
"@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
20542084
"globals": {
20552085
"crypto.getRandomValues": true
20562086
}
20572087
},
2088+
"@metamask/smart-transactions-controller>@metamask/network-controller": {
2089+
"globals": {
2090+
"URL": true,
2091+
"btoa": true,
2092+
"fetch": true,
2093+
"setTimeout": true
2094+
},
2095+
"packages": {
2096+
"@metamask/eth-json-rpc-middleware": true,
2097+
"@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": true,
2098+
"@metamask/eth-query": true,
2099+
"@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
2100+
"@metamask/network-controller>@metamask/swappable-obj-proxy": true,
2101+
"@metamask/providers>@metamask/rpc-errors": true,
2102+
"@metamask/smart-transactions-controller>@metamask/base-controller": true,
2103+
"@metamask/smart-transactions-controller>@metamask/controller-utils": true,
2104+
"@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
2105+
"@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true,
2106+
"@metamask/utils": true,
2107+
"browserify>assert": true,
2108+
"uuid": true
2109+
}
2110+
},
2111+
"@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": {
2112+
"packages": {
2113+
"@metamask/safe-event-emitter": true,
2114+
"@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true
2115+
}
2116+
},
2117+
"@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": {
2118+
"packages": {
2119+
"@metamask/providers>@metamask/rpc-errors": true,
2120+
"@metamask/safe-event-emitter": true,
2121+
"@metamask/utils": true
2122+
}
2123+
},
2124+
"@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": {
2125+
"globals": {
2126+
"clearTimeout": true,
2127+
"setTimeout": true
2128+
},
2129+
"packages": {
2130+
"@trezor/connect-web>tslib": true
2131+
}
2132+
},
2133+
"@metamask/smart-transactions-controller>@metamask/polling-controller": {
2134+
"globals": {
2135+
"clearTimeout": true,
2136+
"console.error": true,
2137+
"setTimeout": true
2138+
},
2139+
"packages": {
2140+
"@metamask/smart-transactions-controller>@metamask/base-controller": true,
2141+
"@metamask/snaps-utils>fast-json-stable-stringify": true,
2142+
"uuid": true
2143+
}
2144+
},
20582145
"@metamask/smart-transactions-controller>@metamask/transaction-controller": {
20592146
"globals": {
20602147
"clearTimeout": true,
@@ -2067,18 +2154,18 @@
20672154
"@ethersproject/abi": true,
20682155
"@ethersproject/contracts": true,
20692156
"@ethersproject/providers": true,
2070-
"@metamask/controller-utils": true,
20712157
"@metamask/eth-query": true,
2072-
"@metamask/gas-fee-controller": true,
20732158
"@metamask/metamask-eth-abis": true,
2074-
"@metamask/name-controller>async-mutex": true,
2075-
"@metamask/network-controller": true,
20762159
"@metamask/providers>@metamask/rpc-errors": true,
20772160
"@metamask/smart-transactions-controller>@metamask/base-controller": true,
2161+
"@metamask/smart-transactions-controller>@metamask/controller-utils": true,
2162+
"@metamask/smart-transactions-controller>@metamask/network-controller": true,
2163+
"@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": true,
20782164
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true,
20792165
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
2166+
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": true,
2167+
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
20802168
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
2081-
"@metamask/transaction-controller>nonce-tracker": true,
20822169
"@metamask/utils": true,
20832170
"bn.js": true,
20842171
"browserify>buffer": true,
@@ -2111,6 +2198,37 @@
21112198
"webpack>events": true
21122199
}
21132200
},
2201+
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": {
2202+
"globals": {
2203+
"clearInterval": true,
2204+
"console.error": true,
2205+
"setInterval": true
2206+
},
2207+
"packages": {
2208+
"@metamask/eth-query": true,
2209+
"@metamask/smart-transactions-controller>@metamask/controller-utils": true,
2210+
"@metamask/smart-transactions-controller>@metamask/polling-controller": true,
2211+
"bn.js": true,
2212+
"browserify>buffer": true,
2213+
"uuid": true
2214+
}
2215+
},
2216+
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": {
2217+
"packages": {
2218+
"@ethersproject/providers": true,
2219+
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true,
2220+
"browserify>assert": true
2221+
}
2222+
},
2223+
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
2224+
"globals": {
2225+
"clearTimeout": true,
2226+
"setTimeout": true
2227+
},
2228+
"packages": {
2229+
"@trezor/connect-web>tslib": true
2230+
}
2231+
},
21142232
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
21152233
"packages": {
21162234
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
@@ -2174,6 +2292,13 @@
21742292
"crypto.getRandomValues": true
21752293
}
21762294
},
2295+
"@metamask/snaps-controllers>@metamask/json-rpc-engine": {
2296+
"packages": {
2297+
"@metamask/providers>@metamask/rpc-errors": true,
2298+
"@metamask/safe-event-emitter": true,
2299+
"@metamask/utils": true
2300+
}
2301+
},
21772302
"@metamask/snaps-controllers>nanoid": {
21782303
"globals": {
21792304
"crypto.getRandomValues": true
@@ -2518,6 +2643,10 @@
25182643
}
25192644
},
25202645
"@segment/loosely-validate-event": {
2646+
"globals": {
2647+
"console.log": true,
2648+
"uffer.byteLength": true
2649+
},
25212650
"packages": {
25222651
"@segment/loosely-validate-event>component-type": true,
25232652
"@segment/loosely-validate-event>join-component": true,

0 commit comments

Comments
 (0)