feat: goerli aggregators (#924)

Author: yomarion

packages/currency/src/aggregators/goerli.json

@@ -0,0 +1,12 @@
+{
+  "0xba62bcfcaafc6622853cca2be6ac7d845bc0f2dc": {
+    "0x775eb53d00dd0acd3ec1696472105d579b9b386b": 1
+  },
+  "0x39e19aa5b69466dfdc313c7cda37cb2a599015cd": {
+    "0x775eb53d00dd0acd3ec1696472105d579b9b386b": 1
+  },
+  "0x775eb53d00dd0acd3ec1696472105d579b9b386b": {
+    "0xba62bcfcaafc6622853cca2be6ac7d845bc0f2dc": 1,
+    "0x39e19aa5b69466dfdc313c7cda37cb2a599015cd": 1
+  }
+}

packages/currency/src/conversion-aggregators.ts

@@ -3,6 +3,7 @@ import { CurrencyDefinition } from './types';
 
 import privateAggregator from './aggregators/private.json';
 import mainnetAggregator from './aggregators/mainnet.json';
+import goerliAggregator from './aggregators/goerli.json';
 import rinkebyAggregator from './aggregators/rinkeby.json';
 import maticAggregator from './aggregators/matic.json';
 import fantomAggregator from './aggregators/fantom.json';
@@ -24,6 +25,7 @@ export type AggregatorsMap = Record<string, CurrencyPairs>;
 // Pairs supported by Chainlink (can be generated from requestNetwork/toolbox/src/chainlinkConversionPathTools.ts)
 const chainlinkCurrencyPairs: AggregatorsMap = {
   private: privateAggregator,
+  goerli: goerliAggregator,
   rinkeby: rinkebyAggregator,
   mainnet: mainnetAggregator,
   matic: maticAggregator,
@@ -39,7 +41,6 @@ const fluxCurrencyPairs: AggregatorsMap = {
 // FIX ME: This fix enables to get these networks registered in conversionSupportedNetworks.
 // Could be improved by removing the supported network check from the protocol
 const noConversionNetworks: AggregatorsMap = {
-  goerli: {},
   'arbitrum-rinkeby': {},
   'arbitrum-one': {},
   xdai: {},

packages/currency/src/erc20/networks/goerli.ts

@@ -2,10 +2,10 @@ import { TokenMap } from './types';
 
 // List of the supported goerli ERC20 tokens
 export const supportedGoerliERC20: TokenMap = {
-  // Faucet Token on goerli network. Easy to use on tests.
+  // Faucet Token on goerli network.
   '0xBA62BCfcAaFc6622853cca2BE6Ac7d845BC0f2Dc': {
     decimals: 18,
-    name: 'Faucet Token',
-    symbol: 'FAU-goerli',
+    name: 'FaucetToken',
+    symbol: 'FAU',
   },
 };

packages/currency/src/erc20/networks/index.ts

@@ -7,10 +7,13 @@ import { supportedFantomTokens } from './fantom';
 import { supportedBSCTestERC20 } from './bsctest';
 import { supportedBSCERC20 } from './bsc';
 import { supportedXDAIERC20 } from './xdai';
+import { supportedGoerliERC20 } from './goerli';
 
 export const supportedNetworks: Record<string, TokenMap> = {
   celo: supportedCeloERC20,
+  // FIXME: Rinkeby is deprecated
   rinkeby: supportedRinkebyERC20,
+  goerli: supportedGoerliERC20,
   mainnet: supportedMainnetERC20,
   matic: supportedMaticERC20,
   fantom: supportedFantomTokens,

packages/toolbox/src/commands/chainlink/aggregatorsUtils.ts

@@ -27,12 +27,13 @@ export type Aggregator = {
 };
 
 const feedMap: Record<string, [chainKey: string, networkName: string]> = {
-  mainnet: ['ethereum-addresses', 'Ethereum Mainnet'],
-  rinkeby: ['ethereum-addresses', 'Rinkeby Testnet'],
-  fantom: ['fantom-price-feeds', 'Fantom Mainnet'],
-  matic: ['matic-addresses', 'Polygon Mainnet'],
-  xdai: ['data-feeds-gnosis-chain', 'Gnosis Chain Mainnet'],
-  bsc: ['bnb-chain-addresses-price', 'BNB Chain Mainnet'],
+  mainnet: ['ethereum', 'Ethereum Mainnet'],
+  goerli: ['ethereum', 'Goerli Testnet'],
+  rinkeby: ['ethereum', 'Rinkeby Testnet'],
+  fantom: ['fantom', 'Fantom Mainnet'],
+  matic: ['polygon', 'Polygon Mainnet'],
+  xdai: ['gnosis-chain', 'Gnosis Chain Mainnet'],
+  bsc: ['bnb-chain', 'BNB Chain Mainnet'],
 };
 
 export const getAvailableAggregators = async (