Merge branch 'master' into GH-598

Author: bertllll

.github/workflows/ci-matrix.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         target:
           - { name: linux, os: ubuntu-22.04 }
-          - { name: macos, os: macos-13 }
+          - { name: macos, os: macos-latest }
           - { name: windows, os: windows-2022 }
 
     name: Build node on ${{ matrix.target.os }}

node/src/blockchain/blockchain_bridge.rs

@@ -513,8 +513,8 @@ impl BlockchainBridge {
 
     pub fn extract_max_block_count(error: BlockchainInterfaceError) -> Option<u64> {
         let regex_result =
-            Regex::new(r".* (max: |allowed for your plan: |is limited to |block range limit \(|exceeds max block range )(?P<max_block_count>\d+).*")
-                .expect("Invalid regex");
+            Regex::new(r".* (max: |allowed for your plan: |is limited to |block range limit \(|exceeds max block range |maximum allowed is )(?P<max_block_count>\d+).*")
+        .expect("Invalid regex");
         let max_block_count = match error {
             BlockchainInterfaceError::QueryFailed(msg) => match regex_result.captures(msg.as_str())
             {
@@ -1539,7 +1539,7 @@ mod tests {
         system.run();
         let after = SystemTime::now();
         let expected_transactions = RetrievedBlockchainTransactions {
-            new_start_block: BlockMarker::Value(42 + 9_000_000 + 1),
+            new_start_block: BlockMarker::Value(42 + 9_000_000),
             transactions: vec![
                 BlockchainTransaction {
                     block_number: 6040059,
@@ -1740,7 +1740,7 @@ mod tests {
         let received_payments_message = accountant_recording.get_record::<ReceivedPayments>(0);
         check_timestamp(before, received_payments_message.timestamp, after);
         let expected_transactions = RetrievedBlockchainTransactions {
-            new_start_block: BlockMarker::Value(6 + 5000 + 1),
+            new_start_block: BlockMarker::Value(6 + 5000),
             transactions: vec![BlockchainTransaction {
                 block_number: 2000,
                 from: earning_wallet.clone(),
@@ -2203,6 +2203,15 @@ mod tests {
         assert_eq!(Some(100000), max_block_count);
     }
 
+    #[test]
+    fn extract_max_block_range_for_nodies_error_response_v2() {
+        let result = BlockchainError::QueryFailed("RPC error: Error { code: ServerError(-32001), message: \"Block range too large: maximum allowed is 20000 blocks\", data: None }".to_string());
+
+        let max_block_count = BlockchainBridge::extract_max_block_count(result);
+
+        assert_eq!(Some(20000), max_block_count);
+    }
+
     #[test]
     fn extract_max_block_range_for_expected_batch_got_single_error_response() {
         let result = BlockchainInterfaceError::QueryFailed(

node/src/blockchain/blockchain_interface/blockchain_interface_web3/mod.rs

@@ -396,7 +396,9 @@ impl BlockchainInterfaceWeb3 {
     ) -> BlockMarker {
         let locally_determined_end_block_marker = match (start_block_marker, scan_range) {
             (BlockMarker::Value(start_block), BlockScanRange::Range(scan_range_number)) => {
-                BlockMarker::Value(start_block + scan_range_number)
+                // Subtract 1 because the range is inclusive: [start_block, end_block]
+                // Example: If max range is 20000, we need start_block to start_block+20000-1 (ending up with 20000 blocks total)
+                BlockMarker::Value(start_block + scan_range_number - 1)
             }
             (_, _) => BlockMarker::Uninitialized,
         };
@@ -562,8 +564,8 @@ mod tests {
         let start_block_marker = BlockMarker::Value(42);
         let scan_range = BlockScanRange::Range(1000);
         let block_response = "0x7d0"; // 2_000
-        let expected_new_start_block = BlockMarker::Value(42 + 1000 + 1);
-        let expected_log = "from start block: Number(42) to end block: Number(1042)";
+        let expected_new_start_block = BlockMarker::Value(42 + 1000);
+        let expected_log = "from start block: Number(42) to end block: Number(1041)";
         assert_on_retrieves_transactions(
             start_block_marker,
             scan_range,
@@ -1272,7 +1274,7 @@ mod tests {
                 Err(BlockchainInterfaceError::InvalidResponse),
                 &logger
             ),
-            BlockMarker::Value(150)
+            BlockMarker::Value(149)
         );
         assert_eq!(
             Subject::calculate_end_block_marker(
@@ -1290,7 +1292,7 @@ mod tests {
                 Ok(120.into()),
                 &logger
             ),
-            BlockMarker::Value(50 + 10)
+            BlockMarker::Value(59)
         );
     }