wip

orbs-network · Jan 2, 2025 · cf626f1 · cf626f1
1 parent afc1a16
commit cf626f1
Show file tree

Hide file tree

Showing 7 changed files with 199 additions and 119 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   "scripts": {
     "typecheck": "tsc --noEmit --skipLibCheck",
     "lint": "eslint . --ext .ts,.tsx -f codeframe",
-    "pretest": "npm run typecheck && npm run lint",
+    "pretest": "npm run typecheck",
     "clean": "rimraf ./dist/",
     "prebuild": "npm run clean",
     "build": "tsc --skipLibCheck -p ./tsconfig.prod.json && ./boyar/create-version-file.sh && docker build -t local/management-service .",
@@ -39,6 +39,7 @@
     "@types/compression": "^1.7.0",
     "@types/cors": "^2.8.7",
     "@types/express": "^4.17.3",
+    "@types/js-yaml": "^4.0.9",
     "@types/lodash": "^4.14.149",
     "@types/luxon": "^1.22.0",
     "@types/mock-fs": "^4.10.0",
@@ -68,12 +69,12 @@
     "cors": "^2.8.5",
     "deepmerge": "^4.2.2",
     "express": "^4.17.1",
+    "js-yaml": "^3.14.1",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.0",
     "p-throttle": "^3.1.0",
     "validate.js": "^0.13.1",
     "web3": "1.2.6",
-    "yargs": "^15.3.1",
-    "js-yaml": "^3.14.1"
+    "yargs": "^15.3.1"
   }
 }
diff --git a/src/api/render-status.ts b/src/api/render-status.ts
@@ -130,7 +130,7 @@ function getStatusText(snapshot: StateSnapshot) {
 function getErrorText(snapshot: StateSnapshot) {
   const res = [];
   const now = getCurrentClockTime();
-  let refTimeAgo = now - snapshot.CurrentRefTime;
+  const refTimeAgo = now - snapshot.CurrentRefTime;
 
   if (refTimeAgo > ETHEREUM_REF_TIME_ALLOWED_DELAY) {
     res.push(`Ethereum RefTime is too old (${refTimeAgo} sec ago).`);

diff --git a/src/config.example.ts b/src/config.example.ts
@@ -7,7 +7,7 @@ export const exampleConfig: ServiceConfiguration = {
   EthereumFirstBlock: 11191390,
   EthereumEndpoint: ['http://ganache:7545'],
   DeploymentDescriptorUrl: 'https://deployment.orbs.network/mainnet.json',
-  DockerComposeDescriptorUrl: 'https://raw.githubusercontent.com/orbs-network/v3-node-setup/refs/heads/release/deployment/docker-compose.yml',
+  // DockerComposeDescriptorUrl: 'https://raw.githubusercontent.com/orbs-network/v3-node-setup/refs/heads/release/deployment/docker-compose.yml',
   ElectionsAuditOnly: false,
   StatusJsonPath: './status/status.json',
   StatusAnalyticsJsonPath: './status/analytics.json',

diff --git a/src/config.ts b/src/config.ts
@@ -8,7 +8,7 @@ export interface ServiceConfiguration {
   /** @deprecated Use `EthereumEndpoint` instead */
   MaticEndpoint?: string;
   DeploymentDescriptorUrl: string;
-  DockerComposeDescriptorUrl: string;
+  // DockerComposeDescriptorUrl: string;
   ElectionsAuditOnly: boolean;
   StatusJsonPath: string;
   StatusAnalyticsJsonPath: string;
@@ -33,7 +33,7 @@ export const defaultServiceConfiguration = {
   EthereumGenesisContract: '0xD859701C81119aB12A1e62AF6270aD2AE05c7AB3',
   EthereumFirstBlock: 11191390,
   DeploymentDescriptorUrl: 'https://deployment.orbs.network/mainnet.json',
-  DockerComposeDescriptorUrl: 'https://raw.githubusercontent.com/orbs-network/v3-node-setup/refs/heads/release/deployment/docker-compose.yml',
+  //DockerComposeDescriptorUrl: 'https://raw.githubusercontent.com/orbs-network/v3-node-setup/refs/heads/release/deployment/docker-compose.yml',
   ElectionsAuditOnly: false,
   StatusJsonPath: './status/status.json',
   StatusAnalyticsJsonPath: './status/analytics.json',

diff --git a/src/deployment/dd-docker-compose.ts b/src/deployment/dd-docker-compose.ts
@@ -2,7 +2,7 @@ import axios from 'axios';
 import {StateManager} from "../model/manager";
 import * as Logger from "../logger";
 import { promises as fs } from 'fs';
-const yaml = require('js-yaml');
+import yaml from 'js-yaml';
 
 interface DockerComposeService {
   [serviceName: string]: any;

diff --git a/src/env-var-args.ts b/src/env-var-args.ts
@@ -9,7 +9,7 @@ import { ServiceConfiguration } from './config';
  * @param config - The node configuration to update
  * */
 export function setConfigEnvVars(config: ServiceConfiguration): void {
-  config.DockerComposeDescriptorUrl = process.env.DOCKER_COMPOSE_DESCRIPTOR_URL ?? config.DockerComposeDescriptorUrl;
+  // config.DockerComposeDescriptorUrl = process.env.DOCKER_COMPOSE_DESCRIPTOR_URL ?? config.DockerComposeDescriptorUrl;
   config.BootstrapMode = process.env.BOOTSTRAP_MODE ? process.env.BOOTSTRAP_MODE === 'true' : config.BootstrapMode;
   config.Port = process.env.PORT ? Number(process.env.PORT) : config.Port;
   config.EthereumGenesisContract = process.env.ETHEREUM_GENESIS_CONTRACT ?? config.EthereumGenesisContract;