Merge branch 'master' into develop

nervosnetwork · Mar 5, 2025 · 33446e8 · 33446e8
2 parents 0554738 + 52c2be1
commit 33446e8
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # CHANGELOG
 
+## [v0.200.0](https://github.com/nervosnetwork/ckb/compare/v0.121.0...v0.200.0) (2025-03-05)
+
+### Features
+
+- #4807: Activate CKB Edition Meepo (2024) on the Mainnet (@zhangsoledad)
+
+    This is a breaking change of consensus once activated.
+
+- #4800: Implement nodes filter with P2P transport service types (@driftluo)
+- #4793: Mark DNS address connected time on peer store (@driftluo)
+
+### Improvements
+
+- #4795: `NetRpcImpl::get_peers` return `Remoteaddress.addresses` without duplicates (@eval-exec)
+
+    This is a breaking change of RPC.
+
+- #4801: Upgrade openssl from 0.10.68 to 0.10.70, fix [RUSTSEC-2025-0004](https://rustsec.org/advisories/RUSTSEC-2025-0004) (@eval-exec)
+- #4785: Improving spawn and exec syscalls (@mohanson)
+
 ## [v0.121.0](https://github.com/nervosnetwork/ckb/compare/v0.120.0...v0.121.0) (2025-01-22)
 
 ### Improvements

diff --git a/util/constant/src/default_assume_valid_target.rs b/util/constant/src/default_assume_valid_target.rs
@@ -1,4 +1,4 @@
-//! Get default assume valid targets
+/// Get default assume valid targets
 
 /// mainnet
 pub mod mainnet {

diff --git a/util/constant/src/latest_assume_valid_target.rs b/util/constant/src/latest_assume_valid_target.rs
@@ -1,30 +1,31 @@
-//! The mod mainnet and mod testnet's codes are generated
-//! by script: ./devtools/release/update_default_valid_target.sh
-//! Please don't modify them manually.
+/// The mod mainnet and mod testnet's codes are generated
+/// by script: ./devtools/release/update_default_valid_target.sh
+/// Please don't modify them manually.
+///
 
 /// sync config related to mainnet
 pub mod mainnet {
     /// Default assume valid target for mainnet, expect to be a block 60 days ago.
     ///
     /// Need to update when CKB's new release
     /// in mainnet: the 60 days ago block is:
-    /// height: 14502091
-    /// hash: 0x16b0d58543751a21c2cdb7be5d7077fbbcbc2097031e8c72b24dc5bd02a492f9
-    /// date: Fri Nov  8 02:26:34 PM CST 2024
-    /// you can view this block in https://explorer.nervos.org/block/0x16b0d58543751a21c2cdb7be5d7077fbbcbc2097031e8c72b24dc5bd02a492f9
+    /// height: 14908742
+    /// hash: 0x216095bfc3bb68e7509db4b3f98b105ac5565586876a795a9c5c3d0dfe134cb5
+    /// date: Sun Dec 22 03:04:27 PM CST 2024
+    /// you can view this block in https://explorer.nervos.org/block/0x216095bfc3bb68e7509db4b3f98b105ac5565586876a795a9c5c3d0dfe134cb5
     pub const DEFAULT_ASSUME_VALID_TARGET: &str =
-        "0x16b0d58543751a21c2cdb7be5d7077fbbcbc2097031e8c72b24dc5bd02a492f9";
+        "0x216095bfc3bb68e7509db4b3f98b105ac5565586876a795a9c5c3d0dfe134cb5";
 }
 /// sync config related to testnet
 pub mod testnet {
     /// Default assume valid target for testnet, expect to be a block 60 days ago.
     ///
     /// Need to update when CKB's new release
     /// in testnet: the 60 days ago block is:
-    /// height: 15166546
-    /// hash: 0x4400bcbdf652827f21e86ca88d50aa0ac3340968ff19eba6b183fd95164bc8f8
-    /// date: Fri Nov  8 02:27:19 PM CST 2024
-    /// you can view this block in https://pudge.explorer.nervos.org/block/0x4400bcbdf652827f21e86ca88d50aa0ac3340968ff19eba6b183fd95164bc8f8
+    /// height: 15641938
+    /// hash: 0xd92fe833fd53c6e0c7f05516609c3bbf4777aa05d016523cf1ff8aeaeec6fc13
+    /// date: Sun Dec 22 03:09:16 PM CST 2024
+    /// you can view this block in https://pudge.explorer.nervos.org/block/0xd92fe833fd53c6e0c7f05516609c3bbf4777aa05d016523cf1ff8aeaeec6fc13
     pub const DEFAULT_ASSUME_VALID_TARGET: &str =
-        "0x4400bcbdf652827f21e86ca88d50aa0ac3340968ff19eba6b183fd95164bc8f8";
+        "0xd92fe833fd53c6e0c7f05516609c3bbf4777aa05d016523cf1ff8aeaeec6fc13";
 }