wip

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

Author: eval-exec

Cargo.toml

@@ -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", git="https://github.com/nervosnetwork/ckb-system-scripts", branch="master" }
 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" }

benches/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/benches/benchmarks/util.rs

@@ -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,

resource/Cargo.toml

@@ -14,13 +14,14 @@ 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
 
 [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/build.rs

@@ -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_v_0_5_4::{
+    CODE_HASH_DAO, CODE_HASH_SECP256K1_BLAKE160_SIGHASH_ALL, CODE_HASH_SECP256K1_DATA,
 };
 
+use ckb_system_scripts_v_0_6_4::CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL as CODE_HASH_SECP256K1_BLAKE160_MULTISIG_LEGACY_ALL;
+use ckb_system_scripts_v_0_6_4::CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL as CODE_HASH_SECP256K1_BLAKE160_MULTISIG_V1_ALL;
+
 fn main() {
     let mut bundled = includedir_codegen::start("BUNDLED");
 
@@ -58,9 +60,17 @@ fn main() {
 
     writeln!(
         &mut out_file,
-        "/// Data hash of the cell containing secp256k1 blake160 multisig all lock script.\n\
-        pub const CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL: H256 = {:?};",
-        H256(CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL)
+        "/// Data hash of the cell containing secp256k1 blake160 multisig(legacy) all lock script.\n\
+        pub const CODE_HASH_SECP256K1_BLAKE160_MULTISIG_LEGACY_ALL: H256 = {:?};",
+        H256(CODE_HASH_SECP256K1_BLAKE160_MULTISIG_LEGACY_ALL)
+    )
+    .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_V1_ALL: H256 = {:?};",
+        H256(CODE_HASH_SECP256K1_BLAKE160_MULTISIG_V1_ALL)
     )
     .expect("write to code_hashes.rs");
 

resource/specs/dev.toml

@@ -33,7 +33,13 @@ 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 = { bundled = "specs/cells/secp256k1_blake160_multisig_legacy_all" }
+create_type_id = true
+capacity = 100_000_0000_0000
+
+# TODO: @eval-exec , bundle multisig v1 to resources
+[[genesis.system_cells]]
+file = { bundled = "specs/cells/secp256k1_blake160_multisig_v1_all" }
 create_type_id = true
 capacity = 100_000_0000_0000
 
@@ -53,7 +59,8 @@ files = [
 name = "secp256k1_blake160_multisig_all"
 files = [
   { bundled = "specs/cells/secp256k1_data" },
-  { bundled = "specs/cells/secp256k1_blake160_multisig_all" },
+  { bundled = "specs/cells/secp256k1_blake160_multisig_legacy_all" },
+  { bundled = "specs/cells/secp256k1_blake160_multisig_v1_all" },
 ]
 
 # For first 11 block