fix: update express deps, remove referances to climate-warehouse

Chia-Network · May 24, 2023 · 0a25e5b · 0a25e5b
1 parent 2df58bf
commit 0a25e5b
Show file tree

Hide file tree

Showing 16 changed files with 682 additions and 806 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,26 +30,26 @@
     "assets": "package.json"
   },
   "dependencies": {
-    "body-parser": "^1.19.0",
+    "body-parser": "^1.20.2",
     "cli-spinner": "^0.2.10",
     "cors": "^2.8.5",
     "csvtojson": "^2.0.10",
-    "dotenv": "^10.0.0",
-    "express": "~4.16.1",
+    "dotenv": "^16.0.3",
+    "express": "^4.18.2",
     "express-fileupload": "^1.2.1",
-    "express-joi-validation": "^5.0.0",
+    "express-joi-validation": "^5.0.1",
     "joi": "^17.5.0",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "log-update": "^4.0.0",
     "mysql2": "^2.3.3",
     "node-xlsx": "^0.21.0",
     "regenerator-runtime": "^0.13.9",
-    "rxjs": "^7.5.1",
-    "sequelize": "^6.17.0",
-    "socket.io": "^4.4.0",
+    "rxjs": "^7.8.1",
+    "sequelize": "^6.31.1",
+    "socket.io": "^4.6.1",
     "sqlite3": "^5.1.6",
-    "superagent": "^3.8.3",
+    "superagent": "^8.0.9",
     "toad-scheduler": "^1.6.0",
     "uuidv4": "^6",
     "winston": "^3.7.2",

diff --git a/src/database/index.js b/src/database/index.js
@@ -17,7 +17,7 @@ const mirrorConfig =
   (process.env.NODE_ENV || 'local') === 'local' ? 'mirror' : 'mirrorTest';
 export const sequelizeMirror = new Sequelize(config[mirrorConfig]);
 
-logger.info('climate-warehouse:mirror-database');
+logger.info('CADT:mirror-database');
 
 export const safeMirrorDbHandler = (callback) => {
   try {

diff --git a/src/datalayer/persistance.js b/src/datalayer/persistance.js
@@ -10,7 +10,7 @@ import { Organization } from '../models';
 import { logger } from '../config/logger.cjs';
 import { getChiaRoot } from '../utils/chia-root.js';
 
-logger.info('climate-warehouse:datalayer:persistance');
+logger.info('CADT:datalayer:persistance');
 process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = 0;
 
 const CONFIG = getConfig().APP;

diff --git a/src/datalayer/writeService.js b/src/datalayer/writeService.js
@@ -10,7 +10,7 @@ import { logger } from '../config/logger.cjs';
 import { Organization } from '../models';
 import { publicIpv4 } from '../utils/ip-tools';
 
-logger.info('climate-warehouse:datalayer:writeService');
+logger.info('CADT:datalayer:writeService');
 
 const { USE_SIMULATOR, DATALAYER_FILE_SERVER_URL } = getConfig().APP;
 

diff --git a/src/models/organizations/organizations.model.js b/src/models/organizations/organizations.model.js
@@ -17,7 +17,7 @@ import { getDataModelVersion } from '../../utils/helpers';
 import { getConfig } from '../../utils/config-loader';
 const { USE_SIMULATOR } = getConfig().APP;
 
-logger.info('climate-warehouse:organizations');
+logger.info('CADT:organizations');
 
 import ModelTypes from './organizations.modeltypes.cjs';
 

diff --git a/src/server.js b/src/server.js
@@ -12,7 +12,7 @@ import dotenv from 'dotenv';
 
 dotenv.config();
 
-logger.info('climate-warehouse:server');
+logger.info('CADT:server');
 
 const port = getConfig().APP.CW_PORT || 3030;
 const server = http.createServer(rootRouter);

diff --git a/src/tasks/sync-audit-table.js b/src/tasks/sync-audit-table.js
@@ -12,7 +12,7 @@ import {
   assertWalletIsSynced,
 } from '../utils/data-assertions';
 
-logger.info('climate-warehouse:task:audit');
+logger.info('CADT:task:audit');
 
 dotenv.config();
 import { getConfig } from '../utils/config-loader';

diff --git a/src/tasks/sync-datalayer.js b/src/tasks/sync-datalayer.js
@@ -13,7 +13,7 @@ dotenv.config();
 import { getConfig } from '../utils/config-loader';
 const CONFIG = getConfig().APP;
 
-logger.info('climate-warehouse:task:sync-datalayer');
+logger.info('CADT:task:sync-datalayer');
 
 const spinner = new Spinner('Waiting for Updates %s');
 spinner.setSpinnerString('|/-\\');

diff --git a/src/tasks/sync-default-organizations.js b/src/tasks/sync-default-organizations.js
@@ -11,7 +11,7 @@ const CONFIG = getConfig().APP;
 import dotenv from 'dotenv';
 dotenv.config();
 
-logger.info('climate-warehouse:task:sync-default-organizations');
+logger.info('CADT:task:sync-default-organizations');
 
 const task = new Task('sync-default-organizations', async () => {
   try {

diff --git a/src/tasks/sync-governance-body.js b/src/tasks/sync-governance-body.js
@@ -14,7 +14,7 @@ const CONFIG = getConfig();
 import dotenv from 'dotenv';
 dotenv.config();
 
-logger.info('climate-warehouse:task:sync-governance');
+logger.info('CADT:task:sync-governance');
 
 const task = new Task('sync-governance-meta', async () => {
   try {

diff --git a/src/tasks/sync-organization-meta.js b/src/tasks/sync-organization-meta.js
@@ -12,7 +12,7 @@ const CONFIG = getConfig().APP;
 import dotenv from 'dotenv';
 dotenv.config();
 
-logger.info('climate-warehouse:task:sync-organizations');
+logger.info('CADT:task:sync-organizations');
 
 const task = new Task('sync-organization-meta', async () => {
   try {

diff --git a/src/tasks/sync-picklists.js b/src/tasks/sync-picklists.js
@@ -9,7 +9,7 @@ import { getConfig } from '../utils/config-loader';
 
 const CONFIG = getConfig().APP;
 
-logger.info('climate-warehouse:task:sync-picklists');
+logger.info('CADT:task:sync-picklists');
 
 const task = new Task('sync-picklist', async () => {
   try {

diff --git a/src/utils/config-loader.js b/src/utils/config-loader.js
@@ -6,7 +6,7 @@ import path from 'path';
 import { logger } from '../config/logger.cjs';
 
 import { getDataModelVersion } from './helpers';
-import defaultConfig from './defaultConfig.json';
+import { defaultConfig } from './defaultConfig.js';
 import { getChiaRoot } from './chia-root.js';
 
 export const getConfig = _.memoize(() => {

diff --git a/src/utils/defaultConfig.js b/src/utils/defaultConfig.js
@@ -0,0 +1,33 @@
+export const defaultConfig = {
+  MIRROR_DB: {
+    DB_USERNAME: null,
+    DB_PASSWORD: null,
+    DB_NAME: null,
+    DB_HOST: null,
+  },
+  APP: {
+    CW_PORT: 31310,
+    DATALAYER_URL: 'https://localhost:8562',
+    WALLET_URL: 'https://localhost:9256',
+    USE_SIMULATOR: false,
+    READ_ONLY: false,
+    CADT_API_KEY: null,
+    CHIA_NETWORK: 'mainnet',
+    USE_DEVELOPMENT_MODE: false,
+    IS_GOVERNANCE_BODY: false,
+    DEFAULT_FEE: 300000000,
+    DEFAULT_COIN_AMOUNT: 300000000,
+    DATALAYER_FILE_SERVER_URL: null,
+    TASKS: {
+      AUDIT_SYNC_TASK_INTERVAL: 30,
+      DATAMODEL_SYNC_TASK_INTERVAL: 60,
+      GOVERNANCE_SYNC_TASK_INTERVAL: 86400,
+      ORGANIZATION_META_SYNC_TASK_INTERVAL: 86400,
+      PICKLIST_SYNC_TASK_INTERVAL: 30,
+    },
+  },
+  GOVERNANCE: {
+    GOVERNANCE_BODY_ID:
+      '23f6498e015ebcd7190c97df30c032de8deb5c8934fc1caa928bc310e2b8a57e',
+  },
+};
diff --git a/src/utils/defaultConfig.json b/src/utils/defaultConfig.json