update dev configuration for gamma network name

Author: mlclay

config/DEV.ts

@@ -2,6 +2,7 @@ export default {
     "DEPLOY_CONTRACTS" : false,
     "FORCE_LATEST_LOAD_CONTRACT_VERSION" : "1.1.0",
     "FORCE_LATEST_NOTARY_CONTRACT_VERSION" : null,
+    "GETH_NETWORK" : "gamma",
     "IS_DEPLOYED_STAGE" : true,
     "LOGGING_LEVELS": {
         "CLOUDWATCH": "debug",

config/custom-environment-variables.ts

@@ -24,6 +24,7 @@ export default {
   "FORCE_LATEST_LOAD_CONTRACT_VERSION" : "FORCE_LATEST_LOAD_CONTRACT_VERSION",
   "FORCE_LATEST_NOTARY_CONTRACT_VERSION" : "FORCE_LATEST_NOTARY_CONTRACT_VERSION",
   "GETH_NODE": "GETH_NODE",
+  "GETH_NETWORK": "GETH_NETWORK",
   "INFLUXDB_URL": "INFLUXDB_URL",
   "INFURA_PROJECT_ID": "INFURA_PROJECT_ID",
   "REDIS_URL": "REDIS_URL",

src/eth/ethers/EthersEthereumService.ts

@@ -28,61 +28,63 @@ const logger = Logger.get(module.filename);
 export class EthersEthereumService extends AbstractEthereumService {
     protected provider: ethers.providers.Provider;
 
-    constructor() {
+    constructor(skip?: boolean) {
         super();
-        if (config.has('GETH_NETWORK')) {
-            const network = config.get('GETH_NETWORK');
-            const applicableProviders: ethers.providers.BaseProvider[] = [];
+        if (!skip) {
+            if (config.has('GETH_NETWORK')) {
+                const network = config.get('GETH_NETWORK');
+                const applicableProviders: ethers.providers.BaseProvider[] = [];
 
-            logger.debug(`Connecting Ethers.js to [${network}]`);
+                logger.debug(`Connecting Ethers.js to [${network}]`);
 
-            // Add Infura provider if we have a projectId
-            if (config.has('INFURA_PROJECT_ID')) {
-                const projectId = config.get('INFURA_PROJECT_ID');
+                // Add Infura provider if we have a projectId
+                if (config.has('INFURA_PROJECT_ID')) {
+                    const projectId = config.get('INFURA_PROJECT_ID');
 
-                logger.debug(`Adding InfuraProvider [${projectId}]`);
-                applicableProviders.push(new ethers.providers.InfuraProvider(network, projectId));
-            }
+                    logger.debug(`Adding InfuraProvider [${projectId}]`);
+                    applicableProviders.push(new ethers.providers.InfuraProvider(network, projectId));
+                }
 
-            // Add Etherscan provider if we have an apiKey
-            if (config.has('ETHERSCAN_API_KEY')) {
-                const apiKey = config.get('ETHERSCAN_API_KEY');
+                // Add Etherscan provider if we have an apiKey
+                if (config.has('ETHERSCAN_API_KEY')) {
+                    const apiKey = config.get('ETHERSCAN_API_KEY');
 
-                logger.debug(`Adding EtherscanProvider [${apiKey}]`);
-                applicableProviders.push(new ethers.providers.EtherscanProvider(network, apiKey));
-            }
+                    logger.debug(`Adding EtherscanProvider [${apiKey}]`);
+                    applicableProviders.push(new ethers.providers.EtherscanProvider(network, apiKey));
+                }
+
+                // Include the default providers from Ethers.js
+                const defaultProvider = ethers.getDefaultProvider(network);
+                if (defaultProvider instanceof ethers.providers.FallbackProvider) {
+                    logger.debug(`Adding ${defaultProvider.providers.length} FallbackProviders`);
+                    applicableProviders.push(...defaultProvider.providers);
+                } else {
+                    logger.debug(`Adding DefaultProvider`);
+                    applicableProviders.push(defaultProvider);
+                }
+
+                if (applicableProviders.length === 0) {
+                    throw new Error(`Unable to build list of Providers`);
+                }
 
-            // Include the default providers from Ethers.js
-            const defaultProvider = ethers.getDefaultProvider(network);
-            if (defaultProvider instanceof ethers.providers.FallbackProvider) {
-                logger.debug(`Adding ${defaultProvider.providers.length} FallbackProviders`);
-                applicableProviders.push(...defaultProvider.providers);
+                this.provider = new ethers.providers.FallbackProvider(applicableProviders);
             } else {
-                logger.debug(`Adding DefaultProvider`);
-                applicableProviders.push(defaultProvider);
-            }
+                const GETH_NODE = config.get('GETH_NODE');
 
-            if (applicableProviders.length === 0) {
-                throw new Error(`Unable to build list of Providers`);
-            }
+                logger.debug(`Connecting Ethers.js to [${GETH_NODE}]`);
 
-            this.provider = new ethers.providers.FallbackProvider(applicableProviders);
-        } else {
-            const GETH_NODE = config.get('GETH_NODE');
+                this.provider = new ethers.providers.JsonRpcProvider({
+                    url: GETH_NODE,
+                });
 
-            logger.debug(`Connecting Ethers.js to [${GETH_NODE}]`);
+                // Development Geth POA network does not continually create blocks
+                this.transactionConfirmations = 1;
+            }
 
-            this.provider = new ethers.providers.JsonRpcProvider({
-                url: GETH_NODE,
+            this.provider.on('error', error => {
+                logger.error(`Ethers.js Provider Error: ${error}`);
             });
-
-            // Development Geth POA network does not continually create blocks
-            this.transactionConfirmations = 1;
         }
-
-        this.provider.on('error', error => {
-            logger.error(`Ethers.js Provider Error: ${error}`);
-        });
     }
 
     // Network/Node Methods

src/eth/ethers/LoomEthersEthereumService.ts

@@ -85,7 +85,7 @@ export class LoomEthersEthereumService extends EthersEthereumService {
     }
 
     constructor() {
-        super();
+        super(true);
         const GETH_NODE = config.get('GETH_NODE');
 
         logger.debug(`Connecting Ethers.js to [${GETH_NODE}]`);