Update/composables

apps/web/package.json

@@ -9,7 +9,6 @@
   },
   "dependencies": {
     "@heroicons/vue": "^1.0.6",
-    "@solana/web3.js": "^1.63.1",
     "@walletconnect/sign-client": "^2.9.2",
     "@walletconnect/types": "^2.9.2",
     "@walletconnect/universal-provider": "^2.9.2",

apps/web/src/App.vue

@@ -1,30 +1,6 @@
 <script lang="ts" setup>
   import { RouterView } from 'vue-router'
   import DefaultLayout from '@/layouts/default-layout.vue'
-  import useTxData from '@/mockData/mock_transaction_data'
-  import { onMounted, watch } from 'vue'
-  import useUsers from '@/composables/users'
-
-  const { mockData } = useTxData()
-  // Need this to fix initilizing bug between user.ts and ssv.ts
-  const { user } = useUsers()
-
-  const runMockData = () =>{
-    if(user.value?.accounts.length && user.value?.accounts.length > 0){
-      const walletAddresses = user.value?.accounts.map(item => {
-        return item.address
-      }) as string[]
-      mockData(walletAddresses)
-    }
-  }
-
-  watch(user, () =>{
-    runMockData()
-  })
-
-  onMounted(() => {
-    runMockData()
-  })
 </script>
 
 <template>

apps/web/src/composables/auth.ts

@@ -1,5 +1,5 @@
 import useEnvironment from '@/composables/environment'
-import { LoginCredentials } from '@casimir/types'
+import { SignInWithEthereumCredentials } from '@casimir/types'
 
 const { domain, origin, usersUrl } = useEnvironment()
 
@@ -45,17 +45,17 @@ export default function useAuth() {
      * Signs user up if they don't exist, otherwise
      * logs the user in with an address, message, and signed message
      * 
-     * @param {LoginCredentials} loginCredentials - The user's address, provider, currency, message, and signed message 
+     * @param {SignInWithEthereumCredentials} signInWithEthereumCredentials - The user's address, provider, currency, message, and signed message 
      * @returns {Promise<Response>} - The response from the login request
      */
-    async function signInWithEthereum(loginCredentials: LoginCredentials): Promise<void> {
+    async function signInWithEthereum(signInWithEthereumCredentials: SignInWithEthereumCredentials): Promise<void> {
         try {
             const requestOptions = {
                 method: 'POST',
                 headers: { 
                     'Content-Type': 'application/json'
                 },
-                body: JSON.stringify(loginCredentials)
+                body: JSON.stringify(signInWithEthereumCredentials)
             }
             const response = await fetch(`${usersUrl}/auth/login`, requestOptions)
             const { error, message } = await response.json()

apps/web/src/composables/coldStorage.ts

@@ -0,0 +1,28 @@
+import useLedger from '@/composables/ledger'
+import useTrezor from '@/composables/trezor'
+import { Currency, ProviderString } from '@casimir/types'
+
+export default function useWallet() {
+  const { getLedgerAddress } = useLedger()
+  const { getTrezorAddress } = useTrezor()
+
+  function getColdStorageAddress(provider: ProviderString, currency: Currency = 'ETH') {
+    if (provider === 'Ledger') {
+      new Promise((resolve, reject) => {
+        resolve(getLedgerAddress[currency]())
+      })
+    } else if (provider === 'Trezor') {
+      new Promise((resolve, reject) => {
+        resolve(getTrezorAddress[currency]())
+      })
+    } else {
+      return new Promise((resolve, reject) => {
+        resolve('Cold storage provider not yet supported')
+      })
+    }
+  }
+
+  return {
+    getColdStorageAddress
+  }
+}