Merge pull request #593 from jjyr/fix-deploy-with-multisig

Fix deploy with multisig
nervosnetwork · Mar 27, 2024 · fd87f8f · fd87f8f
2 parents 6b793d2 + b6c3c67
commit fd87f8f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src/subcommands/deploy/deployment.rs b/src/subcommands/deploy/deployment.rs
@@ -27,6 +27,8 @@ pub struct Cell {
     pub name: String,
     pub location: CellLocation,
     pub enable_type_id: bool,
+    #[serde(default)]
+    pub force_redeploy: bool,
 }
 
 #[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]

diff --git a/src/subcommands/deploy/mod.rs b/src/subcommands/deploy/mod.rs
@@ -738,7 +738,8 @@ fn load_cells(
             let lock_script_unchanged = lock_script.as_slice() == old_lock_script.as_slice();
             let type_id_unchanged = old_recipe.type_id.is_some() == config.enable_type_id;
             // NOTE: we trust `old_recipe.data_hash` here
-            if data_unchanged && lock_script_unchanged && type_id_unchanged {
+            if data_unchanged && lock_script_unchanged && type_id_unchanged && !cell.force_redeploy
+            {
                 StateChange::Unchanged {
                     data,
                     data_hash,

diff --git a/src/subcommands/tx.rs b/src/subcommands/tx.rs
@@ -811,17 +811,9 @@ impl TryFrom<ReprMultisigConfig> for MultisigConfig {
             .sighash_addresses
             .into_iter()
             .map(|address_string| {
-                if let AddressPayload::Short { index, hash } =
-                    Address::from_str(&address_string).map(|addr| addr.payload().clone())?
-                {
-                    if index == CodeHashIndex::Sighash {
-                        Ok(hash)
-                    } else {
-                        Err(format!("invalid address: {}", address_string))
-                    }
-                } else {
-                    Err(format!("invalid address: {}", address_string))
-                }
+                Address::from_str(&address_string)
+                    .map(|addr| H160::from_slice(addr.payload().args().as_ref()))?
+                    .map_err(|err| format!("invalid address: {address_string} error: {err:?}"))
             })
             .collect::<Result<Vec<_>, String>>()?;
         MultisigConfig::new_with(sighash_addresses, repr.require_first_n, repr.threshold)