Merge pull request #6 from zikriya/develop

Bugs resolved for making build
ferrumnet · Dec 11, 2022 · 662af10 · 662af10
2 parents 873b0e7 + e6befc1
commit 662af10
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/index.ts b/index.ts
@@ -67,6 +67,7 @@ if (
 (global as any).removeRandomKeyJob = require("./app/lib/crons/removeRandomKeyJob");
 
 // fiber
+(global as any).networkHelper = require("./network");
 (global as any).fiberNode = require("./scripts/fiberNode");
 
 (global as any).kraken = app.kraken;

diff --git a/scripts/fiberEngine.js b/scripts/fiberEngine.js
@@ -36,7 +36,7 @@ const {
   networks,
   goerliCudos,
   bscCudos,
-} = require("../network");
+} = global.networkHelper;
 const toWei = (i) => ethers.utils.parseEther(i);
 const toEther = (i) => ethers.utils.formatEther(i);
 

diff --git a/scripts/fiberNode.js b/scripts/fiberNode.js
@@ -9,7 +9,7 @@ const {
   goerliUsdc,
   bscCake,
   goerliAda,
-} = require("../network");
+} = global.networkHelper;
 const { ethers } = require("ethers");
 async function sourceFACCheck(sourceNetwork, tokenAddress, amount) {
   const sourceTokenContract = new ethers.Contract(

diff --git a/scripts/ionic.js b/scripts/ionic.js
@@ -5,7 +5,7 @@ const fundManagerAbi = require("../artifacts/contracts/upgradeable-Bridge/FundMa
 const fiberRouterAbi = require("../artifacts/contracts/upgradeable-Bridge/FiberRouter.sol/FiberRouter.json");
 const tokenAbi = require("../artifacts/contracts/token/Token.sol/Token.json");
 const routerAbi = require("../artifacts/contracts/common/uniswap/IUniswapV2Router02.sol/IUniswapV2Router02.json");
-const { goerliAda } = require("../network");
+const { goerliAda } = global.networkHelper;
 const toWei = (i) => ethers.utils.parseEther(i);
 const toEther = (i) => ethers.utils.formatEther(i);
 

diff --git a/scripts/minimumReceive.js b/scripts/minimumReceive.js
@@ -1,5 +1,5 @@
 const tokenAbi = require("../artifacts/contracts/token/Token.sol/Token.json");
-const { networks, goerliUsdt, goerliUsdc } = require("../Network");
+const { networks, goerliUsdt, goerliUsdc } = global;
 
 async function getMinimumReceivedAmount(
     chainId,

diff --git a/scripts/multiSwapSdk/cosmwasm/multiswap_test.js b/scripts/multiSwapSdk/cosmwasm/multiswap_test.js
@@ -2,15 +2,15 @@ const { MultiswapContract } = require("./multiswap");
 require("dotenv").config();
 
 async function main() {
-  let denom = (global as any).environment.DENOM;
-  let wallet2 = (global as any).environment.WALLET2;
+  let denom = global.environment.DENOM;
+  let wallet2 = global.environment.WALLET2;
 
   helper = new MultiswapContract(
-    (global as any).environment.MULTISWAP || "",
-    (global as any).environment.NODE || "",
+    global.environment.MULTISWAP || "",
+    global.environment.NODE || "",
     // cudos-noded tx bank send validator cudos1nysrj2xxpm77xpkvglne0zcvnxuq0laacc7nrv 100000000stake --keyring-backend=test --chain-id=test
-    (global as any).environment.ADMIN_PRIVKEY || "",
-    (global as any).environment.GAS_PRICE || ""
+    global.environment.ADMIN_PRIVKEY || "",
+    global.environment.GAS_PRICE || ""
   );
   let isFoundryAsset = await helper.isFoundryAsset(denom);
   console.log("isFoundryAsset", isFoundryAsset);

diff --git a/scripts/multiSwapSdk/cosmwasm/router_test.js b/scripts/multiSwapSdk/cosmwasm/router_test.js
@@ -2,15 +2,15 @@ const { FIBERRouterContract } = require("./router");
 require("dotenv").config();
 
 async function main() {
-  let denom = (global as any).environment.DENOM;
-  let wallet2 = (global as any).environment.WALLET2;
+  let denom = global.environment.DENOM;
+  let wallet2 = global.environment.WALLET2;
 
   helper = new FIBERRouterContract(
-    (global as any).environment.ROUTER || "",
-    (global as any).environment.NODE || "",
+    global.environment.ROUTER || "",
+    global.environment.NODE || "",
     // cudos-noded tx bank send validator cudos1nysrj2xxpm77xpkvglne0zcvnxuq0laacc7nrv 100000000stake --keyring-backend=test --chain-id=test
-    (global as any).environment.ADMIN_PRIVKEY || "",
-    (global as any).environment.GAS_PRICE || ""
+    global.environment.ADMIN_PRIVKEY || "",
+    global.environment.GAS_PRICE || ""
   );
   // await helper.owner();
   let pool = await helper.pool();