IMA contracts

.github/workflows/test.yml

@@ -28,83 +28,83 @@ jobs:
     - name: Lint with flake8
       run: flake8 .
 
-    - name: Launch hardhat node
-      working-directory: hardhat-node
-      run: |
-        docker-compose up -d && sleep 20
-
-    - name: Deploy manager
-      run: |
-        bash ./helper-scripts/deploy_test_manager.sh
-        docker rmi -f skalenetwork/skale-manager:${{ env.MANAGER_TAG }}
-
-    - name: Show stats before tests
-      if: always()
-      run: |
-        sudo lsblk -f
-        sudo free -h
-
-    - name: Run tests
-      run: |
-        bash ./scripts/run_manager_tests.sh
-    - name: Codecov
-      run: |
-        codecov -t $CODECOV_TOKEN
-
-    - name: Show stats after tests
-      if: always()
-      run: |
-        sudo lsblk -f
-        sudo free -h
-
-  test_allocator:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        python-version: [3.11]
-    env:
-      ENDPOINT: ${{ secrets.ENDPOINT }}
-      ETH_PRIVATE_KEY: ${{ secrets.ETH_PRIVATE_KEY }}
-      MANAGER_TAG: "1.9.0-develop.20"
-      ALLOCATOR_TAG: "2.2.2-develop.0"
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        cache: 'pip'
-        python-version: ${{ matrix.python-version }}
-
-    - name: Install host dependencies
-      run: bash ./scripts/install_host_dependencies.sh
-
-    - name: Install python dependencies
-      run: bash ./scripts/install_python_dependencies.sh
-
-    - name: Launch hardhat node
-      working-directory: hardhat-node
-      run: |
-        docker-compose up -d && sleep 20
-
-    - name: Deploy manager contracts
-      run: |
-        bash ./helper-scripts/deploy_test_manager.sh
-        docker rmi -f skalenetwork/skale-manager:${{ env.MANAGER_TAG }}
-
-    - name: Deploy allocator contracts
-      run: |
-        bash ./helper-scripts/deploy_test_allocator.sh
-        docker rmi -f skalenetwork/skale-allocator:${{ env.ALLOCATOR_TAG }}
-
-    - name: Run tests
-      run: |
-        bash ./scripts/run_allocator_tests.sh
-
-    - name: Show stats after tests
-      if: always()
-      run: |
-        sudo lsblk -f
-        sudo free -h
+  #   - name: Launch hardhat node
+  #     working-directory: hardhat-node
+  #     run: |
+  #       docker-compose up -d && sleep 20
+
+  #   - name: Deploy manager
+  #     run: |
+  #       bash ./helper-scripts/deploy_test_manager.sh
+  #       docker rmi -f skalenetwork/skale-manager:${{ env.MANAGER_TAG }}
+
+  #   - name: Show stats before tests
+  #     if: always()
+  #     run: |
+  #       sudo lsblk -f
+  #       sudo free -h
+
+  #   - name: Run tests
+  #     run: |
+  #       bash ./scripts/run_manager_tests.sh
+  #   - name: Codecov
+  #     run: |
+  #       codecov -t $CODECOV_TOKEN
+
+  #   - name: Show stats after tests
+  #     if: always()
+  #     run: |
+  #       sudo lsblk -f
+  #       sudo free -h
+
+  # test_allocator:
+  #   runs-on: ubuntu-20.04
+  #   strategy:
+  #     matrix:
+  #       python-version: [3.11]
+  #   env:
+  #     ENDPOINT: ${{ secrets.ENDPOINT }}
+  #     ETH_PRIVATE_KEY: ${{ secrets.ETH_PRIVATE_KEY }}
+  #     MANAGER_TAG: "1.9.0-develop.20"
+  #     ALLOCATOR_TAG: "2.2.2-develop.0"
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #     with:
+  #       submodules: true
+
+  #   - name: Set up Python ${{ matrix.python-version }}
+  #     uses: actions/setup-python@v4
+  #     with:
+  #       cache: 'pip'
+  #       python-version: ${{ matrix.python-version }}
+
+  #   - name: Install host dependencies
+  #     run: bash ./scripts/install_host_dependencies.sh
+
+  #   - name: Install python dependencies
+  #     run: bash ./scripts/install_python_dependencies.sh
+
+  #   - name: Launch hardhat node
+  #     working-directory: hardhat-node
+  #     run: |
+  #       docker-compose up -d && sleep 20
+
+  #   - name: Deploy manager contracts
+  #     run: |
+  #       bash ./helper-scripts/deploy_test_manager.sh
+  #       docker rmi -f skalenetwork/skale-manager:${{ env.MANAGER_TAG }}
+
+  #   - name: Deploy allocator contracts
+  #     run: |
+  #       bash ./helper-scripts/deploy_test_allocator.sh
+  #       docker rmi -f skalenetwork/skale-allocator:${{ env.ALLOCATOR_TAG }}
+
+  #   - name: Run tests
+  #     run: |
+  #       bash ./scripts/run_allocator_tests.sh
+
+  #   - name: Show stats after tests
+  #     if: always()
+  #     run: |
+  #       sudo lsblk -f
+  #       sudo free -h

