Feature/add fallback rpc (#20)

* add more logging for webhook helper * add backuo logger * fix: bnb override rpc --------- Co-authored-by: xander <[email protected]> Co-authored-by: aiswaryawalter <[email protected]>
push-protocol · Apr 12, 2023 · e86a22d · e86a22d
1 parent 0b241e3
commit e86a22d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -143,5 +143,6 @@ dump.rdb*
 yarn.lock 
 
 # ChannelKeys
+src/showrunners
 src/showrunners/*/*Keys.json
 src/showrunners/*/*PrivateSettings.json
diff --git a/jest.config.js b/jest.config.js
@@ -2,6 +2,7 @@
 // https://jestjs.io/docs/en/configuration.html
 
 module.exports = {
+  testTimeout:1000000,
   // All imported modules in your tests should be mocked automatically
   // automock: false,
 

diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "@apollo/client": "^3.6.9",
     "@arbitrum/sdk": "^1.1.0",
     "@gnosis.pm/safe-service-client": "^1.4.0",
+    "@google-cloud/bigquery": "^6.2.0",
     "@improbable-eng/grpc-web": "^0.15.0",
     "@improbable-eng/grpc-web-node-http-transport": "^0.15.0",
     "@injectivelabs/derivatives-consumer": "^0.5.1",
@@ -123,7 +124,7 @@
     "eslint-config-prettier": "^4.2.0",
     "eslint-plugin-prettier": "^3.0.1",
     "git-json-merge": "0.4.5",
-    "jest": "^24.1.0",
+    "jest": "27",
     "nodemon": "^2.0.1",
     "prettier": "^2.5.1",
     "ts-jest": "^27.1.3",

diff --git a/src/config/channelsConfig.ts b/src/config/channelsConfig.ts
@@ -33,8 +33,9 @@ const channelWallets = function loadShowrunnersWallets() {
 
       for (const [key, value] of Object.entries(object)) {
         // check and decide old standard or not
-        const isOldStandard = (typeof value === 'string' || value instanceof String) ? true : false;
-        const pkey = isOldStandard ? value : value.PK;
+        const isOldStandard = typeof value === 'string' || value instanceof String ? true : false;
+        const newValue: any = value;
+        const pkey = isOldStandard ? newValue : newValue.PK;
 
         const result = cryptoHelper.checkPrivateKeyValidity(pkey);
 

diff --git a/src/config/index.ts b/src/config/index.ts
@@ -107,7 +107,7 @@ let config = {
   alchemyAPI: process.env.ALCHEMY_API,
 
   web3MainnetProvider: `https://mainnet.infura.io/v3/${process.env.INFURA_PROJECT_ID}`,
-  web3MainnetNetwork: staticConfig.MAINNET_WEB3_NETWORK,
+  web3MainnetNetwork: process.env.MAINNET_RPC_OVERRIDE || staticConfig.MAINNET_WEB3_NETWORK,
   web3MainnetSocket: staticConfig.MAINNET_WEB3_SOCKET,
 
   web3RopstenProvider: `https://ropsten.infura.io/v3/${process.env.INFURA_PROJECT_ID}`,
@@ -126,7 +126,7 @@ let config = {
 
   web3GnosisRPC: staticConfig.GNOSIS_MAINNET_RPC,
 
-  web3BnbMainnetRPC: staticConfig.BNB_MAINNET_RPC,
+  web3BnbMainnetRPC: process.env.BNB_RPC_OVERRIDE || staticConfig.BNB_MAINNET_RPC,
   web3BnbTestnetRPC: staticConfig.BNB_TESTNET_RPC,
 
   /**

diff --git a/src/loaders/logger.ts b/src/loaders/logger.ts
@@ -63,7 +63,8 @@ const formatter = winston.format.combine(
   }),
 )
 
-var transport = new (winston.transports.DailyRotateFile)(options.file);
+const winstonTransporter:any = winston.transports;
+var transport = new (winstonTransporter.DailyRotateFile)(options.file);
 transport.on('rotate', function(oldFilename, newFilename) {
   // do something fun
   console.log("login rotated from: %o | %o", oldFilename, newFilename)