update

Signed-off-by: Eval EXEC <[email protected]>

Author: eval-exec

Cargo.lock

@@ -182,7 +182,8 @@ ckb-spawn = { path = "util/spawn", version = "=0.202.0-pre" }
 ckb-stop-handler = { path = "util/stop-handler", version = "=0.202.0-pre" }
 ckb-store = { path = "store", version = "=0.202.0-pre" }
 ckb-sync = { path = "sync", version = "=0.202.0-pre" }
-ckb-system-scripts = "=0.5.4"
+ckb-system-scripts-v0_5_4 = { package="ckb-system-scripts", version="=0.5.4" }
+ckb-system-scripts-v0_6_0 = { package="ckb-system-scripts", version="=0.6.0" }
 ckb-systemtime = { path = "util/systemtime", version = "=0.202.0-pre" }
 ckb-test-chain-utils = { path = "util/test-chain-utils", version = "=0.202.0-pre" }
 ckb-traits = { path = "traits", version = "=0.202.0-pre" }

Cargo.toml

@@ -23,7 +23,7 @@ ckb-hash.workspace = true
 ckb-test-chain-utils.workspace = true
 ckb-dao-utils.workspace = true
 ckb-dao.workspace = true
-ckb-system-scripts.workspace = true
+ckb-system-scripts-v0_5_4.workspace = true
 ckb-crypto.workspace = true
 ckb-jsonrpc-types.workspace = true
 ckb-verification.workspace = true

benches/Cargo.toml

@@ -5,7 +5,7 @@ use ckb_dao::DaoCalculator;
 use ckb_dao_utils::genesis_dao_data;
 use ckb_shared::{Shared, SharedBuilder, Snapshot};
 use ckb_store::ChainStore;
