minor fixes

.gitignore

@@ -11,10 +11,11 @@ subnet/logs
 subnet/relayer
 subnet/stats-service
 subnet/deployment-generator/script/gen.env*
+.DS_Store
 XDC-Subnet
 keys.json
 node_modules
 package-lock.json
 generated
 *.env*
-**temp
+**temp

subnet/deployment-generator/scripts/faucet.sh

@@ -6,12 +6,12 @@ cd ..
 
 read -p "Input Grandmaster PK (or any source wallet with funds): " SOURCE_PK
 read -p "Input destination wallet address: " DEST_ADDR
-read -p "Input transfer amount " AMOUNT
+read -p "Input transfer amount: " AMOUNT
 
 extra=""
 if [[ "$OSTYPE" == "darwin"* ]]; then
   extra="--network generated_docker_net"
 fi
 
 docker pull xinfinorg/subnet-generator:$VERSION_GENERATOR
-docker run --env-file common.env --entrypoint node $extra xinfinorg/subnet-generator:$VERSION_GENERATOR /app/src/faucet.js $SOURCE_PK $DEST_ADDR $AMOUNT
+docker run --env-file common.env --entrypoint node $extra xinfinorg/subnet-generator:$VERSION_GENERATOR /app/src/faucet.js $SOURCE_PK $DEST_ADDR $AMOUNT

subnet/deployment-generator/scripts/generate.sh

@@ -14,7 +14,7 @@ echo 'go to http://localhost:5210 to access Subnet Configuration Generator UI'
 echo 'or use ssh tunnel if this is running on your server'
 echo 'ssh -N -L localhost:5210:localhost:5210 <username>@<ip_address> -i <private_key_file>'
 mkdir -p generated/scripts
-docker run -p 5210:5210 -v $current_dir/generated:/app/generated xinfinorg/subnet-generator:$VERSION_GENERATOR || gen_success=false
+docker run -p 5210:5210 -v $current_dir/generated:/app/generated xinfinorg/subnet-generator:$VERSION_GENERATOR
 
 
 echo 'generating genesis.json'

subnet/deployment-generator/src/config_gen.js

@@ -106,8 +106,7 @@ function configSanityCheck(config) {
   if (
     !(
       config.relayer_mode === "full" ||
-      config.relayer_mode === "lite" ||
-      config.relayer_mode === "temp"
+      config.relayer_mode === "lite" 
     )
   ) {
     console.log("RELAYER_MODE only accepts 'full' or 'lite' (default full)");

subnet/deployment-generator/src/faucet.js

@@ -79,8 +79,8 @@ async function processTransfer(inputs) {
       let toBalance = await provider.getBalance(toAddress);
       toBalance = ethers.formatEther(toBalance);
       console.log("Current balance");
-      console.log(fromWallet.address + ":", fromBalance);
-      console.log(toAddress + ":", toBalance);
+      console.log(`${fromWallet.address}: ${fromBalance}`);
+      console.log(`${toAddress}: ${toBalance}`);
       return {
         fromBalance: fromBalance,
         toBalance: toBalance,
@@ -100,12 +100,13 @@ async function faucetServer(inputs) {
     fromPK = inputs[3];
     fromWallet = new ethers.Wallet(fromPK);
 
-    if (command != "server") throw Error("Invalid command");
+    if (command != "server") {throw Error("Invalid command")};
   } catch (error) {
     console.log(error);
     console.log(
       "Usage: SUBNET_URL=<subnet_url> node faucet.js server <from wallet pk>"
     );
+    process.exit()
   }
   app.set("view engine", "pug");
   app.set("views", path.join(__dirname, "views_faucet"));
@@ -160,10 +161,6 @@ async function faucetServer(inputs) {
         message: error.message 
       })
     }
-    // res.json({
-    //   "publicKey": randomWallet.address,
-    //   "privateKey": randomWallet.privateKey
-    // });
   });
 
   app.use("/", router);

subnet/deployment-generator/src/views/index.pug

@@ -250,15 +250,15 @@ body
     .helper-block
       h4 XDC Faucet
       p
-        a(href="https://faucet.apothem.network/") Testnet(Apothem) Faucet
+        a(href="https://faucet.apothem.network/"  target="_blank") Testnet(Apothem) Faucet
       p
-        a(href="https://faucet.blocksscan.io/ ") Testnet and Devnet Faucet by BlocksScan
+        a(href="https://faucet.blocksscan.io/ "  target="_blank") Testnet and Devnet Faucet by BlocksScan
     .helper-block
       h4 Documentation
       p 
-        a(href="https://xinfinorg.github.io/xdc-subnet-docs/deployment/launch_subnet") Official Subnet Documentation 
+        a(href="https://xinfinorg.github.io/xdc-subnet-docs/deployment/launch_subnet" target="_blank") Official Subnet Documentation 
       p
-        a(href="https://github.com/XinFinOrg/XDC-Subnet") XDC-Subnet Github
+        a(href="https://github.com/XinFinOrg/XDC-Subnet"  target="_blank") XDC-Subnet Github
 
 
 script.