Merge pull request #339 from skalenetwork/beta

2.2 stable (2.3 release)

.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
     if: github.event.pull_request.merged
     env:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
@@ -22,10 +22,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
-    - name: Set up Python 3.8
+    - name: Set up Python 3.11
       uses: actions/setup-python@v1
       with:
-        python-version: 3.8
+        python-version: 3.11
         # - name: Checkout submodules
         #   uses: textbook/git-checkout-submodule-action@master
         #   with:

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     env:
       ETH_PRIVATE_KEY: ${{ secrets.ETH_PRIVATE_KEY }}
@@ -33,6 +33,7 @@ jobs:
         pip install -r requirements.txt
         pip install -r requirements-dev.txt
         pip install codecov 
+
     - name: Lint with flake8
       run: flake8 .
 

.gitignore

@@ -135,12 +135,12 @@ test_abi.json
 unique.json
 manager.json
 
-# hardhat-node
-hardhat-node/node_modules
-hardhat-node/.env
-hardhat-node/coverage
-hardhat-node/coverage.json
-hardhat-node/typechain
-hardhat-node/cache
-hardhat-node/artifacts
-hardhat-node/abi.json
+# contract-sample
+tests/tester-contract/node_modules
+tests/tester-contract/.env
+tests/tester-contract/coverage
+tests/tester-contract/coverage.json
+tests/tester-contract/typechain
+tests/tester-contract/cache
+tests/tester-contract/artifacts
+tests/tester-contract/abi.json

.gitmodules

@@ -1,4 +1,8 @@
 [submodule "helper-scripts"]
 	path = helper-scripts
 	url = https://github.com/skalenetwork/helper-scripts.git
-	branch = develop
+    branch = develop
+
+[submodule "hardhat-node"]
+	path = hardhat-node
+	url = https://github.com/skalenetwork/hardhat-node.git

Dockerfile

@@ -1,6 +1,6 @@
-FROM python:3.8-buster
+FROM python:3.11-bookworm
 
-RUN apt update && apt install build-essential python-dev libssl-dev swig --yes 
+RUN apt update && apt install build-essential libssl-dev swig --yes
 
 RUN mkdir app
 WORKDIR /app

VERSION

@@ -1 +1 @@
-2.1.5
+2.2.0

requirements-dev.txt

@@ -1,5 +1,9 @@
-flake8==3.8.2
-mock==4.0.2
-mypy==0.790
-pytest==6.0.1
-pytest-cov==2.8.1
+flake8==6.1.0
+
+# mypy
+mypy==1.7.1
+types-redis==4.6.0.11
+
+# pytest
+pytest==7.4.3
+pytest-cov==4.1.0

requirements.txt

@@ -1 +1 @@
-skale.py==6.0dev0
+skale.py==6.2b0

scripts/run-test-containers.sh

@@ -54,7 +54,7 @@ gen_sgx_key() {
 }
 
 deploy_test_contract() {
-    cd hardhat-node
+    cd tests/tester-contract/
     yarn install
     npx hardhat run --network localhost scripts/deploy.ts
     cd -
@@ -65,12 +65,12 @@ cleanup_skale_dir
 cleanup_redis_dir
 create_skale_dir
 create_redis_dir
-build tm hnode
+build tm
 
 if [ -z ${SGX_URL} ]; then
-    run_containers tm hnode redis
+    run_containers tm redis hnode
 else
-    run_containers sgx tm hnode redis
+    run_containers sgx tm redis hnode
     gen_sgx_key
 fi
 

tests/attempt/v2_test.py

@@ -1,5 +1,5 @@
 import pytest
-from mock import Mock
+from unittest.mock import Mock
 from skale.utils.account_tools import send_eth
 
 from transaction_manager.attempt_manager.base import NoCurrentAttemptError

tests/processor_test.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import pytest
 
 from transaction_manager.config import MAX_RESUBMIT_AMOUNT

hardhat-node/hardhat.config.ts → tests/tester-contract/hardhat.config.ts

@@ -32,8 +32,6 @@ function getAccounts() {
     return accounts;
 }
 
-// This is a sample Hardhat task. To learn how to create your own go to
-// https://hardhat.org/guides/create-task.html
 task("accounts", "Prints the list of accounts", async (taskArgs, hre) => {
   const accounts = await hre.ethers.getSigners();
 
@@ -42,9 +40,6 @@ task("accounts", "Prints the list of accounts", async (taskArgs, hre) => {
   }
 });
 
-// You need to export an object to set up your config
-// Go to https://hardhat.org/config/ to learn more
-
 const config: HardhatUserConfig = {
   solidity: "0.8.4",
   networks: {