From b46e8b7877219b968c340b4a826223e240499c2f Mon Sep 17 00:00:00 2001
From: Junhui Kim <junhuikim.dev@gmail.com>
Date: Tue, 9 Feb 2021 04:09:18 +0900
Subject: [PATCH] fix: fix sending signed transaction interface bug

---
 .../src/controllers/eth/wallets.controller.ts    | 16 +++++++++++++++-
 .../src/controllers/klay/wallets.controller.ts   | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/packages/enclave/src/controllers/eth/wallets.controller.ts b/packages/enclave/src/controllers/eth/wallets.controller.ts
index 9cee66e3..e826f2e2 100644
--- a/packages/enclave/src/controllers/eth/wallets.controller.ts
+++ b/packages/enclave/src/controllers/eth/wallets.controller.ts
@@ -447,8 +447,22 @@ export default class WalletsController
       req.params.masterWalletId
     );
 
+    const signedMultiSigPayload = req.body.signedMultiSigPayload;
     return masterWallet.sendTransaction(
-      req.body as SignedMultiSigPayload,
+      {
+        signature: signedMultiSigPayload.signature,
+        multiSigPayload: {
+          walletAddress: signedMultiSigPayload.multiSigPayload.walletAddress,
+          toAddress: signedMultiSigPayload.multiSigPayload.toAddress,
+          value: BNConverter.hexStringToBN(
+            signedMultiSigPayload.multiSigPayload.value
+          ),
+          walletNonce: BNConverter.hexStringToBN(
+            signedMultiSigPayload.multiSigPayload.walletNonce
+          ),
+          hexData: signedMultiSigPayload.multiSigPayload.hexData,
+        },
+      },
       masterWallet.getId(),
       null,
       req.body.gasPrice
diff --git a/packages/enclave/src/controllers/klay/wallets.controller.ts b/packages/enclave/src/controllers/klay/wallets.controller.ts
index 3edbafa0..6afe0e6b 100644
--- a/packages/enclave/src/controllers/klay/wallets.controller.ts
+++ b/packages/enclave/src/controllers/klay/wallets.controller.ts
@@ -421,8 +421,22 @@ export default class WalletsController
       req.params.masterWalletId
     );
 
+    const signedMultiSigPayload = req.body.signedMultiSigPayload;
     return masterWallet.sendTransaction(
-      req.body as SignedMultiSigPayload,
+      {
+        signature: signedMultiSigPayload.signature,
+        multiSigPayload: {
+          walletAddress: signedMultiSigPayload.multiSigPayload.walletAddress,
+          toAddress: signedMultiSigPayload.multiSigPayload.toAddress,
+          value: BNConverter.hexStringToBN(
+            signedMultiSigPayload.multiSigPayload.value
+          ),
+          walletNonce: BNConverter.hexStringToBN(
+            signedMultiSigPayload.multiSigPayload.walletNonce
+          ),
+          hexData: signedMultiSigPayload.multiSigPayload.hexData,
+        },
+      },
       masterWallet.getId(),
       null,
       req.body.gasPrice