Skip to content

Commit fa01ccd

Browse files
eval-execeval-exec
committed
Rename V1 to V2
Signed-off-by: Eval EXEC <execvy@gmail.com>
1 parent f56c42f commit fa01ccd

File tree

10 files changed

+32
-32
lines changed

10 files changed

+32
-32
lines changed

‎examples/send_ckb_multisig_example.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ fn main() -> Result<(), Box<dyn StdErr>> {
1818
let configuration = TransactionBuilderConfiguration::new_with_network(network_info.clone())?;
1919

2020
let multisig_config = MultisigConfig::new_with(
21-
MultisigScript::V1,
21+
MultisigScript::V2,
2222
vec![
2323
h160!("0x7336b0ba900684cb3cb00f0d46d4f64c0994a562"),
2424
h160!("0x5724c1e3925a5206944d753a6f3edaedf977d77f"),
2525
],
2626
0,
2727
2,
2828
)?;
29-
let sender = multisig_config.to_address(network_info.network_type, MultisigScript::V1, None);
29+
let sender = multisig_config.to_address(network_info.network_type, MultisigScript::V2, None);
3030
println!("sender: {}", sender);
3131
let receiver = Address::from_str("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsq2qf8keemy2p5uu0g0gn8cd4ju23s5269qk8rg4r")?;
3232

‎examples/transfer_from_multisig.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ fn main() -> Result<(), Box<dyn StdErr>> {
145145
sighash_addresses.push(H160::from_slice(lock_args.as_ref()).unwrap());
146146
}
147147
MultisigConfig::new_with(
148-
ckb_sdk::constants::MultisigScript::V1,
148+
ckb_sdk::constants::MultisigScript::V2,
149149
sighash_addresses,
150150
args.require_first_n,
151151
args.threshold,
@@ -227,8 +227,8 @@ fn build_transfer_tx(
227227
) -> Result<TransactionView, Box<dyn StdErr>> {
228228
// Build CapacityBalancer
229229
let sender = Script::new_builder()
230-
.code_hash(MultisigScript::V1.script_id().code_hash.pack())
231-
.hash_type(MultisigScript::V1.script_id().hash_type.into())
230+
.code_hash(MultisigScript::V2.script_id().code_hash.pack())
231+
.hash_type(MultisigScript::V2.script_id().hash_type.into())
232232
.args(Bytes::from(multisig_config.hash160().as_bytes().to_vec()).pack())
233233
.build();
234234
let sender_addr = Address::new(args.receiver.network(), sender.clone().into(), true);
@@ -294,7 +294,7 @@ fn build_multisig_unlockers(
294294
let signer = SecpCkbRawKeySigner::new_with_secret_keys(keys);
295295
let multisig_signer = SecpMultisigScriptSigner::new(Box::new(signer), config);
296296
let multisig_unlocker = SecpMultisigUnlocker::new(multisig_signer);
297-
let multisig_script_id = MultisigScript::V1.script_id();
297+
let multisig_script_id = MultisigScript::V2.script_id();
298298
let mut unlockers = HashMap::default();
299299
unlockers.insert(
300300
multisig_script_id,

‎examples/transfer_from_omnilock_multisig.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ fn build_multisig_config(
274274
sighash_addresses.push(H160::from_slice(lock_args.as_ref()).unwrap());
275275
}
276276
Ok(MultisigConfig::new_with(
277-
MultisigScript::V1,
277+
MultisigScript::V2,
278278
sighash_addresses,
279279
require_first_n,
280280
threshold,

‎src/constants.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use ckb_system_scripts_v0_5_4::{
55
CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL as CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY,
66
CODE_HASH_SECP256K1_DATA,
77
};
8-
use ckb_system_scripts_v0_6_0::CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL as CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V1;
8+
use ckb_system_scripts_v0_6_0::CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL as CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V2;
99
use ckb_types::{
1010
core::EpochNumberWithFraction,
1111
h256,
@@ -78,7 +78,7 @@ pub enum MultisigScript {
7878

7979
/// Latest multisig script
8080
/// https://explorer.nervos.org/script/0x36c971b8d41fbd94aabca77dc75e826729ac98447b46f91e00796155dddb0d29/data1
81-
V1,
81+
V2,
8282
}
8383

8484
impl MultisigScript {
@@ -87,7 +87,7 @@ impl MultisigScript {
8787
MultisigScript::Legacy => ScriptId::new_type(h256!(
8888
"0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8"
8989
)),
90-
MultisigScript::V1 => ScriptId::new_data1(h256!(
90+
MultisigScript::V2 => ScriptId::new_data1(h256!(
9191
"0x36c971b8d41fbd94aabca77dc75e826729ac98447b46f91e00796155dddb0d29"
9292
)),
9393
}
@@ -96,7 +96,7 @@ impl MultisigScript {
9696
fn dep_group_from_env(&self, _network: NetworkInfo) -> Option<(H256, u32)> {
9797
let env_dep_group = match self {
9898
MultisigScript::Legacy => std::env::var("MULTISIG_LEGACY_DEP_GROUP"),
99-
MultisigScript::V1 => std::env::var("MULTISIG_V1_DEP_GROUP"),
99+
MultisigScript::V2 => std::env::var("MULTISIG_V2_DEP_GROUP"),
100100
}
101101
.ok()?;
102102

@@ -119,7 +119,7 @@ impl MultisigScript {
119119

120120
/// Get dep group from env first:
121121
/// 1. MULTISIG_LEGACY_DEP_GROUP=0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c,1
122-
/// 2. MULTISIG_V1_DEP_GROUP=0x6888aa39ab30c570c2c30d9d5684d3769bf77265a7973211a3c087fe8efbf738,2
122+
/// 2. MULTISIG_V2_DEP_GROUP=0x6888aa39ab30c570c2c30d9d5684d3769bf77265a7973211a3c087fe8efbf738,2
123123
///
124124
/// If env not set, then get it from dep_group_inner
125125
pub fn dep_group(&self, network: NetworkInfo) -> Option<(H256, u32)> {
@@ -134,7 +134,7 @@ impl MultisigScript {
134134
h256!("0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"),
135135
1,
136136
),
137-
MultisigScript::V1 => (
137+
MultisigScript::V2 => (
138138
h256!("0x6888aa39ab30c570c2c30d9d5684d3769bf77265a7973211a3c087fe8efbf738"),
139139
0,
140140
),
@@ -144,7 +144,7 @@ impl MultisigScript {
144144
h256!("0xf8de3bb47d055cdf460d93a2a6e1b05f7432f9777c8c474abf4eec1d4aee5d37"),
145145
1,
146146
),
147-
MultisigScript::V1 => (
147+
MultisigScript::V2 => (
148148
h256!("0x2eefdeb21f3a3edf697c28a52601b4419806ed60bb427420455cc29a090b26d5"),
149149
0,
150150
),
@@ -161,7 +161,7 @@ impl MultisigScript {
161161
MultisigScript::Legacy => {
162162
CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY.pack()
163163
}
164-
MultisigScript::V1 => CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V1.pack(),
164+
MultisigScript::V2 => CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V2.pack(),
165165
};
166166
let multisig_outpoint =
167167
find_cell_match_data_hash(&genesis_block, target_data_hash)?;
@@ -232,8 +232,8 @@ impl TryFrom<H256> for MultisigScript {
232232
fn try_from(code_hash: H256) -> Result<Self, Self::Error> {
233233
if code_hash.eq(&MultisigScript::Legacy.script_id().code_hash) {
234234
Ok(MultisigScript::Legacy)
235-
} else if code_hash.eq(&MultisigScript::V1.script_id().code_hash) {
236-
Ok(MultisigScript::V1)
235+
} else if code_hash.eq(&MultisigScript::V2.script_id().code_hash) {
236+
Ok(MultisigScript::V2)
237237
} else {
238238
Err(())
239239
}
@@ -269,16 +269,16 @@ mod test {
269269
fn test_multisig_deps() {
270270
assert_ne!(
271271
CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_LEGACY,
272-
CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V1
272+
CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL_V2
273273
);
274274

275275
let mainnet = NetworkInfo::mainnet();
276276
assert!(MultisigScript::Legacy.dep_group(mainnet.clone()).is_some());
277-
assert!(MultisigScript::V1.dep_group(mainnet).is_some());
277+
assert!(MultisigScript::V2.dep_group(mainnet).is_some());
278278

279279
let testnet = NetworkInfo::testnet();
280280
assert!(MultisigScript::Legacy.dep_group(testnet.clone()).is_some());
281-
assert!(MultisigScript::V1.dep_group(testnet).is_some());
281+
assert!(MultisigScript::V2.dep_group(testnet).is_some());
282282

283283
// TODO: start ckb devchain in this unit test
284284
// let devnet = NetworkInfo::devnet();

‎src/test_util.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ impl Context {
116116
.0
117117
.clone(),
118118
);
119-
if let Some(cell_deps) = cell_dep_resolver.multisig_dep(MultisigScript::V1) {
120-
ctx.add_cell_dep_map(MultisigScript::V1.script_id(), cell_deps.0.clone());
119+
if let Some(cell_deps) = cell_dep_resolver.multisig_dep(MultisigScript::V2) {
120+
ctx.add_cell_dep_map(MultisigScript::V2.script_id(), cell_deps.0.clone());
121121
}
122122

123123
for tx in block.transactions().iter() {

‎src/tests/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ fn test_transfer_from_multisig() {
232232
ACCOUNT1_ARG.clone(),
233233
ACCOUNT2_ARG.clone(),
234234
];
235-
let cfg = MultisigConfig::new_with(MultisigScript::V1, lock_args, 0, 2).unwrap();
235+
let cfg = MultisigConfig::new_with(MultisigScript::V2, lock_args, 0, 2).unwrap();
236236

237237
let sender = build_multisig_script(&cfg);
238238
let receiver = build_sighash_script(ACCOUNT2_ARG);

‎src/tests/omni_lock.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ fn test_omnilock_transfer_from_multisig() {
586586
ACCOUNT1_ARG.clone(),
587587
ACCOUNT2_ARG.clone(),
588588
];
589-
let multi_cfg = MultisigConfig::new_with(MultisigScript::V1, lock_args, 0, 2).unwrap();
589+
let multi_cfg = MultisigConfig::new_with(MultisigScript::V2, lock_args, 0, 2).unwrap();
590590
let cfg = OmniLockConfig::new_multisig(multi_cfg);
591591

592592
let sender = build_omnilock_script(&cfg);
@@ -665,15 +665,15 @@ fn test_omnilock_transfer_from_multisig_wl_commnon(unlock_mode: OmniUnlockMode)
665665
ACCOUNT1_ARG.clone(),
666666
ACCOUNT2_ARG.clone(),
667667
];
668-
let multi_cfg = MultisigConfig::new_with(MultisigScript::V1, lock_args, 0, 2).unwrap();
668+
let multi_cfg = MultisigConfig::new_with(MultisigScript::V2, lock_args, 0, 2).unwrap();
669669
let mut cfg = OmniLockConfig::new_multisig(multi_cfg);
670670

671671
let lock_args = vec![
672672
ACCOUNT3_ARG.clone(), // the different key
673673
ACCOUNT1_ARG.clone(),
674674
ACCOUNT2_ARG.clone(),
675675
];
676-
let multi_cfg = MultisigConfig::new_with(MultisigScript::V1, lock_args, 0, 2).unwrap();
676+
let multi_cfg = MultisigConfig::new_with(MultisigScript::V2, lock_args, 0, 2).unwrap();
677677
let admin_id = Identity::new_multisig(multi_cfg.clone());
678678
let mut ctx = init_context(vec![(OMNILOCK_BIN, true)], vec![]);
679679
let (proof_vec, rc_type_id, rce_cells) =

‎src/traits/default_impls.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ pub struct DefaultCellDepResolver {
7171
impl DefaultCellDepResolver {
7272
/// You can customize the multisig script's depgroup by these two env variables, for example:
7373
/// 1. MULTISIG_LEGACY_DEP_GROUP=0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c,1
74-
/// 2. MULTISIG_V1_DEP_GROUP=0x6888aa39ab30c570c2c30d9d5684d3769bf77265a7973211a3c087fe8efbf738,2
74+
/// 2. MULTISIG_V2_DEP_GROUP=0x6888aa39ab30c570c2c30d9d5684d3769bf77265a7973211a3c087fe8efbf738,2
7575
pub fn from_genesis(
7676
genesis_block: &BlockView,
7777
) -> Result<DefaultCellDepResolver, ParseGenesisInfoError> {
@@ -180,14 +180,14 @@ impl DefaultCellDepResolver {
180180
NetworkInfo::devnet()
181181
};
182182

183-
if let Some((v1_dep_hash, v1_dep_index)) = MultisigScript::V1.dep_group(network_info) {
183+
if let Some((v1_dep_hash, v1_dep_index)) = MultisigScript::V2.dep_group(network_info) {
184184
let multisig_v1_dep = CellDep::new_builder()
185185
.out_point(OutPoint::new(v1_dep_hash.pack(), v1_dep_index))
186186
.dep_type(DepType::DepGroup.into())
187187
.build();
188188

189189
items.insert(
190-
MultisigScript::V1.script_id(),
190+
MultisigScript::V2.script_id(),
191191
(
192192
multisig_v1_dep,
193193
"Secp256k1 blake160 multisig(v1) all".to_string(),

‎src/transaction/signer/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl TransactionSigner {
9494
Box::new(multisig::Secp256k1Blake160MultisigAllSigner {}) as Box<_>,
9595
);
9696

97-
let multisig_script_id_v1 = MultisigScript::V1.script_id();
97+
let multisig_script_id_v1 = MultisigScript::V2.script_id();
9898
unlockers.insert(
9999
multisig_script_id_v1,
100100
Box::new(multisig::Secp256k1Blake160MultisigAllSigner {}) as Box<_>,

‎src/types/address.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,8 @@ impl From<Script> for AddressPayload {
263263
let index = CodeHashIndex::Multisig;
264264
let hash = H160::from_slice(args.as_ref()).unwrap();
265265
AddressPayload::Short { index, hash }
266-
} else if hash_type == MultisigScript::V1.script_id().hash_type
267-
&& code_hash_h256 == MultisigScript::V1.script_id().code_hash
266+
} else if hash_type == MultisigScript::V2.script_id().hash_type
267+
&& code_hash_h256 == MultisigScript::V2.script_id().code_hash
268268
&& args.len() == 20
269269
{
270270
let index = CodeHashIndex::Multisig;

0 commit comments

Comments
 (0)