Skip to content

Commit 11b5396

Browse files
eval-execeval-exec
committed
wip
Signed-off-by: Eval EXEC <[email protected]>
1 parent 643cd7e commit 11b5396

File tree

9 files changed

+86
-20
lines changed

9 files changed

+86
-20
lines changed

‎Cargo.lock‎

Lines changed: 16 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ ckb-spawn = { path = "util/spawn", version = "=0.202.0-pre" }
182182
ckb-stop-handler = { path = "util/stop-handler", version = "=0.202.0-pre" }
183183
ckb-store = { path = "store", version = "=0.202.0-pre" }
184184
ckb-sync = { path = "sync", version = "=0.202.0-pre" }
185-
ckb-system-scripts = "=0.5.4"
185+
ckb-system-scripts-v0_5_4 = { package="ckb-system-scripts", version="=0.5.4" }
186+
ckb-system-scripts-v0_6_0 = { package="ckb-system-scripts", version="=0.6.0" }
186187
ckb-systemtime = { path = "util/systemtime", version = "=0.202.0-pre" }
187188
ckb-test-chain-utils = { path = "util/test-chain-utils", version = "=0.202.0-pre" }
188189
ckb-traits = { path = "traits", version = "=0.202.0-pre" }

‎benches/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ckb-hash.workspace = true
2323
ckb-test-chain-utils.workspace = true
2424
ckb-dao-utils.workspace = true
2525
ckb-dao.workspace = true
26-
ckb-system-scripts.workspace = true
26+
ckb-system-scripts-v0_5_4.workspace = true
2727
ckb-crypto.workspace = true
2828
ckb-jsonrpc-types.workspace = true
2929
ckb-verification.workspace = true

