From f2e14d0d9318b01e6e6ed452da291ad37526ccaf Mon Sep 17 00:00:00 2001 From: Dmytro Date: Wed, 3 Jan 2024 19:07:37 +0000 Subject: [PATCH 1/4] Update web3 version, add change ip ts func --- hardhat-node | 2 +- helper-scripts | 2 +- setup.py | 6 +++--- skale/contracts/manager/nodes.py | 3 +++ tests/manager/nodes_test.py | 9 +++++++++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/hardhat-node b/hardhat-node index b6913d83..8a4b03fd 160000 --- a/hardhat-node +++ b/hardhat-node @@ -1 +1 @@ -Subproject commit b6913d8383783eb98b0b9e1e6f5647299c1dd42f +Subproject commit 8a4b03fd1051960a3e0182280bf4bfdc43129997 diff --git a/helper-scripts b/helper-scripts index c253fa60..356ee771 160000 --- a/helper-scripts +++ b/helper-scripts @@ -1 +1 @@ -Subproject commit c253fa60f1862753e0546dd9ade72b41e425cf99 +Subproject commit 356ee771191d6654e9d1f97a0f131ef36481d4d9 diff --git a/setup.py b/setup.py index 5af8dfc7..579a2572 100644 --- 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 index 0445736d..86af9360 100644 --- 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 index 030b9296..d8989288 100644 --- 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 From dfaee2772aadcfd7318f3eb6730e42e1ccfae760 Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 4 Jan 2024 12:56:22 +0000 Subject: [PATCH 2/4] Add sleep to docker-compose up -d --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 85e8c3e0..3c6c4837 100644 --- 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: | From f5e7730be09e25d2d04ef741a0a2501b938fa03c Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 4 Jan 2024 13:33:30 +0000 Subject: [PATCH 3/4] Add sleep to allocator tests --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3c6c4837..ec12db41 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -84,7 +84,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: | From 60fa8b7b7ed6b39d5f7f5e392759d4a08fe50aff Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 4 Jan 2024 13:49:45 +0000 Subject: [PATCH 4/4] Fix allocator tests --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ec12db41..d999019b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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"