Merge pull request #1722 from skalenetwork/v2.2.0

Release 2.2.0

proxy/.eslintrc.cjs → .eslintrc.cjs

@@ -11,6 +11,8 @@ module.exports = {
 
     },
     ignorePatterns: [
-
+        "coverage/**",
+        "typechain-types/**",
+        "**/venv/**"
     ]
   };

.githooks/commit-msg

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+if [[ $(npx cspell -- --no-summary $1 2> /dev/null) ]]
+then
+    echo "It looks like you have spell-checking errors in your commit message."
+    npx cspell -- --no-summary $1
+    exit 1
+fi

.githooks/pre-commit

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# cSpell:words gpgsign
+
+set -e
+
+GPG_SIGN_ENABLED=$(git config commit.gpgsign || true)
+if ! [[ "$GPG_SIGN_ENABLED" == "true" ]]
+then
+    echo "Enable GPG signature for new commits";
+    exit 1;
+fi
+
+files=$(git diff --cached --name-only)
+npx cspell -- --no-summary $files
+
+yarn fullCheck

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+* @DimaStebaev @DmytroNazarenko
+*.md @skalenetwork/docowners

.github/dependabot.yml

@@ -1,9 +1,11 @@
 version: 2
 updates:
-- package-ecosystem: npm
-  directory: "/proxy"
-  schedule:
-    interval: "weekly"
-    day: "saturday"
-  allow: 
-    - dependency-type: "production"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "pip"
+    directory: "/scripts/"
+    schedule:
+      interval: "weekly"

.github/workflows/issue_check.yml

@@ -6,6 +6,7 @@ on:
 jobs:
   check-linked-issues:
     name: Check if pull request has linked issues
+    if:  ${{ !startsWith(github.head_ref, 'dependabot/') }}
     runs-on: ubuntu-latest
     steps:
       - name: Get issues
@@ -15,5 +16,5 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
       - name: PR has not linked issues
         if: join(steps.get-issues.outputs.issues) == ''
-        run: 
+        run:
           exit 1

.github/workflows/publish.yml

@@ -1,4 +1,6 @@
-name: Build and publish
+name: publish
+
+# cspell:words PYPI_TOKEN ncipollo
 
 on:
   pull_request:
@@ -26,10 +28,6 @@ jobs:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
-    defaults:
-      run:
-        working-directory: proxy
-
     outputs:
       version: ${{ steps.version.outputs.version }}
 
@@ -39,16 +37,17 @@ jobs:
           submodules: recursive
 
     - name: Install NODE JS
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ env.PYTHON_VERSION }}
         cache: 'pip'
+        cache-dependency-path: predeployed/test/requirements.txt
 
     - name: Prepare for pip package building
       run: |
@@ -60,7 +59,6 @@ jobs:
 
     - name: Calculate version
       id: version
-      working-directory: ./
       run: |
         export BRANCH=${GITHUB_REF##*/}
         echo "Branch $BRANCH"
@@ -93,7 +91,7 @@ jobs:
       run: npx hardhat run scripts/generateAbi.ts
 
     - name: Generate predeployed ABIs
-      working-directory: proxy/predeployed
+      working-directory: predeployed
       env:
         VERSION: ${{ env.VERSION }}
       run: |
@@ -107,20 +105,20 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: data
-        path: proxy/data
+        path: data
 
     - name: Create Release
       uses: ncipollo/release-action@v1
       with:
         tag: ${{ env.VERSION }}
+        commit: ${{ github.sha }}
         prerelease: ${{ env.PRERELEASE }}
-        artifacts: "proxy/predeployed/dist/*,\
-                    proxy/predeployed/data/*,\
-                    proxy/data/ima-schain-*-manifest.json,\
-                    proxy/data/*-abi.json"
+        artifacts: "predeployed/dist/*,\
+                    predeployed/data/*,\
+                    data/ima-schain-*-manifest.json,\
+                    data/*-abi.json"
 
     - name: Build and publish image
-      working-directory: ./
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}

.github/workflows/main.yml → .github/workflows/test.yml

@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: Build and test
+name: test
 
 on:
   push:
@@ -19,23 +19,20 @@ jobs:
   test-contracts:
     runs-on: ubuntu-latest
 
-    defaults:
-      run:
-        working-directory: proxy
-
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
 
     - name: Install PYTHON
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ env.PYTHON_VERSION }}
         cache: 'pip'
+        cache-dependency-path: scripts/requirements.txt
 
     - name: Install NODE JS
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'
@@ -80,31 +77,28 @@ jobs:
   test-predeployed:
     runs-on: ubuntu-latest
 
-    defaults:
-      run:
-        working-directory: proxy
-
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
 
     - name: Install PYTHON
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ env.PYTHON_VERSION }}
         cache: 'pip'
+        cache-dependency-path: predeployed/test/requirements.txt
 
     - name: Install NODE JS
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'
 
     - name: Install project
       run: |
         yarn install
-        npm run compile
+        yarn compile
 
     - name: Install python testing staff
       run: pip3 install -r predeployed/test/requirements.txt

.gitignore

@@ -1,20 +1,22 @@
 # artifacts
-proxy/artifacts/
+artifacts/
 test-tokens/artifacts/
-proxy/cache/
+cache/
 test-tokens/cache/
-proxy/typechain
+typechain
 test-tokens/typechain
 
 # openzeppelin
-proxy/.openzeppelin/dev-*.json
-proxy/.openzeppelin/unknown-*.json
-proxy/.openzeppelin/.session
+.openzeppelin/dev-*.json
+.openzeppelin/unknown-*.json
+.openzeppelin/.session
+.openzeppelin/holesky.json
+.openzeppelin/sepolia.json
 
 # predeployed generator artificats
-proxy/predeployed/test/additional.json
-proxy/predeployed/version.txt
-proxy/data/proxySchain_Bob.json.saved_copy
+predeployed/test/additional.json
+predeployed/version.txt
+data/proxySchain_Bob.json.saved_copy
 
 # idea
 .DS_Store
@@ -34,25 +36,24 @@ pids
 *.pid.lock
 
 # Coverage directory used by tools like istanbul
-proxy/coverageEnv
-proxy/coverage/
-proxy/coverage.json
+coverageEnv
+coverage/
+coverage.json
 
 # tmp file after precompiled contracts generation
-proxy/data/precompiled.json.file
+data/precompiled.json.file
 
-proxy/predeployed/build
-proxy/predeployed/dist
-proxy/predeployed/src/ima_predeployed/artifacts
+predeployed/build
+predeployed/dist
+predeployed/src/ima_predeployed/artifacts
 *.egg-info
-proxy/predeployed/test/genesis.json
+predeployed/test/genesis.json
 
 # nyc test coverage
 .nyc_output
 
 # Dependency directories
 node_modules
-proxy/node_modules
 test/node_modules
 test-tokens/node_modules
 
@@ -84,8 +85,8 @@ wallet*.json
 __pycache__/
 **/*.bak
 
-proxy/proxy.json
-proxy/data/*.json
+proxy.json
+data/*.json
 test-tokens/data/*.json
 ima_data.json
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "dictionary"]
+	path = dictionary
+	url = https://github.com/skalenetwork/dictionary.git

Dockerfile

@@ -3,7 +3,7 @@ FROM node:18
 RUN mkdir /app
 
 COPY VERSION /app
-COPY proxy /app
+COPY ./ /app
 
 WORKDIR /app