Merge pull request #524 from lidofinance/master

Update feat/next-vote with master

Author: iamnp

.github/workflows/core_tests.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Run init script
         run: docker exec -e CORE_BRANCH tests-runner bash -c 'make init'
         env:
-          CORE_BRANCH: develop
+          CORE_BRANCH: master
 
       - name: Run node
         run: docker exec -e ETH_RPC_URL --detach tests-runner bash -c 'NODE_PORT=8546 make node'

Makefile

@@ -19,7 +19,7 @@ endif
 # Must be different from 8545 because core tests by default run its own fork on 8545
 CORE_TESTS_TARGET_RPC_URL ?= http://127.0.0.1:8547
 CORE_DIR ?= lido-core
-CORE_BRANCH ?= develop
+CORE_BRANCH ?= master
 NODE_PORT ?= 8545
 SECONDARY_NETWORK ?= mfh-2
 

network-config.yaml

@@ -9,7 +9,7 @@ live:
         name: Mainnet (Custom RPC)
         provider: custom
       - chainid: 17000
-        explorer: https://api-holesky.etherscan.io/api
+        explorer: https://api.etherscan.io/v2/api?chainid=17000
         host: https://holesky.infura.io/v3/$WEB3_INFURA_PROJECT_ID
         id: holesky
         # multicall2 is missing on Holesky. New backward-compatible multicall contract.
@@ -18,7 +18,7 @@ live:
         name: Holesky (Infura)
         provider: infura
       - chainid: 560048
-        explorer: https://api-hoodi.etherscan.io/api
+        explorer: https://api.etherscan.io/v2/api?chainid=560048
         host: $HOODI_RPC_URL
         id: hoodi
         name: Hoodi
@@ -125,7 +125,7 @@ development:
     host: http://127.0.0.1
     id: local-fork
     name: Ganache-CLI (Local Fork)
-    explorer: https://api.etherscan.io/api
+    explorer: https://api.etherscan.io/v2/api?chainid=1
     timeout: 360
     # https://github.com/mds1/multicall#multicall2-contract-addresses
     multicall2: "0x5BA1e12693Dc8F9c48aAD8770482f4739bEeD696"
@@ -140,7 +140,7 @@ development:
       port: 8545
     host: http://127.0.0.1
     id: hoodi-fork
-    explorer: https://api-hoodi.etherscan.io/api
+    explorer: https://api.etherscan.io/v2/api?chainid=560048
     name: Ganache-CLI (Hoodi Fork)
     timeout: 360
     multicall2: "0xcA11bde05977b3631167028862bE2a173976CA11"

tests/regression/test_permissions.py

@@ -643,9 +643,14 @@ def fetch_events_in_batches(start_block, end_block, provider=local_rpc_provider,
         with tqdm(total=total_batches, desc="Fetching Events") as pbar:
             for batch_start in range(start_block, end_block, step):
                 batch_end = min(batch_start + step - 1, end_block)
-                batch_events = provider.eth.filter(
-                        {"address": contracts.acl.address, "fromBlock": batch_start, "toBlock": batch_end, "topics": [event_signature_hash]}
-                ).get_all_entries()
+
+                batch_events = provider.eth.get_logs({
+                    "address": contracts.acl.address,
+                    "fromBlock": batch_start,
+                    "toBlock": batch_end,
+                    "topics": [event_signature_hash],
+                })
+
                 events.extend(batch_events)
                 pbar.update(1)
         return events