From ecbdae969203498b454b56986fe2272a15be0cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Diamond?=
 <32074058+Andre-Diamond@users.noreply.github.com>
Date: Fri, 24 Oct 2025 08:17:56 +0200
Subject: [PATCH 1/2] fix(multisig): update fallback logic in multisig import
 validation

- Modified the fallback mechanism to return an empty string when no aligned stake key is available, improving clarity in the validation process.
- Ensured consistency in return values for stake key handling, aligning with the expected format.
---
 src/utils/validateMultisigImport.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/validateMultisigImport.ts b/src/utils/validateMultisigImport.ts
index 0643dec..72e7b7e 100644
--- a/src/utils/validateMultisigImport.ts
+++ b/src/utils/validateMultisigImport.ts
@@ -425,10 +425,10 @@ export async function validateMultisigImportPayload(payload: unknown): Promise<V
             if (m?.matched && typeof m.signerIndex === "number") {
                 const idx = m.signerIndex;
                 const hex = (signerStakeKeys[idx] || "").toLowerCase();
-                return hex && /^[0-9a-f]{56}$/.test(hex) ? hex : (stakeSigKeyHashes[i] || "").toLowerCase();
+                return hex && /^[0-9a-f]{56}$/.test(hex) ? hex : "";
             }
-            // Fallback to stake script's key hash at same position, or empty string
-            return (stakeSigKeyHashes[i] || "").toLowerCase();
+            // Fallback to empty string when no aligned stake key is available
+            return "";
         });
         // Recompute stakeAddressesUsed to stay positionally aligned with the reordered stake keys
         stakeAddressesUsedFinal = signerStakeKeysOrdered.map((hex) => {

From 3ce4b756b05b57039c797c9aedf7f12d1018f04b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Diamond?=
 <32074058+Andre-Diamond@users.noreply.github.com>
Date: Fri, 24 Oct 2025 08:48:00 +0200
Subject: [PATCH 2/2] refactor(multisig): improve fallback logic for deriving
 reward addresses

- Updated the fallback mechanism in the multisig import validation to derive reward addresses directly from script key hashes when no matching stake key is found.
- Enhanced error handling to ensure robustness during address resolution attempts, maintaining consistency in return values.
---
 src/utils/validateMultisigImport.ts | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/utils/validateMultisigImport.ts b/src/utils/validateMultisigImport.ts
index 72e7b7e..90ca33c 100644
--- a/src/utils/validateMultisigImport.ts
+++ b/src/utils/validateMultisigImport.ts
@@ -459,7 +459,7 @@ export async function validateMultisigImportPayload(payload: unknown): Promise<V
             // Fallback: use the keyHash itself where no stake key was provided
             return sig.toLowerCase();
         });
-        // Build stakeAddressesUsed positionally: reward addresses for matched keys, else raw key hash placeholders
+        // Build stakeAddressesUsed positionally: reward addresses for matched keys, else derive from script key hash
         stakeAddressesUsedFinal = stakeSigKeyHashes.map((sig) => {
             const m = lowerMatches.get(sig.toLowerCase());
             const providedStakeHex = m?.signerStakeKey;
@@ -481,8 +481,22 @@ export async function validateMultisigImportPayload(payload: unknown): Promise<V
                 // If we couldn't build a valid reward address, fall back to the hex itself
                 return hex;
             }
-            // No match: use the script key hash in this position
-            return sig.toLowerCase();
+            // No match: attempt to build a reward address directly from the script key hash
+            const hex = sig.toLowerCase();
+            const tryNetworks: Array<0 | 1> = network === undefined ? [0, 1] : [network as 0 | 1];
+            for (const netId of tryNetworks) {
+                try {
+                    const addr = serializeRewardAddress(hex, false, netId);
+                    const resolved = stakeKeyHash(addr)?.toLowerCase();
+                    if (resolved === hex) {
+                        return addr;
+                    }
+                } catch {
+                    // continue to next
+                }
+            }
+            // If unable to derive, fall back to the raw key hash
+            return hex;
         });
     }