update fix

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

Author: eval-exec

src/traits/default_impls.rs

@@ -180,17 +180,17 @@ impl DefaultCellDepResolver {
                     NetworkInfo::devnet()
                 };
 
-            if let Some((v1_dep_hash, v1_dep_index)) = MultisigScript::V2.dep_group(network_info) {
-                let multisig_v1_dep = CellDep::new_builder()
-                    .out_point(OutPoint::new(v1_dep_hash.pack(), v1_dep_index))
+            if let Some((v2_dep_hash, v2_dep_index)) = MultisigScript::V2.dep_group(network_info) {
+                let multisig_v2_dep = CellDep::new_builder()
+                    .out_point(OutPoint::new(v2_dep_hash.pack(), v2_dep_index))
                     .dep_type(DepType::DepGroup.into())
                     .build();
 
                 items.insert(
                     MultisigScript::V2.script_id(),
                     (
-                        multisig_v1_dep,
-                        "Secp256k1 blake160 multisig(v1) all".to_string(),
+                        multisig_v2_dep,
+                        "Secp256k1 blake160 multisig(v2) all".to_string(),
                     ),
                 );
             }

src/transaction/handler/multisig.rs

@@ -49,10 +49,6 @@ impl Secp256k1Blake160MultisigAllScriptHandler {
         Ok(ret)
     }
 
-    pub fn new_with_network(network: &NetworkInfo) -> Result<Self, TxBuilderError> {
-        Self::new(network, MultisigScript::Legacy)
-    }
-
     pub fn new_with_customize(multisig_script: MultisigScript, cell_deps: Vec<CellDep>) -> Self {
         Self {
             multisig_script,

src/types/address.rs

@@ -267,9 +267,11 @@ impl From<Script> for AddressPayload {
             && code_hash_h256 == MultisigScript::V2.script_id().code_hash
             && args.len() == 20
         {
-            let index = CodeHashIndex::Multisig;
-            let hash = H160::from_slice(args.as_ref()).unwrap();
-            AddressPayload::Short { index, hash }
+            AddressPayload::Full {
+                hash_type,
+                code_hash,
+                args,
+            }
         } else if hash_type == ScriptHashType::Type
             && (code_hash_h256 == ACP_TYPE_HASH_LINA || code_hash_h256 == ACP_TYPE_HASH_AGGRON)
             && args.len() == 20

src/unlock/signer.rs

@@ -2,10 +2,9 @@ use std::{collections::HashSet, convert::TryFrom};
 
 use anyhow::anyhow;
 use ckb_hash::{blake2b_256, new_blake2b};
-use ckb_jsonrpc_types::ScriptHashType;
 use ckb_types::{
     bytes::{Bytes, BytesMut},
-    core::TransactionView,
+    core::{ScriptHashType, TransactionView},
     error::VerificationError,
     packed::{self, BytesOpt, Script, WitnessArgs},
     prelude::*,
@@ -178,7 +177,7 @@ impl MultisigConfig {
         let multisig_script_id = multisig_script.script_id();
         Ok(MultisigConfig {
             lock_code_hash: multisig_script_id.code_hash,
-            lock_hash_type: multisig_script_id.hash_type.into(),
+            lock_hash_type: multisig_script_id.hash_type,
             sighash_addresses,
             require_first_n,
             threshold,