Use address overrides for mapping over hardcoded network contracts (#213

)

packages/dai/contracts/networks.js

@@ -11,8 +11,7 @@ const addressMapping = {
   testnet: testnetAddresses
 };
 
-export function contractInfo(network) {
-  const addresses = addressMapping[network];
+export function contractAddressesInfo(addresses) {
   return {
     // Tokens
     [tokens.DAI]: [
@@ -143,13 +142,26 @@ export function contractInfo(network) {
   };
 }
 
+export function contractInfo(network) {
+  const addresses = addressMapping[network];
+  return contractAddressesInfo(addresses);
+}
+
 export const TESTNET_ID = 999;
 
 export default [
   { name: 'mainnet', networkId: 1, contracts: contractInfo('mainnet') },
   { name: 'morden', networkId: 2 },
   { name: 'ropsten', networkId: 3 },
-  { name: 'rinkeby', networkId: 4 },
+  {
+    name: 'rinkeby',
+    networkId: 4
+  },
+  {
+    name: 'goerli',
+    networkId: 5
+  },
+
   { name: 'kovan', networkId: 42, contracts: contractInfo('kovan') },
   { name: 'test', networkId: 1337, contracts: contractInfo('testnet') },
   { name: 'test', networkId: TESTNET_ID, contracts: contractInfo('testnet') }

packages/dai/src/eth/SmartContractService.js

@@ -1,7 +1,7 @@
 import { PrivateService } from '@makerdao/services-core';
 import contracts from '../../contracts/contracts';
 import tokens from '../../contracts/tokens';
-import networks from '../../contracts/networks';
+import networks, { contractAddressesInfo } from '../../contracts/networks';
 import { Contract } from 'ethers';
 import { wrapContract } from './smartContract/wrapContract';
 import mapValues from 'lodash/mapValues';
@@ -116,21 +116,25 @@ export default class SmartContractService extends PrivateService {
     const mapping = networks.find(m => m.name === networkName);
     assert(mapping, `Network "${networkName}" not found in mapping.`);
 
+    if (!mapping.contracts)
+      mapping.contracts = contractAddressesInfo(this._addressOverrides);
+
     if (!this._contractInfoCache) this._contractInfoCache = {};
     if (!this._contractInfoCache[networkName]) {
       const allContractInfo = this._addedContracts
-        ? { ...mapping.contracts, ...this._addedContracts }
+        ? {
+            ...mapping.contracts,
+            ...this._addedContracts
+          }
         : mapping.contracts;
 
       this._contractInfoCache[networkName] = mapValues(
         allContractInfo,
         (versions, name) => {
           const latest = findLatestContractInfo(versions);
-
           const address =
             getSingleAddress(this._addressOverrides[name], networkName) ||
             getSingleAddress(latest.address, networkName);
-
           return address !== latest.address
             ? versions.map(v => (v === latest ? { ...latest, address } : v))
             : versions;

packages/dai/test/eth/SmartContractService.spec.js

@@ -167,3 +167,21 @@ test('fallback if addressOverrides does not specify current network', async () =
   const addresses = service.getContractAddresses();
   expect(addresses.PROXY_REGISTRY).toEqual(originalAddresses.PROXY_REGISTRY);
 });
+
+test('can use address overrides for contract info', async () => {
+  const service = buildTestService('smartContract', {
+    smartContract: {
+      addressOverrides: {
+        PROXY_REGISTRY: {
+          rinkeby: '0xmock1'
+        }
+      }
+    }
+  });
+
+  service.get('web3').networkId = () => 4;
+  service.get('web3');
+  await service.manager().authenticate();
+  const addresses = service.getContractAddresses();
+  expect(addresses.PROXY_REGISTRY).toEqual('0xmock1');
+});