Skip to content

Commit

Permalink
Update GridPlus DPaths (#4244)
Browse files Browse the repository at this point in the history 
* Update GridPlus DPaths

* Bump wallets lib and a few other deps

* Run Prettier
  • Loading branch information
@FrederikBolding
FrederikBolding authored Feb 8, 2022
1 parent 33fb39c commit 76ef91d
Show file tree
Hide file tree
Showing 4 changed files with 247 additions and 746 deletions.
24 changes: 12 additions & 12 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@
},
"dependencies": {
"@datapunt/matomo-tracker-js": "0.4.0",
"@ethersproject/abstract-provider": "5.4.0",
"@ethersproject/address": "5.4.0",
"@ethersproject/bignumber": "5.4.1",
"@ethersproject/bytes": "5.4.0",
"@ethersproject/constants": "5.4.0",
"@ethersproject/contracts": "5.4.1",
"@ethersproject/providers": "5.4.3",
"@ethersproject/transactions": "5.4.0",
"@ethersproject/units": "5.4.0",
"@ethersproject/wallet": "5.4.0",
"@ethersproject/abstract-provider": "5.5.1",
"@ethersproject/address": "5.5.0",
"@ethersproject/bignumber": "5.5.0",
"@ethersproject/bytes": "5.5.0",
"@ethersproject/constants": "5.5.0",
"@ethersproject/contracts": "5.5.0",
"@ethersproject/providers": "5.5.3",
"@ethersproject/transactions": "5.5.0",
"@ethersproject/units": "5.5.0",
"@ethersproject/wallet": "5.5.0",
"@metamask/inpage-provider": "8.0.3",
"@metamask/object-multiplex": "1.2.0",
"@metamask/post-message-stream": "4.0.0",
"@mycrypto/eth-scan": "3.4.4",
"@mycrypto/ui": "0.24.1",
"@mycrypto/unlock-scan": "1.2.0",
"@mycrypto/wallets": "1.4.2",
"@mycrypto/wallets": "1.4.3",
"@reduxjs/toolkit": "1.6.0",
"@styled-system/should-forward-prop": "5.1.5",
"@types/papaparse": "5.0.6",
Expand All @@ -38,7 +38,7 @@
"@unstoppabledomains/resolution": "4.0.2",
"@walletconnect/client": "1.6.2",
"apollo-boost": "0.4.7",
"axios": "0.21.3",
"axios": "0.24.0",
"bignumber.js": "9.0.0",
"bn.js": "4.11.8",
"classnames": "2.2.5",
Expand Down
64 changes: 32 additions & 32 deletions src/database/data/networks.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: LEDGER_ETC,
[WalletId.TREZOR_NEW]: DEFAULT_ETC,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETC,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETC,
default: DEFAULT_ETC
},
gasPriceSettings: {
Expand All @@ -226,7 +226,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_UBQ,
[WalletId.TREZOR_NEW]: DEFAULT_UBQ,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_UBQ,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_UBQ,
default: DEFAULT_UBQ
},
gasPriceSettings: {
Expand All @@ -253,7 +253,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_EXP,
[WalletId.TREZOR_NEW]: DEFAULT_EXP,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_EXP,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_EXP,
default: DEFAULT_EXP
},
gasPriceSettings: {
Expand Down Expand Up @@ -282,7 +282,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.TREZOR_NEW]: DEFAULT_POA,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_POA,
default: DEFAULT_POA
},
gasPriceSettings: {
Expand All @@ -309,7 +309,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_TOMO,
[WalletId.TREZOR_NEW]: DEFAULT_ETH,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_TOMO,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_TOMO,
default: DEFAULT_TOMO
},
gasPriceSettings: {
Expand All @@ -336,7 +336,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_EGEM,
[WalletId.TREZOR_NEW]: DEFAULT_EGEM,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_EGEM,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_EGEM,
default: DEFAULT_EGEM
},
gasPriceSettings: {
Expand Down Expand Up @@ -364,7 +364,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_CLO,
[WalletId.TREZOR_NEW]: DEFAULT_CLO,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_CLO,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_CLO,
default: DEFAULT_CLO
},
gasPriceSettings: {
Expand Down Expand Up @@ -393,7 +393,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: MAINNET_RSK,
[WalletId.TREZOR_NEW]: MAINNET_RSK,
[WalletId.LEDGER_NANO_S_NEW]: MAINNET_RSK,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: MAINNET_RSK,
default: MAINNET_RSK
},
gasPriceSettings: {
Expand Down Expand Up @@ -423,7 +423,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: TESTNET_RSK,
[WalletId.TREZOR_NEW]: TESTNET_RSK,
[WalletId.LEDGER_NANO_S_NEW]: TESTNET_RSK,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: TESTNET_RSK,
default: TESTNET_RSK
},
gasPriceSettings: {
Expand Down Expand Up @@ -451,7 +451,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_GO,
[WalletId.TREZOR_NEW]: DEFAULT_GO,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_GO,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_GO,
default: DEFAULT_GO
},
gasPriceSettings: {
Expand All @@ -478,7 +478,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
dPaths: {
[WalletId.TREZOR]: DEFAULT_GO,
[WalletId.TREZOR_NEW]: DEFAULT_GO,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_GO,
default: DEFAULT_GO
},
gasPriceSettings: {
Expand Down Expand Up @@ -532,7 +532,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_ATH,
[WalletId.TREZOR_NEW]: DEFAULT_ATH,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_ATH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ATH,
default: DEFAULT_ATH
},
gasPriceSettings: {
Expand All @@ -559,7 +559,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_ETHO,
[WalletId.TREZOR_NEW]: DEFAULT_ETHO,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_ETHO,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETHO,
default: DEFAULT_ETHO
},
gasPriceSettings: {
Expand All @@ -586,7 +586,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_MIX,
[WalletId.TREZOR_NEW]: DEFAULT_MIX,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_MIX,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_MIX,
default: DEFAULT_MIX
},
gasPriceSettings: {
Expand Down Expand Up @@ -616,7 +616,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.TREZOR_NEW]: DEFAULT_ARTIS_SIGMA1,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ARTIS_SIGMA1,
default: DEFAULT_ARTIS_SIGMA1
},
gasPriceSettings: {
Expand Down Expand Up @@ -646,7 +646,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.TREZOR_NEW]: DEFAULT_ARTIS_TAU1,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ARTIS_TAU1,
default: DEFAULT_ARTIS_TAU1
},
gasPriceSettings: {
Expand All @@ -673,7 +673,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.TREZOR_NEW]: DEFAULT_THUNDERCORE,
[WalletId.LEDGER_NANO_S]: DEFAULT_THUNDERCORE,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_THUNDERCORE,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_THUNDERCORE,
default: DEFAULT_THUNDERCORE
},
gasPriceSettings: {
Expand All @@ -700,7 +700,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.TREZOR_NEW]: DEFAULT_WEB,
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_WEB,
default: DEFAULT_WEB
},
gasPriceSettings: {
Expand All @@ -725,7 +725,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
dPaths: {
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_METADIUM,
default: DEFAULT_METADIUM
},
gasPriceSettings: {
Expand All @@ -752,7 +752,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.TREZOR_NEW]: DEFAULT_ETI,
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETI,
default: DEFAULT_ETI
},
gasPriceSettings: {
Expand Down Expand Up @@ -782,7 +782,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.TREZOR_NEW]: DEFAULT_ASK,
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ASK,
default: DEFAULT_ASK
},
gasPriceSettings: {
Expand Down Expand Up @@ -810,7 +810,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.TREZOR_NEW]: DEFAULT_AUX,
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_AUX,
default: DEFAULT_AUX
},
gasPriceSettings: {
Expand Down Expand Up @@ -839,7 +839,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_VOLTA,
[WalletId.TREZOR_NEW]: DEFAULT_VOLTA,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_VOLTA,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_VOLTA,
default: DEFAULT_VOLTA
},
gasPriceSettings: {
Expand Down Expand Up @@ -870,7 +870,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_EWC,
[WalletId.TREZOR_NEW]: DEFAULT_EWC,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_EWC,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_EWC,
default: DEFAULT_EWC
},
gasPriceSettings: {
Expand Down Expand Up @@ -898,7 +898,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.TREZOR_NEW]: DEFAULT_POLYGON,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_POLYGON,
default: DEFAULT_POLYGON
},
gasPriceSettings: {
Expand Down Expand Up @@ -929,7 +929,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.TREZOR_NEW]: DEFAULT_XDAI,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_XDAI,
default: DEFAULT_XDAI
},
gasPriceSettings: {
Expand Down Expand Up @@ -958,7 +958,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.TREZOR_NEW]: DEFAULT_ETH,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_BSC,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_BSC,
default: DEFAULT_BSC
},
gasPriceSettings: {
Expand Down Expand Up @@ -1017,7 +1017,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.TREZOR_NEW]: DEFAULT_AVAXC,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_AVAXC,
default: DEFAULT_AVAXC
},
gasPriceSettings: {
Expand Down Expand Up @@ -1049,7 +1049,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_AVAXC,
[WalletId.TREZOR_NEW]: DEFAULT_AVAXC,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_AVAXC,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_AVAXC,
default: DEFAULT_AVAXC
},
gasPriceSettings: {
Expand Down Expand Up @@ -1077,7 +1077,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_EVRICE,
[WalletId.TREZOR_NEW]: DEFAULT_EVRICE,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_EVRICE,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_EVRICE,
default: DEFAULT_EVRICE
},
gasPriceSettings: {
Expand All @@ -1104,7 +1104,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: DEFAULT_ETH,
[WalletId.TREZOR_NEW]: DEFAULT_FTM,
[WalletId.LEDGER_NANO_S_NEW]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_FTM,
default: DEFAULT_FTM
},
gasPriceSettings: {
Expand All @@ -1131,7 +1131,7 @@ export const NETWORKS_CONFIG: NetworkConfig = {
[WalletId.LEDGER_NANO_S]: LEDGER_ETH,
[WalletId.TREZOR_NEW]: DEFAULT_HECO,
[WalletId.LEDGER_NANO_S_NEW]: LEDGER_ETH,
[WalletId.GRIDPLUS]: DEFAULT_ETH,
[WalletId.GRIDPLUS]: DEFAULT_HECO,
default: DEFAULT_HECO
},
gasPriceSettings: {
Expand Down
1 change: 1 addition & 0 deletions src/services/ApiService/Gas/eip1559.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const block = {
timestamp: 1627469703,
nonce: '0x0000000000000000',
difficulty: 1,
_difficulty: BigNumber.from(1),
gasLimit: BigNumber.from('0x01c9c380'),
gasUsed: BigNumber.from('0x26aee4'),
miner: '0x0000000000000000000000000000000000000000',
Expand Down
Loading

0 comments on commit 76ef91d

Please sign in to comment.