Merge pull request #316 from lidofinance/develop

Release 2.2.1

Author: Amuhar

.github/workflows/ci-dev-holesky.yml

@@ -0,0 +1,29 @@
+name: CI Dev Holesky
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - holesky
+    paths-ignore:
+      - ".github/**"
+
+permissions: {}
+
+jobs:
+  # test:
+  #   ...
+
+  deploy:
+    runs-on: ubuntu-latest
+    # needs: test
+    name: Build and deploy
+    steps:
+      - name: Testnet deploy
+        uses: lidofinance/dispatch-workflow@v1
+        env:
+          APP_ID: ${{ secrets.APP_ID }}
+          APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+          TARGET_REPO: "lidofinance/infra-mainnet"
+          TARGET_WORKFLOW: "deploy_holesky_testnet_lido_keys_api.yaml"
+          TARGET: "holesky"

.github/workflows/ci-dev.yml

@@ -1,4 +1,4 @@
-name: CI Dev Holesky
+name: CI Dev Hoodi
 
 on:
   workflow_dispatch:
@@ -25,5 +25,5 @@ jobs:
           APP_ID: ${{ secrets.APP_ID }}
           APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
           TARGET_REPO: "lidofinance/infra-mainnet"
-          TARGET_WORKFLOW: "deploy_holesky_testnet_lido_keys_api.yaml"
+          TARGET_WORKFLOW: "deploy_hoodi_testnet_lido_keys_api.yaml"
           TARGET: "develop"

.github/workflows/test.yml

@@ -41,7 +41,6 @@ jobs:
           PROVIDERS_URLS: ${{ secrets.PROVIDERS_URLS }}
           CL_API_URLS: "https://e2e-test.lido.fi,"
           CHAIN_ID: ${{ secrets.CHAIN_ID }}
-          CHRONIX_PROVIDER_MAINNET_URL: ${{ secrets.CHRONIX_PROVIDER_MAINNET_URL }}
           DB_NAME: node_operator_keys_service_db
           DB_PORT: 5432
           DB_HOST: localhost

README.md

@@ -83,23 +83,6 @@ Check `sample.env` file.
 
 Pay attention that API by default running job for fetching and updating Validators. If you are not planning to use `validators` endpoints, you could disable this job by setting `VALIDATOR_REGISTRY_ENABLE=false`.
 
-## Run KAPI on fork
-
-For running KAPI on fork setup environment variables:
-
-```
-CHAIN_ID=1
-CHRONIX_PROVIDER_MAINNET_URL=YOUR-MAINNET-PROVIDER
-CHRONIX_SESSION_PORT=8002
-PROVIDERS_URLS = http://127.0.0.1:8002
-```
-
-1. Run chronix `yarn chronix:start`
-2. Init chronix: `yarn fork:init`
-3. Start kapi: yarn start:dev
-
-Keep in mind `PROVIDERS_URLS` should contain chronix session url.
-
 ## Benchmarks
 
 This part of document outlines running benchmarks and collecting Prometheus metrics using K6.

jest-e2e-onchain.json

@@ -1,6 +1,6 @@
 {
   "name": "lido-keys-api",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Lido Node Operators keys service",
   "author": "Lido team",
   "private": true,
@@ -34,21 +34,17 @@
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "mikro-orm schema:drop -r && mikro-orm migration:up && jest -i --config jest-e2e.json && chronix compile && chronix test",
-    "test:e2e:debug": "mikro-orm schema:drop -r && mikro-orm migration:up && node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest -i --config jest-e2e.json && chronix compile && chronix test",
+    "test:e2e": "mikro-orm schema:drop -r && mikro-orm migration:up && jest -i --config jest-e2e.json",
+    "test:e2e:debug": "mikro-orm schema:drop -r && mikro-orm migration:up && node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest -i --config jest-e2e.json",
     "test:e2e:docker": "docker-compose -f docker-compose.e2e.yml up --build --abort-on-container-exit",
     "typechain": "typechain --target=ethers-v5 --out-dir ./src/generated ./src/staking-router-modules/contracts/abi/*.json",
-    "chronix:compile": "chronix compile",
-    "chronix:test": "chronix test",
     "test:alerts": "promtool test rules alerts/*.test.yml",
-    "chronix:start": "chronix start",
-    "fork:init": "node chronix-init",
     "prepare:csm": "node scripts/prepare-csm-abi.js"
   },
   "dependencies": {
     "@lido-nestjs/consensus": "^1.5.0",
-    "@lido-nestjs/constants": "^5.2.1",
-    "@lido-nestjs/contracts": "^9.5.1",
+    "@lido-nestjs/constants": "5.3.0",
+    "@lido-nestjs/contracts": "9.7.0",
     "@lido-nestjs/execution": "^1.11.0",
     "@lido-nestjs/fetch": "^1.4.0",
     "@lido-nestjs/logger": "^1.3.2",
@@ -95,7 +91,6 @@
     "@types/supertest": "^2.0.11",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
-    "chronix": "0.0.9",
     "eslint": "^8.7.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
@@ -108,5 +103,6 @@
     "ts-node": "^10.4.0",
     "tsconfig-paths": "^3.12.0",
     "typescript": "^4.5.5"
-  }
+  },
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

package.json

@@ -22,8 +22,6 @@ LOG_LEVEL=debug
 # Log format: simple or json
 LOG_FORMAT=json
 PROVIDERS_URLS=https://mainnet.infura.io/v3/XXX,https://eth-mainnet.alchemyapi.io/v2/YYY
-# provider url for e2e tests
-CHRONIX_PROVIDER_MAINNET_URL=https://mainnet.infura.io/v3/XXX,https://eth-mainnet.alchemyapi.io/v2/YYY
 # chain id
 # for mainnet 1
 # for testnet 5