-use ckb_system_scripts::BUNDLED_CELL;
+use ckb_system_scripts_v0_5_4::BUNDLED_CELL;
 use ckb_test_chain_utils::always_success_cell;
 use ckb_types::{
     H160, H256, U256,

benches/benches/benchmarks/util.rs

@@ -14,13 +14,15 @@ phf = "0.8.0" # ckb-resource's build script need this, and cargo shear think ckb
 includedir.workspace = true
 serde = { workspace = true, features = ["derive"] }
 ckb-types.workspace = true
-ckb-system-scripts.workspace = true
+ckb-system-scripts-v0_5_4.workspace = true
+ckb-system-scripts-v0_6_0.workspace = true
 
 [build-dependencies]
 includedir_codegen.workspace = true
 walkdir.workspace = true
 ckb-types.workspace = true
-ckb-system-scripts.workspace = true
+ckb-system-scripts-v0_5_4.workspace = true
+ckb-system-scripts-v0_6_0.workspace = true
 
 [dev-dependencies]
 tempfile.workspace = true

resource/Cargo.toml

@@ -7,11 +7,13 @@ use std::io::{BufWriter, Write};
 use std::path::Path;
 use walkdir::WalkDir;
 
-use ckb_system_scripts::{
-    CODE_HASH_DAO, CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL,
-    CODE_HASH_SECP256K1_BLAKE160_SIGHASH_ALL, CODE_HASH_SECP256K1_DATA,
+use ckb_system_scripts_v0_5_4::{
+    CODE_HASH_DAO, CODE_HASH_SECP256K1_BLAKE160_SIGHASH_ALL, CODE_HASH_SECP256K1_DATA,
 };
 
+use ckb_system_scripts_v0_5_4::CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL as CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY;
+use ckb_system_scripts_v0_6_0::CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL as CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V2;
+
 fn main() {
     let mut bundled = includedir_codegen::start("BUNDLED");
 
@@ -58,9 +60,26 @@ fn main() {
 
     writeln!(
         &mut out_file,
-        "/// Data hash of the cell containing secp256k1 blake160 multisig all lock script.\n\
+        "/// Data hash of the cell containing secp256k1 blake160 multisig(legacy) all lock script. Deprecated.\n\
+        #[deprecated]
         pub const CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL: H256 = {:?};",
-        H256(CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL)
+        H256(CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY)
+    )
+    .expect("write to code_hashes.rs");
+
+    writeln!(
+        &mut out_file,
+        "/// Data hash of the cell containing secp256k1 blake160 multisig(legacy) all lock script.\n\
+        pub const CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY: H256 = {:?};",
+        H256(CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY)
+    )
+    .expect("write to code_hashes.rs");
+
+    writeln!(
+        &mut out_file,
+        "/// Data hash of the cell containing secp256k1 blake160 multisig(v1) all lock script.\n\
+        pub const CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V2: H256 = {:?};",
+        H256(CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V2)
     )
     .expect("write to code_hashes.rs");
 

resource/build.rs

@@ -33,7 +33,12 @@ file = { bundled = "specs/cells/secp256k1_data" }
 create_type_id = false
 capacity = 1_048_617_0000_0000
 [[genesis.system_cells]]
-file = { bundled = "specs/cells/secp256k1_blake160_multisig_all" }
+file = { version = "v0.5.4", bundled = "specs/cells/secp256k1_blake160_multisig_all" }
+create_type_id = true
+capacity = 100_000_0000_0000
+
+[[genesis.system_cells]]
+file = { version = "v0.6.0", bundled = "specs/cells/secp256k1_blake160_multisig_all" }
 create_type_id = true
 capacity = 100_000_0000_0000
 
@@ -53,7 +58,14 @@ files = [
 name = "secp256k1_blake160_multisig_all"
 files = [
   { bundled = "specs/cells/secp256k1_data" },
-  { bundled = "specs/cells/secp256k1_blake160_multisig_all" },
+  { version = "v0.5.4", bundled = "specs/cells/secp256k1_blake160_multisig_all" },
+]
+
+[[genesis.dep_groups]]
+name = "secp256k1_blake160_multisig_all_v2"
+files = [
+  { bundled = "specs/cells/secp256k1_data" },
+  { version = "v0.6.0", bundled = "specs/cells/secp256k1_blake160_multisig_all" },
 ]
 
 # For first 11 block

resource/specs/dev.toml

@@ -36,7 +36,11 @@ use std::fs;
 use std::io::{self, BufReader, Cursor, Read};
 use std::path::{Path, PathBuf};
 
-use ckb_system_scripts::BUNDLED_CELL;
+use ckb_system_scripts_v0_5_4::BUNDLED_CELL;
+/// get multisig_legacy from v_0_5_4
+use ckb_system_scripts_v0_5_4::BUNDLED_CELL as BUNDLED_CELL_v0_5_4;
+/// get multisg_v1 from v0_6_0
+use ckb_system_scripts_v0_6_0::BUNDLED_CELL as BUNDLED_CELL_v0_6_0;
 
 mod bundled {
     #![allow(missing_docs, clippy::unreadable_literal)]
@@ -56,13 +60,39 @@ pub const SPEC_DEV_FILE_NAME: &str = "specs/dev.toml";
 /// The file name of the generated RocksDB options file.
 pub const DB_OPTIONS_FILE_NAME: &str = "default.db-options";
 
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+pub enum BundledSystemScriptVersion {
+    /// The bundled resource version is 0.5.4. this version is used before `CKB v0.201.0`
+    #[serde(rename = "v0.5.4")]
+    V0_5_4,
+    /// The bundled resource version is 0.6.0. This version contains multisig v2
+    #[serde(rename = "v0.6.0")]
+    V0_6_0,
+}
+
+impl std::fmt::Display for BundledSystemScriptVersion {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            BundledSystemScriptVersion::V0_5_4 => write!(f, "v0.5.4"),
+            BundledSystemScriptVersion::V0_6_0 => write!(f, "v0.6.0"),
+        }
+    }
+}
+
+fn default_bundled_version() -> BundledSystemScriptVersion {
+    BundledSystemScriptVersion::V0_5_4
+}
+
 /// Represents a resource, which is either bundled in the CKB binary or resident in the local file
 /// system.
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum Resource {
     /// A resource that bundled in the CKB binary.
     Bundled {
+        /// The version of the bundled resource. default is v0.5.4
+        #[serde(default = "default_bundled_version")]
+        version: BundledSystemScriptVersion,
         /// The identifier of the bundled resource.
         bundled: String,
     },
@@ -81,7 +111,9 @@ pub enum Resource {
 impl fmt::Display for Resource {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            Resource::Bundled { bundled } => write!(f, "Bundled({bundled})"),
+            Resource::Bundled { bundled, version } => {
+                write!(f, "Bundled(bundled: {bundled}, version:{version}))")
+            }
             Resource::FileSystem { file } => write!(f, "FileSystem({})", file.display()),
             Resource::Raw { raw } => write!(f, "Raw({})", raw),
         }
@@ -90,8 +122,18 @@ impl fmt::Display for Resource {
 
 impl Resource {
     /// Creates a reference to the bundled resource.
+    /// This function, will use ckb_system_scripts v0.5.4 crate
     pub fn bundled(bundled: String) -> Resource {
-        Resource::Bundled { bundled }
+        Resource::Bundled {
+            version: BundledSystemScriptVersion::V0_5_4,
+            bundled,
+        }
+    }
+
+    /// Creates a reference to the bundled resource.
+    /// use specific version of ckb_system_scripts crate
+    pub fn bundled_with_version(version: BundledSystemScriptVersion, bundled: String) -> Resource {
+        Resource::Bundled { version, bundled }
     }
 
     /// Creates a reference to the resource resident in the file system.
@@ -163,9 +205,15 @@ impl Resource {
     /// The file system resource exists only when the file exists.
     pub fn exists(&self) -> bool {
         match self {
-            Resource::Bundled { bundled } => {
-                SourceFiles::new(&BUNDLED_CELL, &BUNDLED).is_available(bundled)
+            Resource::Bundled { bundled, version } => match version {
+                BundledSystemScriptVersion::V0_5_4 => {
+                    SourceFiles::new(&BUNDLED_CELL_v0_5_4, &BUNDLED)
+                }
+                BundledSystemScriptVersion::V0_6_0 => {
+                    SourceFiles::new(&BUNDLED_CELL_v0_6_0, &BUNDLED)
+                }
             }
+            .is_available(bundled),
             Resource::FileSystem { file } => file.exists(),
             Resource::Raw { .. } => true,
         }
@@ -195,7 +243,15 @@ impl Resource {
     /// Gets resource content.
     pub fn get(&self) -> Result<Cow<'static, [u8]>> {
         match self {
-            Resource::Bundled { bundled } => SourceFiles::new(&BUNDLED_CELL, &BUNDLED).get(bundled),
+            Resource::Bundled { bundled, version } => match version {
+                BundledSystemScriptVersion::V0_5_4 => {
+                    SourceFiles::new(&BUNDLED_CELL_v0_5_4, &BUNDLED)
+                }
+                BundledSystemScriptVersion::V0_6_0 => {
+                    SourceFiles::new(&BUNDLED_CELL_v0_6_0, &BUNDLED)
+                }
+            }
+            .get(bundled),
             Resource::FileSystem { file } => Ok(Cow::Owned(fs::read(file)?)),
             Resource::Raw { raw } => Ok(Cow::Owned(raw.to_owned().into_bytes())),
         }
@@ -204,9 +260,15 @@ impl Resource {
     /// Gets resource content via an input stream.
     pub fn read(&self) -> Result<Box<dyn Read>> {
         match self {
-            Resource::Bundled { bundled } => {
-                SourceFiles::new(&BUNDLED_CELL, &BUNDLED).read(bundled)
+            Resource::Bundled { bundled, version } => match version {
+                BundledSystemScriptVersion::V0_5_4 => {
+                    SourceFiles::new(&BUNDLED_CELL_v0_5_4, &BUNDLED)
+                }
+                BundledSystemScriptVersion::V0_6_0 => {
+                    SourceFiles::new(&BUNDLED_CELL_v0_6_0, &BUNDLED)
+                }
             }
+            .read(bundled),
             Resource::FileSystem { file } => Ok(Box::new(BufReader::new(fs::File::open(file)?))),
             Resource::Raw { raw } => Ok(Box::new(Cursor::new(raw.to_owned().into_bytes()))),
         }
@@ -222,7 +284,10 @@ impl Resource {
     /// See [Template](struct.Template.html).
     pub fn export<P: AsRef<Path>>(&self, context: &TemplateContext<'_>, root_dir: P) -> Result<()> {
         let key = match self {
-            Resource::Bundled { bundled } => bundled,
+            Resource::Bundled {
+                bundled,
+                version: _,
+            } => bundled,
             _ => return Ok(()),
         };
         let target = join_bundled_key(root_dir.as_ref().to_path_buf(), key);

resource/src/lib.rs

@@ -22,7 +22,7 @@ use ckb_hash::{blake2b_256, new_blake2b};
 use ckb_jsonrpc_types::Script;
 use ckb_pow::{Pow, PowEngine};
 use ckb_resource::{
-    CODE_HASH_DAO, CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL,
+    CODE_HASH_DAO, CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY,
     CODE_HASH_SECP256K1_BLAKE160_SIGHASH_ALL, CODE_HASH_SECP256K1_DATA, Resource,
 };
 use ckb_types::{
@@ -755,7 +755,7 @@ impl ChainSpec {
         check_cells_data_hash(
             0,
             OUTPUT_INDEX_SECP256K1_BLAKE160_MULTISIG_ALL as usize,
-            &CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL,
+            &CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY,
         )?;
 
         Ok(())