Skip to content

Commit e8f810a

Browse files
cryptodev-2scryptodev-2s
committed
Merge remote-tracking branch 'origin/main' into release/687.0.0
2 parents e5dd76f + 39f7d66 commit e8f810a

4 files changed

Lines changed: 514 additions & 4 deletions

File tree

‎packages/assets-controllers/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
## [90.0.0]
1111

12+
### Added
13+
14+
- Added optional filtering of Tron staking tokens (energy, bandwidth) in asset selectors `selectAssetsBySelectedAccountGroup` (defaults to `true`) ([#7198](https://github.com/MetaMask/core/pull/7198))
15+
1216
### Changed
1317

1418
- Bump `@metamask/polling-controller` from `^15.0.0` to `^16.0.0` ([#7202](https://github.com/MetaMask/core/pull/7202))

‎packages/assets-controllers/src/selectors/__fixtures__/arrange-tron-state.ts‎

Lines changed: 327 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,327 @@
1+
export const MOCK_TRON_TOKENS = {
2+
'tron:728126428': [
3+
{
4+
accountType: 'tron:eoa',
5+
assetId: 'tron:728126428/slip44:195',
6+
isNative: true,
7+
image:
8+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
9+
name: 'Tron',
10+
symbol: 'TRX',
11+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
12+
decimals: 6,
13+
rawBalance: '0x0',
14+
balance: '0',
15+
fiat: {
16+
balance: 0,
17+
currency: 'usd',
18+
conversionRate: 0.28516,
19+
},
20+
chainId: 'tron:728126428',
21+
},
22+
{
23+
accountType: 'tron:eoa',
24+
assetId: 'tron:728126428/slip44:195-staked-for-bandwidth',
25+
isNative: true,
26+
image:
27+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
28+
name: 'Staked for Bandwidth',
29+
symbol: 'sTRX-BANDWIDTH',
30+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
31+
decimals: 6,
32+
rawBalance: '0x0',
33+
balance: '0',
34+
chainId: 'tron:728126428',
35+
fiat: undefined,
36+
},
37+
{
38+
accountType: 'tron:eoa',
39+
assetId: 'tron:728126428/slip44:195-staked-for-energy',
40+
isNative: true,
41+
image:
42+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
43+
name: 'Staked for Energy',
44+
symbol: 'sTRX-ENERGY',
45+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
46+
decimals: 6,
47+
rawBalance: '0x0',
48+
balance: '0',
49+
chainId: 'tron:728126428',
50+
fiat: undefined,
51+
},
52+
{
53+
accountType: 'tron:eoa',
54+
assetId: 'tron:728126428/slip44:bandwidth',
55+
isNative: true,
56+
image:
57+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
58+
name: 'Bandwidth',
59+
symbol: 'BANDWIDTH',
60+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
61+
decimals: 0,
62+
rawBalance: '0x0',
63+
balance: '0',
64+
chainId: 'tron:728126428',
65+
fiat: undefined,
66+
},
67+
{
68+
accountType: 'tron:eoa',
69+
assetId: 'tron:728126428/slip44:maximum-bandwidth',
70+
isNative: true,
71+
image:
72+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
73+
name: 'Max Bandwidth',
74+
symbol: 'MAX-BANDWIDTH',
75+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
76+
decimals: 0,
77+
rawBalance: '0x0',
78+
balance: '0',
79+
chainId: 'tron:728126428',
80+
fiat: undefined,
81+
},
82+
{
83+
accountType: 'tron:eoa',
84+
assetId: 'tron:728126428/slip44:energy',
85+
isNative: true,
86+
image:
87+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
88+
name: 'Energy',
89+
symbol: 'ENERGY',
90+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
91+
decimals: 0,
92+
rawBalance: '0x0',
93+
balance: '0',
94+
chainId: 'tron:728126428',
95+
fiat: undefined,
96+
},
97+
{
98+
accountType: 'tron:eoa',
99+
assetId: 'tron:728126428/slip44:maximum-energy',
100+
isNative: true,
101+
image:
102+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
103+
name: 'Max Energy',
104+
symbol: 'MAX-ENERGY',
105+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
106+
decimals: 0,
107+
rawBalance: '0x0',
108+
balance: '0',
109+
chainId: 'tron:728126428',
110+
fiat: undefined,
111+
},
112+
],
113+
'tron:3448148188': [
114+
{
115+
accountType: 'tron:eoa',
116+
assetId: 'tron:3448148188/slip44:195',
117+
isNative: true,
118+
image:
119+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
120+
name: 'Tron',
121+
symbol: 'TRX',
122+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
123+
decimals: 6,
124+
rawBalance: '0x0',
125+
balance: '0',
126+
chainId: 'tron:3448148188',
127+
fiat: undefined,
128+
},
129+
{
130+
accountType: 'tron:eoa',
131+
assetId: 'tron:3448148188/slip44:195-staked-for-bandwidth',
132+
isNative: true,
133+
image:
134+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
135+
name: 'Staked for Bandwidth',
136+
symbol: 'sTRX-BANDWIDTH',
137+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
138+
decimals: 6,
139+
rawBalance: '0x0',
140+
balance: '0',
141+
chainId: 'tron:3448148188',
142+
fiat: undefined,
143+
},
144+
{
145+
accountType: 'tron:eoa',
146+
assetId: 'tron:3448148188/slip44:195-staked-for-energy',
147+
isNative: true,
148+
image:
149+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
150+
name: 'Staked for Energy',
151+
symbol: 'sTRX-ENERGY',
152+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
153+
decimals: 6,
154+
rawBalance: '0x0',
155+
balance: '0',
156+
chainId: 'tron:3448148188',
157+
fiat: undefined,
158+
},
159+
{
160+
accountType: 'tron:eoa',
161+
assetId: 'tron:3448148188/slip44:bandwidth',
162+
isNative: true,
163+
image:
164+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
165+
name: 'Bandwidth',
166+
symbol: 'BANDWIDTH',
167+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
168+
decimals: 0,
169+
rawBalance: '0x0',
170+
balance: '0',
171+
chainId: 'tron:3448148188',
172+
fiat: undefined,
173+
},
174+
{
175+
accountType: 'tron:eoa',
176+
assetId: 'tron:3448148188/slip44:maximum-bandwidth',
177+
isNative: true,
178+
image:
179+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
180+
name: 'Max Bandwidth',
181+
symbol: 'MAX-BANDWIDTH',
182+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
183+
decimals: 0,
184+
rawBalance: '0x0',
185+
balance: '0',
186+
chainId: 'tron:3448148188',
187+
fiat: undefined,
188+
},
189+
{
190+
accountType: 'tron:eoa',
191+
assetId: 'tron:3448148188/slip44:energy',
192+
isNative: true,
193+
image:
194+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
195+
name: 'Energy',
196+
symbol: 'ENERGY',
197+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
198+
decimals: 0,
199+
rawBalance: '0x0',
200+
balance: '0',
201+
chainId: 'tron:3448148188',
202+
fiat: undefined,
203+
},
204+
{
205+
accountType: 'tron:eoa',
206+
assetId: 'tron:3448148188/slip44:maximum-energy',
207+
isNative: true,
208+
image:
209+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
210+
name: 'Max Energy',
211+
symbol: 'MAX-ENERGY',
212+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
213+
decimals: 0,
214+
rawBalance: '0x0',
215+
balance: '0',
216+
chainId: 'tron:3448148188',
217+
fiat: undefined,
218+
},
219+
],
220+
'tron:2494104990': [
221+
{
222+
accountType: 'tron:eoa',
223+
assetId: 'tron:2494104990/slip44:195',
224+
isNative: true,
225+
image:
226+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
227+
name: 'Tron',
228+
symbol: 'TRX',
229+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
230+
decimals: 6,
231+
rawBalance: '0x0',
232+
balance: '0',
233+
chainId: 'tron:2494104990',
234+
fiat: undefined,
235+
},
236+
{
237+
accountType: 'tron:eoa',
238+
assetId: 'tron:2494104990/slip44:195-staked-for-bandwidth',
239+
isNative: true,
240+
image:
241+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
242+
name: 'Staked for Bandwidth',
243+
symbol: 'sTRX-BANDWIDTH',
244+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
245+
decimals: 6,
246+
rawBalance: '0x0',
247+
balance: '0',
248+
chainId: 'tron:2494104990',
249+
fiat: undefined,
250+
},
251+
{
252+
accountType: 'tron:eoa',
253+
assetId: 'tron:2494104990/slip44:195-staked-for-energy',
254+
isNative: true,
255+
image:
256+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
257+
name: 'Staked for Energy',
258+
symbol: 'sTRX-ENERGY',
259+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
260+
decimals: 6,
261+
rawBalance: '0x0',
262+
balance: '0',
263+
chainId: 'tron:2494104990',
264+
fiat: undefined,
265+
},
266+
{
267+
accountType: 'tron:eoa',
268+
assetId: 'tron:2494104990/slip44:bandwidth',
269+
isNative: true,
270+
image:
271+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
272+
name: 'Bandwidth',
273+
symbol: 'BANDWIDTH',
274+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
275+
decimals: 0,
276+
rawBalance: '0x0',
277+
balance: '0',
278+
chainId: 'tron:2494104990',
279+
fiat: undefined,
280+
},
281+
{
282+
accountType: 'tron:eoa',
283+
assetId: 'tron:2494104990/slip44:maximum-bandwidth',
284+
isNative: true,
285+
image:
286+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
287+
name: 'Max Bandwidth',
288+
symbol: 'MAX-BANDWIDTH',
289+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
290+
decimals: 0,
291+
rawBalance: '0x0',
292+
balance: '0',
293+
chainId: 'tron:2494104990',
294+
fiat: undefined,
295+
},
296+
{
297+
accountType: 'tron:eoa',
298+
assetId: 'tron:2494104990/slip44:energy',
299+
isNative: true,
300+
image:
301+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
302+
name: 'Energy',
303+
symbol: 'ENERGY',
304+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
305+
decimals: 0,
306+
rawBalance: '0x0',
307+
balance: '0',
308+
chainId: 'tron:2494104990',
309+
fiat: undefined,
310+
},
311+
{
312+
accountType: 'tron:eoa',
313+
assetId: 'tron:2494104990/slip44:maximum-energy',
314+
isNative: true,
315+
image:
316+
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png',
317+
name: 'Max Energy',
318+
symbol: 'MAX-ENERGY',
319+
accountId: 'de5c3465-d01e-4091-a219-232903e982bb',
320+
decimals: 0,
321+
rawBalance: '0x0',
322+
balance: '0',
323+
chainId: 'tron:2494104990',
324+
fiat: undefined,
325+
},
326+
],
327+
} as const;

0 commit comments

Comments
 (0)