From eb60a4217fcec000b055b8208eed4929c9d64893 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Mon, 12 Oct 2020 07:37:39 -0700
Subject: [PATCH] use addresses from contracts

---
 src/utils/ConfigHelper.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/utils/ConfigHelper.ts b/src/utils/ConfigHelper.ts
index 13aac9d62..b146a530a 100644
--- a/src/utils/ConfigHelper.ts
+++ b/src/utils/ConfigHelper.ts
@@ -68,7 +68,7 @@ const configs: ConfigHelperConfig[] = [
 
 export class ConfigHelper {
   /* Load contract addresses from env ADDRESS_FILE (generated by ocean-contracts) */
-  public getAddressesFromEnv(): Partial<ConfigHelperConfig> {
+  public getAddressesFromEnv(network: string): Partial<ConfigHelperConfig> {
     try {
       const data = JSON.parse(
         fs.readFileSync(
@@ -78,13 +78,14 @@ export class ConfigHelper {
         )
       )
 
-      const { DTFactory, BFactory, FixedRateExchange, Metadata } = data?.ganache
+      const { DTFactory, BFactory, FixedRateExchange, Metadata, Ocean } = data[network]
 
       const configAddresses: Partial<ConfigHelperConfig> = {
         factoryAddress: DTFactory,
         poolFactoryAddress: BFactory,
         fixedRateExchangeAddress: FixedRateExchange,
         metadataContractAddress: Metadata,
+        oceanTokenAddress: Ocean,
         ...(process.env.AQUARIUS_URI && { metadataStoreUri: process.env.AQUARIUS_URI })
       }
 
@@ -107,10 +108,8 @@ export class ConfigHelper {
       return null
     }
 
-    if (network === 'development') {
-      const contractAddressesConfig = this.getAddressesFromEnv()
-      config = { ...config, ...contractAddressesConfig }
-    }
+    const contractAddressesConfig = this.getAddressesFromEnv(config.network)
+    config = { ...config, ...contractAddressesConfig }
 
     const nodeUri = infuraProjectId
       ? `${config.nodeUri}/${infuraProjectId}`