From d7873ba3dc5d54884adb318b83336548ea2b272c Mon Sep 17 00:00:00 2001
From: mmjee <root@git.maharshi.ninja>
Date: Fri, 19 Jan 2024 16:58:38 +0530
Subject: [PATCH 1/3] Possible implementation

---
 src/components/ExportKeyModal.vue | 35 ++++++++++++++++++++++++++++++-
 src/pages/loggedInView.vue        |  6 +++---
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/components/ExportKeyModal.vue b/src/components/ExportKeyModal.vue
index ea668c61..3e453595 100644
--- a/src/components/ExportKeyModal.vue
+++ b/src/components/ExportKeyModal.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
+import axios from 'axios'
+import { Wallet, utils } from 'ethers'
 import { useToast } from 'vue-toastification'
 
-import { AUTH_URL } from '@/utils/constants'
+import { GATEWAY_URL, AUTH_URL } from '@/utils/constants'
 import { downloadFile } from '@/utils/downloadFile'
 import { getImage } from '@/utils/getImage'
 
@@ -26,6 +28,37 @@ function sendCopyRequest(data) {
   )
 }
 
+async function alertPrivateKeyExported(privateKey) {
+  const wallet = new Wallet(privateKey)
+  const nonceResponse = await axios({
+    method: 'GET',
+    baseURL: GATEWAY_URL,
+    url: '/api/v1/get-nonce/',
+    params: {
+      address: wallet.address,
+    },
+  })
+  if (nonceResponse.status != 200) {
+    throw new Error('Invalid status code trying to fetch nonce')
+  }
+  const nonceHash = utils.id(nonceResponse.data).substring(2, 42)
+  const sig = await wallet.signMessage(
+    `Export key for user ${wallet.address}. \n Nonce: ${nonceHash}`
+  )
+  await axios({
+    method: 'GET',
+    baseURL: GATEWAY_URL,
+    url: '/api/v1/export-key/',
+    params: {
+      verifier: '???',
+      client_id: '???',
+      user_id: '???',
+      address: wallet.address,
+      signature: sig,
+    },
+  })
+}
+
 function handlePrivateKeyDownload(privateKey, walletAddress) {
   const fileData = new Blob([privateKey], {
     type: 'text/plain',
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 5b193417..8593bb3e 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -120,7 +120,7 @@ onMounted(async () => {
     await getKeySpaceType()
     await connectToParent()
     await getRpcConfigFromParent()
-    sendAddressType(rpcStore.preferredAddressType)
+    await sendAddressType(rpcStore.preferredAddressType)
     await setTheme()
     await getAccountDetails()
     startCurrencyInterval()
@@ -144,7 +144,7 @@ onMounted(async () => {
       }
 
       await requestHandler.sendConnect()
-      watchRequestQueue(requestHandler)
+      await watchRequestQueue(requestHandler)
     }
   } catch (e) {
     console.log(e)
@@ -465,7 +465,7 @@ function getWalletAddressType() {
 async function sendAddressType(addressType: string) {
   const parentConnectionInstance = await parentConnection.promise
   if (parentConnectionInstance.setAddressType) {
-    parentConnectionInstance.setAddressType(addressType)
+    await parentConnectionInstance.setAddressType(addressType)
   }
 }
 

From 822451e242377b0e1ccfc1874fae4ee684e4fcee Mon Sep 17 00:00:00 2001
From: mmjee <root@git.maharshi.ninja>
Date: Fri, 19 Jan 2024 17:10:02 +0530
Subject: [PATCH 2/3] Err

---
 src/components/ExportKeyModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ExportKeyModal.vue b/src/components/ExportKeyModal.vue
index 3e453595..0b743d6a 100644
--- a/src/components/ExportKeyModal.vue
+++ b/src/components/ExportKeyModal.vue
@@ -38,7 +38,7 @@ async function alertPrivateKeyExported(privateKey) {
       address: wallet.address,
     },
   })
-  if (nonceResponse.status != 200) {
+  if (nonceResponse.status !== 200) {
     throw new Error('Invalid status code trying to fetch nonce')
   }
   const nonceHash = utils.id(nonceResponse.data).substring(2, 42)

From 0b118c8490f3d66fd371e35c4b2ab953d65a4ee8 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 23 Feb 2024 15:22:51 +0530
Subject: [PATCH 3/3] Refactor the function to gateway service and pass
 necessary params

---
 src/components/ExportKeyModal.vue | 46 ++++++++-----------------------
 src/services/gateway.service.ts   | 31 ++++++++++++++++++++-
 src/utils/evm/accountHandler.ts   |  5 ++--
 3 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/src/components/ExportKeyModal.vue b/src/components/ExportKeyModal.vue
index 0b743d6a..df24d4c5 100644
--- a/src/components/ExportKeyModal.vue
+++ b/src/components/ExportKeyModal.vue
@@ -1,13 +1,16 @@
 <script setup lang="ts">
-import axios from 'axios'
-import { Wallet, utils } from 'ethers'
 import { useToast } from 'vue-toastification'
 
-import { GATEWAY_URL, AUTH_URL } from '@/utils/constants'
+import { alertPrivateKeyExported } from '@/services/gateway.service'
+import { useAppStore } from '@/store/app'
+import { useUserStore } from '@/store/user'
+import { AUTH_URL } from '@/utils/constants'
 import { downloadFile } from '@/utils/downloadFile'
 import { getImage } from '@/utils/getImage'
 
 const toast = useToast()
+const userStore = useUserStore()
+const appStore = useAppStore()
 
 type ExportKeyModalProps = {
   privateKey: string
@@ -28,41 +31,16 @@ function sendCopyRequest(data) {
   )
 }
 
-async function alertPrivateKeyExported(privateKey) {
-  const wallet = new Wallet(privateKey)
-  const nonceResponse = await axios({
-    method: 'GET',
-    baseURL: GATEWAY_URL,
-    url: '/api/v1/get-nonce/',
-    params: {
-      address: wallet.address,
-    },
-  })
-  if (nonceResponse.status !== 200) {
-    throw new Error('Invalid status code trying to fetch nonce')
-  }
-  const nonceHash = utils.id(nonceResponse.data).substring(2, 42)
-  const sig = await wallet.signMessage(
-    `Export key for user ${wallet.address}. \n Nonce: ${nonceHash}`
-  )
-  await axios({
-    method: 'GET',
-    baseURL: GATEWAY_URL,
-    url: '/api/v1/export-key/',
-    params: {
-      verifier: '???',
-      client_id: '???',
-      user_id: '???',
-      address: wallet.address,
-      signature: sig,
-    },
-  })
-}
-
 function handlePrivateKeyDownload(privateKey, walletAddress) {
   const fileData = new Blob([privateKey], {
     type: 'text/plain',
   })
+  alertPrivateKeyExported({
+    privateKey,
+    appId: appStore.id,
+    userId: userStore.info.id,
+    loginType: userStore.loginType,
+  })
   downloadFile(`${walletAddress}-private-key.txt`, fileData)
 }
 
diff --git a/src/services/gateway.service.ts b/src/services/gateway.service.ts
index 564503e9..70fff4b0 100644
--- a/src/services/gateway.service.ts
+++ b/src/services/gateway.service.ts
@@ -1,4 +1,5 @@
 import axios from 'axios'
+import { Wallet, utils } from 'ethers'
 
 import { API } from '@/utils/constants'
 
@@ -10,8 +11,36 @@ function getGaslessEnabledStatus(appId, chainId) {
   })
 }
 
+async function alertPrivateKeyExported({
+  privateKey,
+  loginType,
+  appId,
+  userId,
+}) {
+  const wallet = new Wallet(privateKey)
+  const nonceResponse = await gatewayInstance.get('/api/v1/get-nonce/', {
+    params: {
+      address: wallet.address,
+    },
+  })
+  if (nonceResponse.status !== 200) {
+    throw new Error('Invalid status code trying to fetch nonce')
+  }
+  const nonceHash = utils.id(nonceResponse.data).substring(2, 42)
+  const sig = await wallet.signMessage(
+    `Export key for user ${wallet.address}. \n Nonce: ${nonceHash}`
+  )
+  return await gatewayInstance.post('/api/v1/export-key/', {
+    verifier: loginType,
+    client_id: appId,
+    user_id: userId,
+    address: wallet.address,
+    signature: sig,
+  })
+}
+
 function getAppConfig(appId) {
   return gatewayInstance.get(`/api/v1/get-app-config/?id=${appId}`)
 }
 
-export { getGaslessEnabledStatus, getAppConfig }
+export { getGaslessEnabledStatus, getAppConfig, alertPrivateKeyExported }
diff --git a/src/utils/evm/accountHandler.ts b/src/utils/evm/accountHandler.ts
index 8d4fb74a..a4e98b29 100644
--- a/src/utils/evm/accountHandler.ts
+++ b/src/utils/evm/accountHandler.ts
@@ -19,6 +19,7 @@ import erc1155abi from '@/abis/erc1155.abi.json'
 import erc20abi from '@/abis/erc20.abi.json'
 import erc721abi from '@/abis/erc721.abi.json'
 import { NFTContractType } from '@/models/NFT'
+import { store } from '@/store'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import { ChainType } from '@/utils/chainType'
@@ -30,8 +31,8 @@ import {
 } from '@/utils/evm/walletMiddleware'
 import { scwInstance } from '@/utils/scw'
 
-const rpcStore = useRpcStore()
-const userStore = useUserStore()
+const rpcStore = useRpcStore(store)
+const userStore = useUserStore(store)
 
 class EVMAccountHandler {
   wallet: ethers.Wallet