.gitignore

@@ -46,6 +46,7 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+tests/ima/*
 
 # Translations
 *.mo
@@ -122,4 +123,4 @@ allocator_contracts_data/
 
 .vscode/
 
-fake_multisig_data.json
+fake_multisig_data.json

pytest.ini

@@ -1,5 +1,5 @@
 [pytest]
-log_cli = 0
+log_cli = 1
 log_cli_level = INFO
 log_cli_format = %(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)
 log_cli_date_format=%Y-%m-%d %H:%M:%S

scripts/calculate_version.sh

@@ -16,7 +16,7 @@ if [ -z $VERSION ]; then
 fi
 
 
-if [[ $BRANCH == 'master' ]]; then
+if [[ $BRANCH == 'stable' ]]; then
     echo $VERSION
     exit 0
 elif [[ $BRANCH == 'develop' ]]; then

scripts/run_ima_tests.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+PROJECT_DIR=$(dirname $DIR)
+export ENDPOINT=${ENDPOINT:-http://localhost:8545}
+export ENV=test
+
+
+py.test $PROJECT_DIR/tests/ima  $@

setup.py

@@ -33,7 +33,7 @@
 
 setup(
     name='skale.py',
-    version='7',
+    version='7.0',
     description='SKALE client tools',
     long_description_markdown_filename='README.md',
     author='SKALE Labs',
@@ -45,7 +45,7 @@
         "pyyaml==6.0",
         "redis==5.0.3",
         "sgx.py==0.9dev2",
-        "skale-contracts==1.0.1a5",
+        "skale-contracts==1.0.2a6",
         "typing-extensions==4.9.0",
         "web3==6.13.0"
     ],

skale/__init__.py

@@ -9,4 +9,12 @@
 from skale.skale_manager import SkaleManager as Skale  # todo: deprecated naming, will be removed in skale.py v5
 
 from skale.skale_allocator import SkaleAllocator
-from skale.skale_ima import SkaleIma
+# from skale.contracts.ima_mainnet import Linker
+# from skale.contracts.ima_schain.token_manager_erc20 import TokenManagerERC20
+# from skale.contracts.ima import DepositBoxEth
+# from skale.contracts.ima import DepositBoxERC20
+# from skale.contracts.ima.schain.token_manager_erc20 import TokenManagerERC20
+# from skale.contracts.ima.schain.token_manager_erc721 import TokenManagerERC721
+# from skale.contracts.ima.schain.token_manager_erc721_wmt import TokenManagerERC721WithMetadata
+# from skale.contracts.ima.schain.token_manager_erc1155 import TokenManagerERC1155
+# from skale.contracts.ima.schain.token_manager_eth import TokenManagerETH

skale/contracts/ima/__init__.py

@@ -1,10 +0,0 @@
-# flake8: noqa
-
-from skale.contracts.manager.contract_manager import ContractManager
-from skale.contracts.base_contract import BaseContract, transaction_method
-
-from skale.contracts.ima.linker import Linker
-
-__all__ = [
-    'Linker'
-]

skale/contracts/ima/mainnet/__init__.py

@@ -0,0 +1,26 @@
+# flake8: noqa
+
+
+from skale.contracts.base_contract import BaseContract, transaction_method
+
+from skale.contracts.ima.mainnet.message_proxy_for_mainnet import MessageProxyForMainnet
+from skale.contracts.ima.mainnet.linker import Linker
+from skale.contracts.ima.mainnet.community_pool import CommunityPool
+from skale.contracts.ima.mainnet.deposit_box_eth import DepositBoxEth
+from skale.contracts.ima.mainnet.deposit_box_erc20 import DepositBoxERC20
+from skale.contracts.ima.mainnet.deposit_box_erc721 import DepositBoxERC721
+from skale.contracts.ima.mainnet.deposit_box_erc721_wmt import (
+    DepositBoxERC721WithMetadata,
+)
+from skale.contracts.ima.mainnet.deposit_box_erc1155 import DepositBoxERC1155
+
+__all__ = [
+    "MessageProxyForMainnet",
+    "Linker",
+    "CommunityPool",
+    "DepositBoxEth",
+    "DepositBoxERC20",
+    "DepositBoxERC721",
+    "DepositBoxERC1155",
+    "DepositBoxERC721WithMetadata",
+]

skale/contracts/ima/mainnet/community_pool.py

@@ -0,0 +1,53 @@
+from Crypto.Hash import keccak
+
+from skale.contracts.base_contract import BaseContract, transaction_method
+from skale.transactions.result import TxRes
+
+
+class CommunityPool(BaseContract):
+    @transaction_method
+    def recharge_user_wallet(self, schain_name: str, address: int) -> TxRes:
+        return self.contract.functions.rechargeUserWallet(schain_name, address)
+
+    @transaction_method
+    def withdraw_funds(self, schain_name: str, amount: int) -> TxRes:
+        return self.contract.functions.withdrawFunds(schain_name, amount)
+
+    @transaction_method
+    def set_min_transaction_gas(self, min_gas_value: int) -> TxRes:
+        return self.contract.functions.setMinTransactionGas(min_gas_value)
+
+    @transaction_method
+    def set_multiplier(self, new_numerator: int, new_divider: int) -> TxRes:
+        return self.contract.functions.setMultiplier(new_numerator, new_divider)
+
+    def get_balance(self, address: int, schain_name: str) -> int:
+        return self.contract.functions.getBalance(address, schain_name).call()
+
+    def check_user_balance(self, schain_name: bytes, receiver: int) -> bool:
+        keccak_hash = keccak.new(data=schain_name.encode("utf8"), digest_bits=256)
+        schain_id = keccak_hash.digest()
+        return self.contract.functions.checkUserBalance(schain_id, receiver).call()
+
+    def get_recommended_recharge_amount(self, schain_hash: bytes, receiver: int) -> int:
+        keccak_hash = keccak.new(data=schain_hash.encode("utf8"), digest_bits=256)
+        schain_id = keccak_hash.digest()
+        return self.contract.functions.getRecommendedRechargeAmount(
+            schain_id, receiver
+        ).call()
+
+    def constant_setter_role(self) -> bool:
+        return self.contract.functions.CONSTANT_SETTER_ROLE().call()
+
+    def admin_role(self) -> bytes:
+        return self.contract.functions.DEFAULT_ADMIN_ROLE().call()
+
+    def has_role(self, role: bytes, address: int) -> bool:
+        return self.contract.functions.hasRole(role, address).call()
+
+    @transaction_method
+    def grant_role(self, role: bytes, address: str) -> TxRes:
+        return self.contract.functions.grantRole(role, address)
+
+    def get_role_member(self, role: bytes, index: int) -> bytes:
+        return self.contract.functions.getRoleMember(role, index).call()

skale/contracts/ima/mainnet/deposit_box_erc1155.py

@@ -0,0 +1,39 @@
+from skale.contracts.base_contract import BaseContract, transaction_method
+from skale.transactions.result import TxRes
+
+
+class DepositBoxERC1155(BaseContract):
+    """Class deposit"""
+
+    @transaction_method
+    def add_erc1155_token(self, schain_name: str, address: int) -> TxRes:
+        return self.contract.functions.addERC1155TokenByOwner(schain_name, address)
+
+    @transaction_method
+    def deposit_erc1155(
+        self, schain_name: str, address: int, token_id: int, amount: int
+    ) -> TxRes:
+        """Deposit ERC1155"""
+        return self.contract.functions.depositERC1155(
+            schain_name, address, token_id, amount
+        )
+
+    @transaction_method
+    def deposit_direct_erc1155(
+        self, schain_name: str, address: int, token_id: int, amount: int, receiver: int
+    ) -> TxRes:
+        """Direct deposit ERC1155"""
+        return self.contract.functions.depositERC1155Direct(
+            schain_name, address, token_id, amount, receiver
+        )
+
+    @transaction_method
+    def deposit_erc1155_batch(
+        self, schain_name: str, address: int, ids: list, amount: list
+    ) -> TxRes:
+        return self.contract.functions.depositERC1155Batch(
+            schain_name, address, ids, amount
+        )
+
+    def get_schain_to_erc1155(self, schain_name: str, token_address: int) -> TxRes:
+        return self.contract.functions.getSchainToERC1155(schain_name, token_address)