feat: add non-sequential AddressHashMode for multi-sig

hirosystems · Jul 1, 2024 · 7e533bd · 7e533bd
1 parent 9e2aa26
commit 7e533bd
Show file tree

Hide file tree

Showing 4 changed files with 226 additions and 125 deletions.
diff --git a/index.ts b/index.ts
@@ -280,8 +280,12 @@ export enum TxSpendingConditionSingleSigHashMode {
 export enum TxSpendingConditionMultiSigHashMode {
     /** hash160(multisig-redeem-script), same as bitcoin's multisig p2sh */
     P2SH = 0x01,
+    /** hash160(multisig-redeem-script), same as bitcoin's multisig p2sh (non-sequential signing) */
+    P2SHNonSequential = 0x05,
     /** hash160(segwit-program-00(public-keys)), same as bitcoin's p2sh-p2wsh */
     P2WSH = 0x03,
+    /** hash160(segwit-program-00(public-keys)), same as bitcoin's p2sh-p2wsh (non-sequential signing) */
+    P2WSHNonSequential = 0x07,
 }
 
 export enum ClarityVersion {

diff --git a/src/address/stacks_address.rs b/src/address/stacks_address.rs
@@ -40,10 +40,12 @@ impl StacksAddress {
 pub enum AddressHashMode {
     // serialization modes for public keys to addresses.
     // We support four different modes due to legacy compatibility with Stacks v1 addresses:
-    SerializeP2PKH = 0x00,  // hash160(public-key), same as bitcoin's p2pkh
-    SerializeP2SH = 0x01,   // hash160(multisig-redeem-script), same as bitcoin's multisig p2sh
+    SerializeP2PKH = 0x00, // hash160(public-key), same as bitcoin's p2pkh
+    SerializeP2SH = 0x01,  // hash160(multisig-redeem-script), same as bitcoin's multisig p2sh
+    SerializeP2SHNonSequential = 0x05, // hash160(multisig-redeem-script), same as bitcoin's multisig p2sh (non-sequential signing)
     SerializeP2WPKH = 0x02, // hash160(segwit-program-00(p2pkh)), same as bitcoin's p2sh-p2wpkh
     SerializeP2WSH = 0x03,  // hash160(segwit-program-00(public-keys)), same as bitcoin's p2sh-p2wsh
+    SerializeP2WSHNonSequential = 0x07, // hash160(segwit-program-00(public-keys)), same as bitcoin's p2sh-p2wsh (non-sequential signing)
 }
 
 impl AddressHashMode {
@@ -70,10 +72,16 @@ impl TryFrom<u8> for AddressHashMode {
         match value {
             x if x == AddressHashMode::SerializeP2PKH as u8 => Ok(AddressHashMode::SerializeP2PKH),
             x if x == AddressHashMode::SerializeP2SH as u8 => Ok(AddressHashMode::SerializeP2SH),
+            x if x == AddressHashMode::SerializeP2SHNonSequential as u8 => {
+                Ok(AddressHashMode::SerializeP2SHNonSequential)
+            }
             x if x == AddressHashMode::SerializeP2WPKH as u8 => {
                 Ok(AddressHashMode::SerializeP2WPKH)
             }
             x if x == AddressHashMode::SerializeP2WSH as u8 => Ok(AddressHashMode::SerializeP2WSH),
+            x if x == AddressHashMode::SerializeP2WSHNonSequential as u8 => {
+                Ok(AddressHashMode::SerializeP2WSHNonSequential)
+            }
             _ => Err(format!("Invalid version {}", value)),
         }
     }

diff --git a/src/stacks_tx/deserialize.rs b/src/stacks_tx/deserialize.rs
@@ -308,7 +308,13 @@ impl MultisigHashMode {
     pub fn from_u8(n: u8) -> Option<MultisigHashMode> {
         match n {
             x if x == MultisigHashMode::P2SH as u8 => Some(MultisigHashMode::P2SH),
+            x if x == MultisigHashMode::P2SHNonSequential as u8 => {
+                Some(MultisigHashMode::P2SHNonSequential)
+            }
             x if x == MultisigHashMode::P2WSH as u8 => Some(MultisigHashMode::P2WSH),
+            x if x == MultisigHashMode::P2WSHNonSequential as u8 => {
+                Some(MultisigHashMode::P2WSHNonSequential)
+            }
             _ => None,
         }
     }
@@ -632,7 +638,9 @@ pub struct SinglesigSpendingCondition {
 #[derive(PartialEq, Copy, Clone)]
 pub enum MultisigHashMode {
     P2SH = 0x01,
+    P2SHNonSequential = 0x05,
     P2WSH = 0x03,
+    P2WSHNonSequential = 0x07,
 }
 
 #[repr(u8)]