Merge pull request #220 from lidofinance/develop

Release 3.1.0

.github/workflows/tests_and_checks.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Run tests
         run: yarn test
       - name: Run e2e transports
-        run: docker-compose -f docker-compose.test.yml up -d
+        run: docker compose -f docker-compose.test.yml up -d
       - name: Run e2e tests
         run: yarn test:e2e
         env:

.gitignore

@@ -52,3 +52,6 @@ lerna-debug.log*
 
 # Ansible
 /ansible
+
+leveldb-spec
+leveldb-cache

Dockerfile

@@ -2,7 +2,7 @@ FROM node:14.18.1-alpine3.13 as building
 
 # needed for git dependencies
 RUN apk update && apk upgrade && \
-    apk add --no-cache bash=5.1.16-r0 git=2.30.6-r0 openssh=8.4_p1-r4
+    apk add --no-cache bash=5.1.16-r0 git=2.30.6-r0 openssh=8.4_p1-r4 python3=3.8.15-r0 make=4.3-r0 g++=10.2.1_pre1-r3
 
 RUN mkdir /council
 
@@ -13,10 +13,9 @@ RUN npm i -g [email protected]
 
 COPY ./package*.json ./
 COPY ./yarn*.lock ./
-RUN yarn install --frozen-lockfile --non-interactive && yarn cache clean
-
 COPY ./tsconfig*.json ./
 COPY ./src ./src
+RUN yarn install --frozen-lockfile --non-interactive && yarn cache clean
 
 RUN yarn typechain && yarn build
 

docker-compose.test.yml

@@ -2,22 +2,34 @@ version: '3.7'
 
 services:
   zookeeper:
-    image: wurstmeister/zookeeper
+    image: confluentinc/cp-zookeeper
+    hostname: zookeeper
+    container_name: zookeeper
     ports:
       - "2181:2181"
+    environment:
+      ZOOKEEPER_SERVER_ID: 1
+      ZOOKEEPER_CLIENT_PORT: 2181
+      ZOOKEEPER_TICK_TIME: 2000
+      ZOOKEEPER_INIT_LIMIT: 5
+      ZOOKEEPER_SYNC_LIMIT: 2
+      ZOOKEEPER_SERVERS: server.1=zookeeper:2888:3888
 
   kafka:
-    image: wurstmeister/kafka:2.13-2.7.1
+    image: confluentinc/cp-kafka
+    hostname: localhost
+    container_name: kafka
     ports:
       - "9092:9092"
-    links:
-      - zookeeper
     environment:
+      KAFKA_BROKER_ID: 1
       KAFKA_ADVERTISED_HOST_NAME: 127.0.0.1
-      KAFKA_CREATE_TOPICS: "test:1:1"
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
+      KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://127.0.0.1:9092"
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
       KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
-      KAFKA_MESSAGE_MAX_BYTES: 2000000
+      KAFKA_CREATE_TOPICS: "test:1:1"
+      KAFKA_CFG_ZOOKEEPER_CONNECT: zookeeper:2181
     depends_on:
       - zookeeper
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lido-council-daemon",
-  "version": "2.1.1",
+  "version": "3.0.2",
   "description": "Lido Council Daemon",
   "author": "Lido team",
   "private": true,
@@ -31,7 +31,7 @@
   "dependencies": {
     "@chainsafe/blst": "^0.2.4",
     "@chainsafe/ssz": "^0.9.2",
-    "@ethersproject/providers": "^5.4.5",
+    "@ethersproject/providers": "5.7.2",
     "@lido-nestjs/fetch": "^1.3.1",
     "@lido-nestjs/key-validation": "^7.4.0",
     "@lido-nestjs/middleware": "^1.1.1",
@@ -48,9 +48,10 @@
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
     "compare-versions": "^6.1.0",
-    "ethers": "^5.4.7",
+    "ethers": "5.7.2",
     "glob": "^7.1.2",
     "kafkajs": "^1.15.0",
+    "level": "^8.0.1",
     "lru-cache": "^9.1.1",
     "nest-winston": "^1.6.1",
     "node-abort-controller": "^3.0.1",
@@ -79,7 +80,7 @@
     "eslint": "^7.30.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.0",
-    "ganache": "7.7.5",
+    "ganache": "7.9.0",
     "jest": "^27.0.6",
     "prettier": "^2.3.2",
     "supertest": "^6.1.3",