Merge pull request #549 from skalenetwork/feature/add-change-ip-ts-func

Update web3 version, add change ip ts func
skalenetwork · Jan 4, 2024 · e4c7806 · e4c7806
2 parents 6211cb6 + 60fa8b7
commit e4c7806
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Launch hardhat node
       working-directory: hardhat-node
       run: |
-        docker-compose up -d 
+        docker-compose up -d && sleep 20 
 
     - name: Deploy manager
       run: |
@@ -62,6 +62,7 @@ jobs:
       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"
@@ -84,7 +85,7 @@ jobs:
     - name: Launch hardhat node
       working-directory: hardhat-node
       run: |
-        docker-compose up -d 
+        docker-compose up -d && sleep 20 
 
     - name: Deploy manager contracts
       run: |

diff --git a/hardhat-node b/hardhat-node
diff --git a/helper-scripts b/helper-scripts
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
 
 setup(
     name='skale.py',
-    version='6.1',
+    version='6.2',
     description='SKALE client tools',
     long_description_markdown_filename='README.md',
     author='SKALE Labs',
@@ -43,9 +43,9 @@
     install_requires=[
         "asyncio==3.4.3",
         "pyyaml==6.0",
-        "sgx.py==0.9b0",
+        "sgx.py==0.9dev2",
         "redis==4.4.4",
-        "web3==6.3.0"
+        "web3==6.13.0"
     ],
 
     python_requires='>=3.7,<4',

diff --git a/skale/contracts/manager/nodes.py b/skale/contracts/manager/nodes.py
@@ -136,6 +136,9 @@ def get_validator_node_indices(self, validator_id: int) -> list:
         """
         return self.contract.functions.getValidatorNodeIndexes(validator_id).call()
 
+    def get_last_change_ip_time(self, node_id: int) -> list:
+        return self.contract.functions.getLastChangeIpTime(node_id).call()
+
     @transaction_method
     def set_node_in_maintenance(self, node_id):
         return self.contract.functions.setNodeInMaintenance(node_id)

diff --git a/tests/manager/nodes_test.py b/tests/manager/nodes_test.py
@@ -179,3 +179,12 @@ def test_change_ip(skale, nodes):
     data = skale.nodes.get(node_id)
     assert data['ip'] == old_ip
     assert data['publicIP'] == old_ip
+
+
+def test_get_last_change_ip_time(skale, nodes):
+    node_id = skale.nodes.node_name_to_index(DEFAULT_NODE_NAME)
+    new_ip = Helper.ip_to_bytes(generate_random_ip())
+    tx = skale.nodes.change_ip(node_id, new_ip, new_ip, wait_for=True, confirmation_blocks=5)
+    change_timestamp = skale.nodes.get_last_change_ip_time(node_id)
+    block = skale.web3.eth.get_block(tx.receipt.blockNumber)
+    assert change_timestamp == block.timestamp
+4 −0		calculate_version.sh
+0 −0		deploy_manager.sh
+0 −0		deploy_test_manager.sh
+13 −2		helper.sh