Skip to content

Commit 76ef91d

Browse files
FrederikBoldingFrederikBolding
authored
Update GridPlus DPaths (#4244)
* Update GridPlus DPaths * Bump wallets lib and a few other deps * Run Prettier
1 parent 33fb39c commit 76ef91d

File tree

4 files changed

+247
-746
lines changed

4 files changed

+247
-746
lines changed

‎package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@
1212
},
1313
"dependencies": {
1414
"@datapunt/matomo-tracker-js": "0.4.0",
15-
"@ethersproject/abstract-provider": "5.4.0",
16-
"@ethersproject/address": "5.4.0",
17-
"@ethersproject/bignumber": "5.4.1",
18-
"@ethersproject/bytes": "5.4.0",
19-
"@ethersproject/constants": "5.4.0",
20-
"@ethersproject/contracts": "5.4.1",
21-
"@ethersproject/providers": "5.4.3",
22-
"@ethersproject/transactions": "5.4.0",
23-
"@ethersproject/units": "5.4.0",
24-
"@ethersproject/wallet": "5.4.0",
15+
"@ethersproject/abstract-provider": "5.5.1",
16+
"@ethersproject/address": "5.5.0",
17+
"@ethersproject/bignumber": "5.5.0",
18+
"@ethersproject/bytes": "5.5.0",
19+
"@ethersproject/constants": "5.5.0",
20+
"@ethersproject/contracts": "5.5.0",
21+
"@ethersproject/providers": "5.5.3",
22+
"@ethersproject/transactions": "5.5.0",
23+
"@ethersproject/units": "5.5.0",
24+
"@ethersproject/wallet": "5.5.0",
2525
"@metamask/inpage-provider": "8.0.3",
2626
"@metamask/object-multiplex": "1.2.0",
2727
"@metamask/post-message-stream": "4.0.0",
2828
"@mycrypto/eth-scan": "3.4.4",
2929
"@mycrypto/ui": "0.24.1",
3030
"@mycrypto/unlock-scan": "1.2.0",
31-
"@mycrypto/wallets": "1.4.2",
31+
"@mycrypto/wallets": "1.4.3",
3232
"@reduxjs/toolkit": "1.6.0",
3333
"@styled-system/should-forward-prop": "5.1.5",
3434
"@types/papaparse": "5.0.6",
@@ -38,7 +38,7 @@
3838
"@unstoppabledomains/resolution": "4.0.2",
3939
"@walletconnect/client": "1.6.2",
4040
"apollo-boost": "0.4.7",
41-
"axios": "0.21.3",
41+
"axios": "0.24.0",
4242
"bignumber.js": "9.0.0",
4343
"bn.js": "4.11.8",
4444
"classnames": "2.2.5",

‎src/database/data/networks.ts

+32-32
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
199199
[WalletId.LEDGER_NANO_S]: LEDGER_ETC,
200200
[WalletId.TREZOR_NEW]: DEFAULT_ETC,
201201
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETC,
202-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
202+
[WalletId.GRIDPLUS]: DEFAULT_ETC,
203203
default: DEFAULT_ETC
204204
},
205205
gasPriceSettings: {
@@ -226,7 +226,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
226226
[WalletId.LEDGER_NANO_S]: DEFAULT_UBQ,
227227
[WalletId.TREZOR_NEW]: DEFAULT_UBQ,
228228
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_UBQ,
229-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
229+
[WalletId.GRIDPLUS]: DEFAULT_UBQ,
230230
default: DEFAULT_UBQ
231231
},
232232
gasPriceSettings: {
@@ -253,7 +253,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
253253
[WalletId.LEDGER_NANO_S]: DEFAULT_EXP,
254254
[WalletId.TREZOR_NEW]: DEFAULT_EXP,
255255
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_EXP,
256-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
256+
[WalletId.GRIDPLUS]: DEFAULT_EXP,
257257
default: DEFAULT_EXP
258258
},
259259
gasPriceSettings: {
@@ -282,7 +282,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
282282
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
283283
[WalletId.TREZOR_NEW]: DEFAULT_POA,
284284
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
285-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
285+
[WalletId.GRIDPLUS]: DEFAULT_POA,
286286
default: DEFAULT_POA
287287
},
288288
gasPriceSettings: {
@@ -309,7 +309,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
309309
[WalletId.LEDGER_NANO_S]: DEFAULT_TOMO,
310310
[WalletId.TREZOR_NEW]: DEFAULT_ETH,
311311
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_TOMO,
312-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
312+
[WalletId.GRIDPLUS]: DEFAULT_TOMO,
313313
default: DEFAULT_TOMO
314314
},
315315
gasPriceSettings: {
@@ -336,7 +336,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
336336
[WalletId.LEDGER_NANO_S]: DEFAULT_EGEM,
337337
[WalletId.TREZOR_NEW]: DEFAULT_EGEM,
338338
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_EGEM,
339-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
339+
[WalletId.GRIDPLUS]: DEFAULT_EGEM,
340340
default: DEFAULT_EGEM
341341
},
342342
gasPriceSettings: {
@@ -364,7 +364,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
364364
[WalletId.LEDGER_NANO_S]: DEFAULT_CLO,
365365
[WalletId.TREZOR_NEW]: DEFAULT_CLO,
366366
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_CLO,
367-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
367+
[WalletId.GRIDPLUS]: DEFAULT_CLO,
368368
default: DEFAULT_CLO
369369
},
370370
gasPriceSettings: {
@@ -393,7 +393,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
393393
[WalletId.LEDGER_NANO_S]: MAINNET_RSK,
394394
[WalletId.TREZOR_NEW]: MAINNET_RSK,
395395
[WalletId.LEDGER_NANO_S_NEW]: MAINNET_RSK,
396-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
396+
[WalletId.GRIDPLUS]: MAINNET_RSK,
397397
default: MAINNET_RSK
398398
},
399399
gasPriceSettings: {
@@ -423,7 +423,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
423423
[WalletId.LEDGER_NANO_S]: TESTNET_RSK,
424424
[WalletId.TREZOR_NEW]: TESTNET_RSK,
425425
[WalletId.LEDGER_NANO_S_NEW]: TESTNET_RSK,
426-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
426+
[WalletId.GRIDPLUS]: TESTNET_RSK,
427427
default: TESTNET_RSK
428428
},
429429
gasPriceSettings: {
@@ -451,7 +451,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
451451
[WalletId.LEDGER_NANO_S]: DEFAULT_GO,
452452
[WalletId.TREZOR_NEW]: DEFAULT_GO,
453453
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_GO,
454-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
454+
[WalletId.GRIDPLUS]: DEFAULT_GO,
455455
default: DEFAULT_GO
456456
},
457457
gasPriceSettings: {
@@ -478,7 +478,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
478478
dPaths: {
479479
[WalletId.TREZOR]: DEFAULT_GO,
480480
[WalletId.TREZOR_NEW]: DEFAULT_GO,
481-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
481+
[WalletId.GRIDPLUS]: DEFAULT_GO,
482482
default: DEFAULT_GO
483483
},
484484
gasPriceSettings: {
@@ -532,7 +532,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
532532
[WalletId.LEDGER_NANO_S]: DEFAULT_ATH,
533533
[WalletId.TREZOR_NEW]: DEFAULT_ATH,
534534
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_ATH,
535-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
535+
[WalletId.GRIDPLUS]: DEFAULT_ATH,
536536
default: DEFAULT_ATH
537537
},
538538
gasPriceSettings: {
@@ -559,7 +559,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
559559
[WalletId.LEDGER_NANO_S]: DEFAULT_ETHO,
560560
[WalletId.TREZOR_NEW]: DEFAULT_ETHO,
561561
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_ETHO,
562-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
562+
[WalletId.GRIDPLUS]: DEFAULT_ETHO,
563563
default: DEFAULT_ETHO
564564
},
565565
gasPriceSettings: {
@@ -586,7 +586,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
586586
[WalletId.LEDGER_NANO_S]: DEFAULT_MIX,
587587
[WalletId.TREZOR_NEW]: DEFAULT_MIX,
588588
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_MIX,
589-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
589+
[WalletId.GRIDPLUS]: DEFAULT_MIX,
590590
default: DEFAULT_MIX
591591
},
592592
gasPriceSettings: {
@@ -616,7 +616,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
616616
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
617617
[WalletId.TREZOR_NEW]: DEFAULT_ARTIS_SIGMA1,
618618
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
619-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
619+
[WalletId.GRIDPLUS]: DEFAULT_ARTIS_SIGMA1,
620620
default: DEFAULT_ARTIS_SIGMA1
621621
},
622622
gasPriceSettings: {
@@ -646,7 +646,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
646646
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
647647
[WalletId.TREZOR_NEW]: DEFAULT_ARTIS_TAU1,
648648
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
649-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
649+
[WalletId.GRIDPLUS]: DEFAULT_ARTIS_TAU1,
650650
default: DEFAULT_ARTIS_TAU1
651651
},
652652
gasPriceSettings: {
@@ -673,7 +673,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
673673
[WalletId.TREZOR_NEW]: DEFAULT_THUNDERCORE,
674674
[WalletId.LEDGER_NANO_S]: DEFAULT_THUNDERCORE,
675675
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_THUNDERCORE,
676-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
676+
[WalletId.GRIDPLUS]: DEFAULT_THUNDERCORE,
677677
default: DEFAULT_THUNDERCORE
678678
},
679679
gasPriceSettings: {
@@ -700,7 +700,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
700700
[WalletId.TREZOR_NEW]: DEFAULT_WEB,
701701
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
702702
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
703-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
703+
[WalletId.GRIDPLUS]: DEFAULT_WEB,
704704
default: DEFAULT_WEB
705705
},
706706
gasPriceSettings: {
@@ -725,7 +725,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
725725
dPaths: {
726726
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
727727
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
728-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
728+
[WalletId.GRIDPLUS]: DEFAULT_METADIUM,
729729
default: DEFAULT_METADIUM
730730
},
731731
gasPriceSettings: {
@@ -752,7 +752,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
752752
[WalletId.TREZOR_NEW]: DEFAULT_ETI,
753753
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
754754
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
755-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
755+
[WalletId.GRIDPLUS]: DEFAULT_ETI,
756756
default: DEFAULT_ETI
757757
},
758758
gasPriceSettings: {
@@ -782,7 +782,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
782782
[WalletId.TREZOR_NEW]: DEFAULT_ASK,
783783
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
784784
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
785-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
785+
[WalletId.GRIDPLUS]: DEFAULT_ASK,
786786
default: DEFAULT_ASK
787787
},
788788
gasPriceSettings: {
@@ -810,7 +810,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
810810
[WalletId.TREZOR_NEW]: DEFAULT_AUX,
811811
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
812812
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
813-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
813+
[WalletId.GRIDPLUS]: DEFAULT_AUX,
814814
default: DEFAULT_AUX
815815
},
816816
gasPriceSettings: {
@@ -839,7 +839,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
839839
[WalletId.LEDGER_NANO_S]: DEFAULT_VOLTA,
840840
[WalletId.TREZOR_NEW]: DEFAULT_VOLTA,
841841
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_VOLTA,
842-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
842+
[WalletId.GRIDPLUS]: DEFAULT_VOLTA,
843843
default: DEFAULT_VOLTA
844844
},
845845
gasPriceSettings: {
@@ -870,7 +870,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
870870
[WalletId.LEDGER_NANO_S]: DEFAULT_EWC,
871871
[WalletId.TREZOR_NEW]: DEFAULT_EWC,
872872
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_EWC,
873-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
873+
[WalletId.GRIDPLUS]: DEFAULT_EWC,
874874
default: DEFAULT_EWC
875875
},
876876
gasPriceSettings: {
@@ -898,7 +898,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
898898
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
899899
[WalletId.TREZOR_NEW]: DEFAULT_POLYGON,
900900
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
901-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
901+
[WalletId.GRIDPLUS]: DEFAULT_POLYGON,
902902
default: DEFAULT_POLYGON
903903
},
904904
gasPriceSettings: {
@@ -929,7 +929,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
929929
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
930930
[WalletId.TREZOR_NEW]: DEFAULT_XDAI,
931931
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
932-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
932+
[WalletId.GRIDPLUS]: DEFAULT_XDAI,
933933
default: DEFAULT_XDAI
934934
},
935935
gasPriceSettings: {
@@ -958,7 +958,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
958958
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
959959
[WalletId.TREZOR_NEW]: DEFAULT_ETH,
960960
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_BSC,
961-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
961+
[WalletId.GRIDPLUS]: DEFAULT_BSC,
962962
default: DEFAULT_BSC
963963
},
964964
gasPriceSettings: {
@@ -1017,7 +1017,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
10171017
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
10181018
[WalletId.TREZOR_NEW]: DEFAULT_AVAXC,
10191019
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
1020-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
1020+
[WalletId.GRIDPLUS]: DEFAULT_AVAXC,
10211021
default: DEFAULT_AVAXC
10221022
},
10231023
gasPriceSettings: {
@@ -1049,7 +1049,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
10491049
[WalletId.LEDGER_NANO_S]: DEFAULT_AVAXC,
10501050
[WalletId.TREZOR_NEW]: DEFAULT_AVAXC,
10511051
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_AVAXC,
1052-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
1052+
[WalletId.GRIDPLUS]: DEFAULT_AVAXC,
10531053
default: DEFAULT_AVAXC
10541054
},
10551055
gasPriceSettings: {
@@ -1077,7 +1077,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
10771077
[WalletId.LEDGER_NANO_S]: DEFAULT_EVRICE,
10781078
[WalletId.TREZOR_NEW]: DEFAULT_EVRICE,
10791079
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_EVRICE,
1080-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
1080+
[WalletId.GRIDPLUS]: DEFAULT_EVRICE,
10811081
default: DEFAULT_EVRICE
10821082
},
10831083
gasPriceSettings: {
@@ -1104,7 +1104,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
11041104
[WalletId.LEDGER_NANO_S]: DEFAULT_ETH,
11051105
[WalletId.TREZOR_NEW]: DEFAULT_FTM,
11061106
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_ETH,
1107-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
1107+
[WalletId.GRIDPLUS]: DEFAULT_FTM,
11081108
default: DEFAULT_FTM
11091109
},
11101110
gasPriceSettings: {
@@ -1131,7 +1131,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
11311131
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
11321132
[WalletId.TREZOR_NEW]: DEFAULT_HECO,
11331133
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
1134-
[WalletId.GRIDPLUS]: DEFAULT_ETH,
1134+
[WalletId.GRIDPLUS]: DEFAULT_HECO,
11351135
default: DEFAULT_HECO
11361136
},
11371137
gasPriceSettings: {

‎src/services/ApiService/Gas/eip1559.test.ts

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const block = {
1212
timestamp: 1627469703,
1313
nonce: '0x0000000000000000',
1414
difficulty: 1,
15+
_difficulty: BigNumber.from(1),
1516
gasLimit: BigNumber.from('0x01c9c380'),
1617
gasUsed: BigNumber.from('0x26aee4'),
1718
miner: '0x0000000000000000000000000000000000000000',

0 commit comments

Comments
 (0)