Merge branch 'dev'

xelis_daemon/src/core/blockchain.rs

@@ -1671,17 +1671,6 @@ impl<S: Storage> Blockchain<S> {
             return Err(BlockchainError::InvalidReachability)
         }
 
-        if version >= BlockVersion::V2 {
-            // Verify that the tips are well sorted by cumulative difficulty
-            let sorted_tips = blockdag::sort_tips(storage, block.get_tips().iter().cloned()).await?;
-            for (expected, got) in sorted_tips.iter().zip(block.get_tips().iter()) {
-                if expected != got {
-                    debug!("Invalid tips order, expected {} but got {} for this block {}", expected, got, block_hash);
-                    return Err(BlockchainError::InvalidTipsOrder(block_hash, expected.clone(), got.clone()))
-                }
-            }
-        }
-
         for hash in block.get_tips() {
             let previous_timestamp = storage.get_timestamp_for_block_hash(hash).await?;
             // block timestamp can't be less than previous block.

xelis_daemon/src/core/error.rs

@@ -135,7 +135,7 @@ pub enum BlockchainError {
     ContractAlreadyExists,
     #[error("Contract not found: {}", _0)]
     ContractNotFound(Hash),
-    #[error("Invalid ip order for block {}, expected {}, got {}", _0, _1, _2)]
+    #[error("Invalid tip order for block {}, expected {}, got {}", _0, _1, _2)]
     InvalidTipsOrder(Hash, Hash, Hash),
     #[error("commit point already started")]
     CommitPointAlreadyStarted,