m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-26 12:29:06 +01:00
Code

Merge pull request #7189 from MetaMask/add-goerli-to-incoming-tx

Browse Source 
add goerli to incoming tx
This commit is contained in:
Jenny Pollack 2019-09-18 10:26:57 -07:00 committed by GitHub
commit 5b309afc2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/controllers/incoming-transactions.js
View File

@ -9,15 +9,18 @@ const {
ROPSTEN_CODE,
RINKEBY_CODE,
KOVAN_CODE,
GOERLI_CODE,
ROPSTEN,
RINKEBY,
KOVAN,
GOERLI,
MAINNET,
} = require('./network/enums')
const networkTypeToIdMap = {
[ROPSTEN]: String(ROPSTEN_CODE),
[RINKEBY]: String(RINKEBY_CODE),
[KOVAN]: String(KOVAN_CODE),
[GOERLI]: String(GOERLI_CODE),
[MAINNET]: String(MAINNET_CODE),
}
const fetch = fetchWithTimeout({
@ -52,6 +55,7 @@ class IncomingTransactionsController {
[ROPSTEN]: null,
[RINKEBY]: null,
[KOVAN]: null,
[GOERLI]: null,
[MAINNET]: null,
},
}, opts.initState)
@ -178,7 +182,7 @@ class IncomingTransactionsController {
async _fetchTxs (address, fromBlock, networkType) {
let etherscanSubdomain = 'api'
const currentNetworkID = networkTypeToIdMap[networkType]
const supportedNetworkTypes = [ROPSTEN, RINKEBY, KOVAN, MAINNET]
const supportedNetworkTypes = [ROPSTEN, RINKEBY, KOVAN, GOERLI, MAINNET]
if (supportedNetworkTypes.indexOf(networkType) === -1) {
return {}

6
test/unit/app/controllers/incoming-transactions-test.js
View File

@ -9,6 +9,7 @@ const {
ROPSTEN,
RINKEBY,
KOVAN,
GOERLI,
MAINNET,
} = require('../../../../app/scripts/controllers/network/enums')
@ -19,6 +20,7 @@ describe('IncomingTransactionsController', () => {
[ROPSTEN]: null,
[RINKEBY]: null,
[KOVAN]: null,
[GOERLI]: null,
[MAINNET]: null,
},
}
@ -31,6 +33,7 @@ describe('IncomingTransactionsController', () => {
[ROPSTEN]: 1,
[RINKEBY]: 2,
[KOVAN]: 3,
[GOERLI]: 5,
[MAINNET]: 4,
},
}
@ -43,6 +46,7 @@ describe('IncomingTransactionsController', () => {
[ROPSTEN]: 1,
[RINKEBY]: 2,
[KOVAN]: 3,
[GOERLI]: 5,
[MAINNET]: 4,
FAKE_NETWORK: 1111,
},
@ -243,6 +247,7 @@ describe('IncomingTransactionsController', () => {
[ROPSTEN]: 1,
[RINKEBY]: 2,
[KOVAN]: 3,
[GOERLI]: 5,
[MAINNET]: 4,
FAKE_NETWORK: 1111,
},
@ -262,6 +267,7 @@ describe('IncomingTransactionsController', () => {
[ROPSTEN]: 1,
[RINKEBY]: 2,
[KOVAN]: 3,
[GOERLI]: 5,
[MAINNET]: 4,
FAKE_NETWORK: 1111,
},