Merge branch '255-add-contract-tokens-version' into 'dev'

add tokensMap version and contract version to info controller and update log... Closes #255 See merge request ergo/rosen-bridge/watcher!302
rosen-bridge · Sep 24, 2024 · d02303c · d02303c
2 parents a673947 + d336cf2
commit d02303c
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 5 deletions.
diff --git a/.changeset/bright-zebras-visit.md b/.changeset/bright-zebras-visit.md
@@ -0,0 +1,5 @@
+---
+'@rosen-bridge/watcher': major
+---
+
+support contract and tokensMap version and update info controller for version configs
diff --git a/src/api/general.ts b/src/api/general.ts
@@ -11,7 +11,11 @@ import { ERGO_CHAIN_NAME, ERGO_NATIVE_ASSET } from '../config/constants';
 const logger = WinstonLogger.getInstance().getLogger(import.meta.url);
 
 interface GeneralInfo {
-  version: string;
+  versions: {
+    app: string;
+    contract: string;
+    tokensMap: string;
+  };
   currentBalance: bigint;
   network: string;
   permitsPerEvent: bigint;
@@ -42,7 +46,11 @@ generalRouter.get('/', async (req: Request, res: Response) => {
     const tokenMap = getConfig().token.tokenMap;
     const collateral = await Transaction.getInstance().getCollateral();
     const info: GeneralInfo = {
-      version: packageJson.version,
+      versions: {
+        app: packageJson.version,
+        contract: getConfig().rosen.contractVersion,
+        tokensMap: getConfig().token.version,
+      },
       currentBalance: tokenMap.wrapAmount(
         ERGO_NATIVE_ASSET,
         (await ErgoUtils.getWatcherBalance()).nanoErgs,

diff --git a/src/bootstrap.ts b/src/bootstrap.ts
@@ -7,4 +7,6 @@ WinstonLogger.init(getConfig().logger.transports);
 
 const logger = WinstonLogger.getInstance().getLogger(import.meta.url);
 
-logger.info(`Watcher Started with version ${packageJson.version}`);
+logger.info(`Watcher version: ${packageJson.version}`);
+logger.info(`Watcher contract version: ${getConfig().rosen.contractVersion}`);
+logger.info(`Watcher tokens version: ${getConfig().token.version}`);
diff --git a/src/config/rosenConfig.ts b/src/config/rosenConfig.ts
@@ -22,6 +22,7 @@ class RosenConfig {
   readonly emissionNFT: string;
   readonly emissionAddress: string;
   readonly eRSN: string;
+  readonly contractVersion: string;
 
   constructor(network: string, networkType: string, configRoot: string) {
     const rosenConfigPath = this.getAddress(network, networkType, configRoot);
@@ -52,6 +53,7 @@ class RosenConfig {
       this.emissionNFT = config.tokens.EmissionNFT;
       this.eRSN = config.tokens.ERSN;
       this.emissionAddress = config.addresses.Emission;
+      this.contractVersion = config.version;
     }
   }
 

diff --git a/src/config/tokensConfig.ts b/src/config/tokensConfig.ts
@@ -4,13 +4,16 @@ import { RosenTokens, TokenMap } from '@rosen-bridge/tokens';
 class TokensConfig {
   readonly tokens: RosenTokens;
   readonly tokenMap: TokenMap;
+  readonly version: string;
 
   constructor(tokensPath: string) {
     if (!fs.existsSync(tokensPath)) {
       throw new Error(`tokensMap file with path ${tokensPath} doesn't exist`);
     } else {
       const tokensJson: string = fs.readFileSync(tokensPath, 'utf8');
-      this.tokens = JSON.parse(tokensJson);
+      const tokens = JSON.parse(tokensJson);
+      this.tokens = tokens;
+      this.version = tokens.version;
       this.tokenMap = new TokenMap(this.tokens);
     }
   }

diff --git a/tests/config/contracts-ergo-mainnet.json b/tests/config/contracts-ergo-mainnet.json
@@ -1,4 +1,5 @@
 {
+  "version": "testVersion",
   "addresses": {
     "RWTRepo": "5qwczr7KdspMpxJYy77vzNv3a4qT2x1VuDj8u9y5ozV3AAQtESPpbsR1EMWATVDdj6jguyC8B8NmVzami197gVHH4dhLvzqTye236iqBf75rGzF6wykBFvhoR9ZAbbzo4nz9P76U66ShQiwP17LvKiQMtQbwnLjDUtb8YifJYgAU6DEDm66RMKqisuFgxJ5D4y2LxiMLyKWPaHBdccEKqDYeTwhiPqwkhhsU5MsTKkoS43jK6s7xCFtFDxYFN3WCpaP2qffQqKvdFxaPp91UwHSBLzfRQsjq5hiMj7XnqKR2yUKdgEaY5VHLGY4opjgqnzPVBH28U3K6xpMxNgtg2W3siLLXqehST1YbAAx5rqyWgFhoKELWvoWaEDFUg1wQVLxteUJnNaLxEms2ZQnrRph5FVPAk9tfDhhsGzFMaGZzzuykWnEjGWYhKZxNMWJ4wyLijN1s2AoMj163G86fyZgN578ojpJZWRoT1ZBuPszoiFchP8Nko69cDjsPrbyiEr3iv78d3hkAGZEswFqnGkAXa7pdqUzDGCHteau9NFFMXvf5VhVwpVGwXHXXJFZC738AjC6W7GrGyMb9iDDtEWZ9xUnviCW8pVXHvB9enJ3TdsCYYwiUuCLWDbAkwmDDiQ9bWgY4evWWkpHzBZL8h4McUp8GFmUgwG4Y9bR57exyDNKDXMo2KzumNf9h18w8FeLk9R5F6zvqBwevcGWmzkrCAbeLs1btUhjZ5BoXeCAzBaT6eTMpRenffe3mEEW3h2EPgTuacZ4GKZ5mu8MLZxMFNo9PBEncekcBt5UetijiHuwQgy9Limg19xUSYRKmZyU9wfSHswEBGvRZczSXSPsopLb9B9srsZMHCPUxapmNxtXZP2kRQSxbnQV7QdVRD2C6PiyMKKqQGnk77SNpQsJ6VesqqRoJncxiz6GGVs1R4Kt4zwrZVFSjyGDXZoooFzFieUB6SLwWmCFyo3nF4SfWDhfPWQhdjycWbmMRUTPt9iuwGedDYBzfZnjLFSbiNJwYSZqv9UidfQMv8KmM9R4uaenFGJK5ct6Vt9Bnny7Br1KHJL9CDv1iKDtJMZyQXzUWYAn9MpCiGam7GDt6jJcRN8P68ssxd8dzSHTQNkM8TQfaxpXdMgx8G6RsQWQSjcraHKQmPG4kgcWAV9DJKQFUUTGfnEMbwkp7UCuU38j3hMaDMX6uxV6bXnVUexs4CwhkcpUvp6Znve6qhE2Fj183DuVrPnyEyZ69wVaDUyFURhSy6vzbNAp1rCKn26X8VGjiPSsm3VBQQXXmgWkc9NN5xijjh6hP4XJw3dsUqowP3FrEbokk5u3AzqQege1F6C3SqtyjmwyCwEurYafxqmyad9S2x9tXis1TyDo2KKG4vAWixgGfHLevhZGiPpUfFpsS23iyLxDt6diPdfDp",
     "WatcherPermit": "FxMs5S8B9DA3Ecw7taWSSRiaDkbYxxqsrwQKJVyJAbe7tBqLU4j3ry1En9AHn2d2XWEyj46FTHXM3RwxpLztvSJVQt76JY5jq3MF8TA9aWp2i134zDM8mm3zXH5RJXvRi7uit4QLHXhXvMp66fj9UaeK2UQSBVGXQbPKm9KkCCaVX66tLbJ3FFo58atK8VTvpFUfCPjLFn8U9sukxvfrVQwFFXSG753VLKFLzw614gmBrZFg6recogxyxuRSjCa42baii5i3cKTmwSARD38kFB1mftWGTUPRbV6kq3cz17CUtbCun6zKVFDqAMAKttEfbzknafAnudYVs1ijdc5kvAjDyWRaYVbjQt43oHhFGFpUrP9gae5HqrVpEJvcE551iV4L2yRfy35FdvPSTevkweANuZE58GA8i684FTQi7yWgRXRyaRsro4zXoXpgoizUJBCy76QUm27FN7bpHTH6GHRs3PW4x59Pu1BcdBMKz3yixyYK5eoxDau22a12bT",

diff --git a/tests/config/tokens.test.json b/tests/config/tokens.test.json
@@ -1,4 +1,5 @@
 {
+  "version": "testVersion",
   "idKeys": {
     "ergo": "tokenId",
     "cardano": "tokenId"

diff --git a/tests/database/mockedData.ts b/tests/database/mockedData.ts
@@ -17,6 +17,7 @@ import { TokenEntity } from '../../src/database/entities/tokenEntity';
 import { RevenueEntity } from '../../src/database/entities/revenueEntity';
 import { firstPermit, secondPermit } from '../ergo/statistics/mockUtils';
 import packageJson from '../../package.json' assert { type: 'json' };
+import { getConfig } from '../../src/config/config';
 
 export const ergoBlockEntity = new BlockEntity();
 ergoBlockEntity.scanner = Constants.ERGO_CHAIN_NAME;
@@ -718,7 +719,11 @@ export const permitMockRWT =
   '8e5b02ba729ad364867619d2a8b9ff1438190c14979a12aa0a249e996194f074';
 
 export const generalInfo = {
-  version: packageJson.version,
+  versions: {
+    app: packageJson.version,
+    contract: getConfig().rosen.contractVersion,
+    tokensMap: getConfig().token.version,
+  },
   currentBalance: 1100000,
   network: 'ergo',
   permitsPerEvent: 10000,