Fix shelley_testnet_v2 network identification

input-output-hk · Jul 4, 2020 · dda54aa · dda54aa
1 parent 8da2159
commit dda54aa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "nix:flight": "NETWORK=mainnet nix-shell --argstr nodeImplementation cardano --argstr cluster mainnet_flight",
     "nix:selfnode": "NETWORK=selfnode nix-shell --argstr nodeImplementation cardano --argstr cluster selfnode",
     "nix:shelley_local": "NETWORK=shelley_testnet nix-shell --arg configOverride state-cluster/config.json --arg genesisOverride state-cluster/keys/genesis.json --argstr nodeImplementation cardano --argstr cluster local --arg useLocalNode true",
-    "nix:shelley_testnet": "NETWORK=shelley_testnet nix-shell --argstr nodeImplementation cardano --argstr cluster shelley_testnet",
+    "nix:shelley_testnet": "NETWORK=shelley_testnet_v2 nix-shell --argstr nodeImplementation cardano --argstr cluster shelley_testnet_v2",
     "nix:shelley_qa": "NETWORK=shelley_qa nix-shell --argstr nodeImplementation cardano --argstr cluster shelley_qa",
     "nix:staging": "NETWORK=staging nix-shell --argstr nodeImplementation cardano --argstr cluster staging",
     "nix:testnet": "NETWORK=testnet nix-shell --argstr nodeImplementation cardano --argstr cluster testnet",

diff --git a/source/common/types/environment.types.js b/source/common/types/environment.types.js
@@ -49,6 +49,7 @@ export const STAGING = 'staging';
 export const TESTNET = 'testnet';
 export const SHELLEY_LOCAL = 'local';
 export const SHELLEY_TESTNET = 'shelley_testnet';
+export const SHELLEY_TESTNET_V2 = 'shelley_testnet_v2';
 export const SHELLEY_QA = 'shelley_qa';
 
 // jormungandr networks

diff --git a/source/common/utils/environmentCheckers.js b/source/common/utils/environmentCheckers.js
@@ -7,6 +7,8 @@ import {
   MAINNET,
   MAINNET_FLIGHT,
   PRODUCTION,
+  SHELLEY_TESTNET,
+  SHELLEY_TESTNET_V2,
   SELFNODE,
   STAGING,
   TEST,
@@ -31,6 +33,9 @@ export const evaluateNetwork = (network: ?string) => {
   if (network === MAINNET_FLIGHT) {
     currentNetwork = MAINNET;
   }
+  if (network === SHELLEY_TESTNET_V2) {
+    currentNetwork = SHELLEY_TESTNET;
+  }
   return currentNetwork;
 };
 

diff --git a/source/main/environment.js b/source/main/environment.js
@@ -8,6 +8,8 @@ import {
   OS_NAMES,
   MAINNET,
   MAINNET_FLIGHT,
+  SHELLEY_TESTNET,
+  SHELLEY_TESTNET_V2,
 } from '../common/types/environment.types';
 import {
   evaluateNetwork,
@@ -34,8 +36,11 @@ import {
 
 // environment variables
 const CURRENT_NODE_ENV = process.env.NODE_ENV || DEVELOPMENT;
-const RAW_NETWORK =
+let RAW_NETWORK =
   process.env.NETWORK === MAINNET_FLIGHT ? MAINNET : process.env.NETWORK || '';
+if (process.env.NETWORK === SHELLEY_TESTNET_V2) {
+  RAW_NETWORK = SHELLEY_TESTNET;
+}
 const NETWORK = evaluateNetwork(process.env.NETWORK);
 const isDev = checkIsDev(CURRENT_NODE_ENV);
 const isTest = checkIsTest(CURRENT_NODE_ENV);