feat: extract htlc secret

Author: anyxem

examples/demo/index.html

@@ -73,6 +73,7 @@ <h1 class="text-3xl font-bold text-center text-blue-600 mb-6">Mintlayer Wallet D
                 <button onclick="toggleSection('requestSecretHash')" class="bg-gray-200 text-gray-700 py-2 px-4 rounded-md hover:bg-gray-300 transition">Request Secret Hash</button>
                 <button onclick="toggleSection('createHtlc')" class="bg-gray-200 text-gray-700 py-2 px-4 rounded-md hover:bg-gray-300 transition">Create Htlc</button>
                 <button onclick="toggleSection('refundHtlc')" class="bg-gray-200 text-gray-700 py-2 px-4 rounded-md hover:bg-gray-300 transition">Refund Htlc</button>
+                <button onclick="toggleSection('extractHtlcSecret')" class="bg-gray-200 text-gray-700 py-2 px-4 rounded-md hover:bg-gray-300 transition">Extract Htlc secret</button>
             </div>
 
             <!-- Transfer Section -->
@@ -367,6 +368,16 @@ <h3 class="text-lg font-semibold text-gray-700 mb-4">Refund HTLC</h3>
                     <button onclick="refundHTLC()" class="bg-green-500 text-white py-2 px-4 rounded-md shadow hover:bg-green-600 transition w-full">Refund HTLC</button>
                 </div>
             </div>
+
+            <!-- Extract HTLC Secret Section -->
+            <div id="extractHtlcSecret" class="bg-white p-6 rounded-lg shadow-md hidden">
+                <h3 class="text-lg font-semibold text-gray-700 mb-4">Refund HTLC</h3>
+                <div class="space-y-4">
+                    <input type="text" id="extract_htlc_transaction_id" placeholder="Transaction ID with HTLC spend" class="w-full border border-gray-300 rounded-md p-2 focus:ring-2 focus:ring-blue-500 focus:outline-none" />
+                    <input type="text" id="extract_htlc_transaction_hex" placeholder="Transaction HEX" class="w-full border border-gray-300 rounded-md p-2 focus:ring-2 focus:ring-blue-500 focus:outline-none" />
+                    <button onclick="extractHTLCSecret()" class="bg-green-500 text-white py-2 px-4 rounded-md shadow hover:bg-green-600 transition w-full">Extract HTLC Secret</button>
+                </div>
+            </div>
         </div>
     </div>
 
@@ -390,7 +401,7 @@ <h3 class="text-xl font-semibold text-gray-700 mb-4">Output</h3>
       'lockTokenSupply', 'changeTokenAuthority', 'changeTokenMetadata', 'createOrder',
       'fillOrder', 'concludeOrder', 'bridgeRequest', 'broadcastTx', 'freezeToken',
       'unfreezeToken', 'burn', 'dataDeposit', 'createDelegation', 'delegationStake',
-      'delegationWithdraw', 'signChallenge', 'createHtlc', 'refundHtlc', 'requestSecretHash'
+      'delegationWithdraw', 'signChallenge', 'createHtlc', 'refundHtlc', 'requestSecretHash', 'extractHtlcSecret'
     ];
     sections.forEach(id => {
       const el = document.getElementById(id);
@@ -994,11 +1005,28 @@ <h3 class="text-xl font-semibold text-gray-700 mb-4">Output</h3>
     const transaction_id = document.getElementById('refund_htlc_transaction_id').value;
 
     try {
-      const { signature } = await window.mintlayer.refundHtlc({
+      const result = await window.mintlayer.refundHtlc({
         transaction_id,
       });
 
-      displayOutput(`Signature: ${JSON.stringify(signature, null, 2)}`);
+      displayOutput(`Signature: ${JSON.stringify(result, null, 2)}`);
+    } catch (error) {
+      displayOutput(`Error: ${error.message}`);
+    }
+  }
+
+  async function extractHTLCSecret () {
+    const transaction_id = document.getElementById('extract_htlc_transaction_id').value;
+    const transaction_hex = document.getElementById('extract_htlc_transaction_hex').value;
+
+    try {
+      const result = await window.mintlayer.extractHtlcSecret({
+        transaction_id,
+        transaction_hex,
+        format: 'hex'
+      });
+
+      displayOutput(`Secret HEX: ${JSON.stringify(result, null, 2)}`);
     } catch (error) {
       displayOutput(`Error: ${error.message}`);
     }

packages/sdk/src/mintlayer-connect-sdk.ts

@@ -81,6 +81,12 @@ function hexToUint8Array(hex: any) {
   return array;
 }
 
+function uint8ArrayToHex(bytes: Uint8Array): string {
+  return Array.from(bytes)
+    .map(b => b.toString(16).padStart(2, '0'))
+    .join('');
+}
+
 export function atomsToDecimal(atoms: string | number, decimals: number): string {
   const atomsStr = atoms.toString();
   const atomsLength = atomsStr.length;
@@ -2073,7 +2079,13 @@ class Client {
     const data = await response.json();
 
     // @ts-ignore
-    const forceSpendUtxo: UtxoEntry[] = arg?.opts?.forceSpendUtxo || [];
+    const forceSpendUtxo: UtxoEntry[] = arg?.opts?.forceSpendUtxo ? arg?.opts?.forceSpendUtxo.map((item: UtxoEntry) => ({
+      input: {
+        ...item.outpoint,
+        input_type: 'UTXO',
+      },
+      utxo: item.utxo,
+    })) : [];
 
     const utxos: UtxoEntry[] = data.utxos;
 
@@ -2478,17 +2490,18 @@ class Client {
     const outputsArray = outputsArrayItems.filter((x): x is NonNullable<typeof x> => x !== undefined);
 
     const inputAddresses: string[] = (transactionJSONrepresentation.inputs as UtxoInput[])
-      .filter(({ input, utxo }) => input.input_type === 'UTXO')
+      // @ts-ignore
+      .filter(({ input, utxo }) => input.input_type === 'UTXO' || utxo.htlc)
       .map((input) => {
         if (input.utxo.destination){
           return input.utxo.destination;
         }
         // @ts-ignore
         if (input.utxo.htlc) {
           // @ts-ignore
-          return input.utxo.htlc.refund_key; // TODO: need to handle spend too
+          return [input.utxo.htlc.spend_key, input.utxo.htlc.refund_key]; // TODO: need to handle spend too
         }
-      });
+      }).flat();
 
     // @ts-ignore
     if (transactionJSONrepresentation.inputs[0].input.account_type === 'DelegationBalance') {
@@ -3060,6 +3073,7 @@ class Client {
     const {
       transaction_id,
       transaction_hex,
+      format = 'Uint8Array', // 'bytes' or 'hex'
     } = arg;
 
     const res = await fetch(`${this.getApiServer()}/transaction/${transaction_id}`);
@@ -3092,6 +3106,10 @@ class Client {
       htlc_output_index
     );
 
+    if(format === 'hex') {
+      return uint8ArrayToHex(secret);
+    }
+
     return secret;
   }