fix: kaspa his (#4509)

OneKeyHQ · Apr 26, 2024 · 1275f15 · 1275f15
1 parent 565240a
commit 1275f15
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 2 deletions.
diff --git a/packages/engine/src/vaults/impl/kaspa/sdk/transactionUtils.test.ts b/packages/engine/src/vaults/impl/kaspa/sdk/transactionUtils.test.ts
@@ -645,6 +645,94 @@ const cases = [
       fee: new BigNumber('0.00003154'),
     },
   },
+  {
+    testId: 'test-other-to-multi-self-and-other',
+    data: {
+      mass: '3154',
+      mineAddress:
+        'kaspa:qz3xsrquk2t7prvkam54mgh3ru6uxs0scgdq98lql0hf2xh08zp8shclpaz4e',
+      inputs: [
+        generateInput(
+          'kaspa:qpa0mtj40e5uqpq06sf44hluvru5smajraxt4c3nl4km86zt537929zjp27tu',
+          10000n,
+        ),
+        generateInput(
+          'kaspa:qpa0mtj40e5uqpq06sf44hluvru5smajraxt4c3nl4km86zt537929zjp27tu',
+          10000n,
+        ),
+      ],
+      outputs: [
+        generateOutput(
+          'kaspa:qz3xsrquk2t7prvkam54mgh3ru6uxs0scgdq98lql0hf2xh08zp8shclpaz4e',
+          5000n,
+        ),
+        generateOutput(
+          'kaspa:qpw28f6nq2zwt30ywf2yahtqqtp6l6uv37zd8fegltf9tfy8yaflk4fvlp8mp',
+          5000n,
+        ),
+        generateOutput(
+          'kaspa:qpw28f6nq2zwt30ywf2yahtqqtp6l6uv37zd8fegltf9tfy8yaflk4fvlp8mp',
+          6846n,
+        ),
+      ],
+    },
+    result: {
+      fromAddress:
+        'kaspa:qpa0mtj40e5uqpq06sf44hluvru5smajraxt4c3nl4km86zt537929zjp27tu',
+      toAddress: [
+        {
+          address:
+            'kaspa:qz3xsrquk2t7prvkam54mgh3ru6uxs0scgdq98lql0hf2xh08zp8shclpaz4e',
+          amount: 5000n,
+        },
+      ],
+      fee: new BigNumber('0.00003154'),
+    },
+  },
+  {
+    testId: 'test-other-to-multi-self-and-other-with-change',
+    data: {
+      mass: '3154',
+      mineAddress:
+        'kaspa:qz3xsrquk2t7prvkam54mgh3ru6uxs0scgdq98lql0hf2xh08zp8shclpaz4e',
+      inputs: [
+        generateInput(
+          'kaspa:qpa0mtj40e5uqpq06sf44hluvru5smajraxt4c3nl4km86zt537929zjp27tu',
+          10000n,
+        ),
+        generateInput(
+          'kaspa:qpa0mtj40e5uqpq06sf44hluvru5smajraxt4c3nl4km86zt537929zjp27tu',
+          10000n,
+        ),
+      ],
+      outputs: [
+        generateOutput(
+          'kaspa:qpa0mtj40e5uqpq06sf44hluvru5smajraxt4c3nl4km86zt537929zjp27tu',
+          6846n,
+        ),
+        generateOutput(
+          'kaspa:qz3xsrquk2t7prvkam54mgh3ru6uxs0scgdq98lql0hf2xh08zp8shclpaz4e',
+          5000n,
+        ),
+        generateOutput(
+          'kaspa:qpw28f6nq2zwt30ywf2yahtqqtp6l6uv37zd8fegltf9tfy8yaflk4fvlp8mp',
+          5000n,
+        ),
+      ],
+    },
+    result: {
+      fromAddress:
+        'kaspa:qpa0mtj40e5uqpq06sf44hluvru5smajraxt4c3nl4km86zt537929zjp27tu',
+      toAddress: [
+        {
+          address:
+            'kaspa:qz3xsrquk2t7prvkam54mgh3ru6uxs0scgdq98lql0hf2xh08zp8shclpaz4e',
+          amount: 5000n,
+        },
+      ],
+      fee: new BigNumber('0.00003154'),
+    },
+  },
 ];
 
 describe('test kaspa tx decode', () => {

diff --git a/packages/engine/src/vaults/impl/kaspa/sdk/transactionUtils.ts b/packages/engine/src/vaults/impl/kaspa/sdk/transactionUtils.ts
@@ -63,8 +63,11 @@ function determineToAddresses(
   );
 
   outputs?.forEach((output) => {
-    // 如果输出地址不在输入地址中，它就不是找零，应该被包括
-    if (!inputAddresses.has(output.script_public_key_address)) {
+    if (hasSenderIncludeMine) {
+      if (!inputAddresses.has(output.script_public_key_address)) {
+        toAddresses.add(output.script_public_key_address);
+      }
+    } else if (output.script_public_key_address === mineAddress) {
       toAddresses.add(output.script_public_key_address);
     }
   });