‎benches/benches/benchmarks/util.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use ckb_dao::DaoCalculator;
55
use ckb_dao_utils::genesis_dao_data;
66
use ckb_shared::{Shared, SharedBuilder, Snapshot};
77
use ckb_store::ChainStore;
8-
use ckb_system_scripts::BUNDLED_CELL;
8+
use ckb_system_scripts_v0_5_4::BUNDLED_CELL;
99
use ckb_test_chain_utils::always_success_cell;
1010
use ckb_types::{
1111
H160, H256, U256,

‎resource/Cargo.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ phf = "0.8.0" # ckb-resource's build script need this, and cargo shear think ckb
1414
includedir.workspace = true
1515
serde = { workspace = true, features = ["derive"] }
1616
ckb-types.workspace = true
17-
ckb-system-scripts.workspace = true
17+
ckb-system-scripts-v0_5_4.workspace = true
18+
ckb-system-scripts-v0_6_0.workspace = true
1819

1920
[build-dependencies]
2021
includedir_codegen.workspace = true
2122
walkdir.workspace = true
2223
ckb-types.workspace = true
23-
ckb-system-scripts.workspace = true
24+
ckb-system-scripts-v0_5_4.workspace = true
25+
ckb-system-scripts-v0_6_0.workspace = true
2426

2527
[dev-dependencies]
2628
tempfile.workspace = true

‎resource/build.rs‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ use std::io::{BufWriter, Write};
77
use std::path::Path;
88
use walkdir::WalkDir;
99

10-
use ckb_system_scripts::{
11-
CODE_HASH_DAO, CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL,
12-
CODE_HASH_SECP256K1_BLAKE160_SIGHASH_ALL, CODE_HASH_SECP256K1_DATA,
10+
use ckb_system_scripts_v0_5_4::{
11+
CODE_HASH_DAO, CODE_HASH_SECP256K1_BLAKE160_SIGHASH_ALL, CODE_HASH_SECP256K1_DATA,
1312
};
1413

14+
use ckb_system_scripts_v0_5_4::CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL as CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY;
15+
use ckb_system_scripts_v0_6_0::CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL as CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V2;
16+
1517
fn main() {
1618
let mut bundled = includedir_codegen::start("BUNDLED");
1719

@@ -58,9 +60,26 @@ fn main() {
5860

5961
writeln!(
6062
&mut out_file,
61-
"/// Data hash of the cell containing secp256k1 blake160 multisig all lock script.\n\
63+
"/// Data hash of the cell containing secp256k1 blake160 multisig(legacy) all lock script. Deprecated.\n\
64+
#[deprecated]
6265
pub const CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL: H256 = {:?};",
63-
H256(CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL)
66+
H256(CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY)
67+
)
68+
.expect("write to code_hashes.rs");
69+
70+
writeln!(
71+
&mut out_file,
72+
"/// Data hash of the cell containing secp256k1 blake160 multisig(legacy) all lock script.\n\
73+
pub const CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY: H256 = {:?};",
74+
H256(CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY)
75+
)
76+
.expect("write to code_hashes.rs");
77+
78+
writeln!(
79+
&mut out_file,
80+
"/// Data hash of the cell containing secp256k1 blake160 multisig(v1) all lock script.\n\
81+
pub const CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V2: H256 = {:?};",
82+
H256(CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V2)
6483
)
6584
.expect("write to code_hashes.rs");
6685

‎resource/specs/dev.toml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,13 @@ file = { bundled = "specs/cells/secp256k1_data" }
3333
create_type_id = false
3434
capacity = 1_048_617_0000_0000
3535
[[genesis.system_cells]]
36-
file = { bundled = "specs/cells/secp256k1_blake160_multisig_all" }
36+
file = { bundled = "specs/cells/secp256k1_blake160_multisig_all_legacy" }
37+
create_type_id = true
38+
capacity = 100_000_0000_0000
39+
40+
# TODO: @eval-exec , bundle multisig legacy and v1 to resources
41+
[[genesis.system_cells]]
42+
file = { bundled = "specs/cells/secp256k1_blake160_multisig_all_v1" }
3743
create_type_id = true
3844
capacity = 100_000_0000_0000
3945

@@ -53,7 +59,8 @@ files = [
5359
name = "secp256k1_blake160_multisig_all"
5460
files = [
5561
{ bundled = "specs/cells/secp256k1_data" },
56-
{ bundled = "specs/cells/secp256k1_blake160_multisig_all" },
62+
{ bundled = "specs/cells/secp256k1_blake160_multisig_all_legacy" },
63+
{ bundled = "specs/cells/secp256k1_blake160_multisig_all_v1" },
5764
]
5865

5966
# For first 11 block

‎resource/src/lib.rs‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ use std::fs;
3636
use std::io::{self, BufReader, Cursor, Read};
3737
use std::path::{Path, PathBuf};
3838

39-
use ckb_system_scripts::BUNDLED_CELL;
39+
use ckb_system_scripts_v0_5_4::BUNDLED_CELL;
40+
/// get multisig_legacy from v_0_5_4
41+
use ckb_system_scripts_v0_5_4::BUNDLED_CELL as BUNDLED_CELL_v0_5_4;
42+
/// get multisg_v1 from v0_6_0
43+
use ckb_system_scripts_v0_6_0::BUNDLED_CELL as BUNDLED_CELL_v0_6_0;
4044

4145
mod bundled {
4246
#![allow(missing_docs, clippy::unreadable_literal)]
@@ -156,6 +160,20 @@ impl Resource {
156160
matches!(self, Resource::Bundled { .. })
157161
}
158162

163+
fn remap_bundled<'a>(&self, bundled: &'a str) -> (&Files, &'a str) {
164+
match bundled {
165+
"specs/cells/secp256k1_blake160_multisig_all_legacy" => (
166+
&BUNDLED_CELL_v0_5_4,
167+
"specs/cells/secp256k1_blake160_multisig_all",
168+
),
169+
"specs/cells/secp256k1_blake160_multisig_all_v1" => (
170+
&BUNDLED_CELL_v0_6_0,
171+
"specs/cells/secp256k1_blake160_multisig_all",
172+
),
173+
_ => (&BUNDLED_CELL, bundled),
174+
}
175+
}
176+
159177
/// Returns `true` if the resource exists.
160178
///
161179
/// The bundled resource exists only when the identifier is included in the bundle.
@@ -164,7 +182,8 @@ impl Resource {
164182
pub fn exists(&self) -> bool {
165183
match self {
166184
Resource::Bundled { bundled } => {
167-
SourceFiles::new(&BUNDLED_CELL, &BUNDLED).is_available(bundled)
185+
let (system_cells, bundled) = self.remap_bundled(bundled);
186+
SourceFiles::new(&system_cells, &BUNDLED).is_available(bundled)
168187
}
169188
Resource::FileSystem { file } => file.exists(),
170189
Resource::Raw { .. } => true,
@@ -195,7 +214,10 @@ impl Resource {
195214
/// Gets resource content.
196215
pub fn get(&self) -> Result<Cow<'static, [u8]>> {
197216
match self {
198-
Resource::Bundled { bundled } => SourceFiles::new(&BUNDLED_CELL, &BUNDLED).get(bundled),
217+
Resource::Bundled { bundled } => {
218+
let (system_cells, bundled) = self.remap_bundled(bundled);
219+
SourceFiles::new(&system_cells, &BUNDLED).get(bundled)
220+
}
199221
Resource::FileSystem { file } => Ok(Cow::Owned(fs::read(file)?)),
200222
Resource::Raw { raw } => Ok(Cow::Owned(raw.to_owned().into_bytes())),
201223
}
@@ -205,7 +227,8 @@ impl Resource {
205227
pub fn read(&self) -> Result<Box<dyn Read>> {
206228
match self {
207229
Resource::Bundled { bundled } => {
208-
SourceFiles::new(&BUNDLED_CELL, &BUNDLED).read(bundled)
230+
let (system_cells, bundled) = self.remap_bundled(bundled);
231+
SourceFiles::new(&system_cells, &BUNDLED).read(bundled)
209232
}
210233
Resource::FileSystem { file } => Ok(Box::new(BufReader::new(fs::File::open(file)?))),
211234
Resource::Raw { raw } => Ok(Box::new(Cursor::new(raw.to_owned().into_bytes()))),

‎spec/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use ckb_hash::{blake2b_256, new_blake2b};
2222
use ckb_jsonrpc_types::Script;
2323
use ckb_pow::{Pow, PowEngine};
2424
use ckb_resource::{
25-
CODE_HASH_DAO, CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL,
25+
CODE_HASH_DAO, CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY,
2626
CODE_HASH_SECP256K1_BLAKE160_SIGHASH_ALL, CODE_HASH_SECP256K1_DATA, Resource,
2727
};
2828
use ckb_types::{
@@ -755,7 +755,7 @@ impl ChainSpec {
755755
check_cells_data_hash(
756756
0,
757757
OUTPUT_INDEX_SECP256K1_BLAKE160_MULTISIG_ALL as usize,
758-
&CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL,
758+
&CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY,
759759
)?;
760760

761761
Ok(())

0 commit comments

Comments
 (0)