Merge pull request #493 from consensusnetworks/update/wallet-connect

Update/wallet connect
consensusnetworks · Dec 20, 2023 · 19bf2e9 · 19bf2e9
2 parents 24795e6 + 7518c8e
commit 19bf2e9
Show file tree

Hide file tree

Showing 6 changed files with 118 additions and 103 deletions.
diff --git a/apps/mvp/src/components/ConnectWalletsFlow.vue b/apps/mvp/src/components/ConnectWalletsFlow.vue
@@ -10,7 +10,7 @@ import useLedger from "@/composables/ledger"
 import useTrezor from "@/composables/trezor"
 import useUser from "@/composables/user"
 import useWallets from "@/composables/wallets"
-import useWalletConnect from "@/composables/walletConnectV2"
+import useWalletConnect from "@/composables/walletConnect"
 // import useWallets from '@/composables/wallets'
 
 type UserAuthFlowState = 
@@ -40,7 +40,7 @@ const { getEthersLedgerAddresses } = useLedger()
 const { getEthersTrezorAddresses } = useTrezor()
 const { user } = useUser()
 const { detectActiveNetwork, switchEthersNetwork } = useWallets()
-const { connectWalletConnectV2 } = useWalletConnect()
+const { connectWalletConnect, walletConnectSelectedAccount } = useWalletConnect()
 // const { installedWallets, detectInstalledWalletProviders } = useWallets()
 
 // eslint-disable-next-line no-undef
@@ -164,7 +164,7 @@ async function selectProvider(provider: ProviderString): Promise<void> {
 
         if (provider === "WalletConnect") {
             // TODO: @@cali1 - pass in the network id dynamically
-            walletProviderAddresses.value = await connectWalletConnectV2(requiredNetwork) as CryptoAddress[]
+            walletProviderAddresses.value = await connectWalletConnect(requiredNetwork) as CryptoAddress[]
         } else if (browserProvidersList.includes(provider)) {
             walletProviderAddresses.value = await getEthersAddressesWithBalances(provider) as CryptoAddress[]
         } else if (provider === "Ledger") {
@@ -226,6 +226,12 @@ onUnmounted(() => {
         flowState.value = "select_provider"
     }
 })
+
+watch(walletConnectSelectedAccount, () => {
+    if (selectedProvider.value === "WalletConnect") {
+        walletProviderAddresses.value = walletConnectSelectedAccount.value as CryptoAddress[]
+    }
+})
 </script>
 
 <template>
@@ -374,7 +380,7 @@ onUnmounted(() => {
             @click="
               selectedProvider === 'Ledger' || selectedProvider === 'Trezor' ?
                 selectAddress(trimAndLowercaseAddress(act.address), pathIndex) :
-                selectAddress(trimAndLowercaseAddress(act.address), undefined)
+                selectAddress(act.address, undefined)
             "
           >
             <div>
@@ -678,4 +684,4 @@ onUnmounted(() => {
   letter-spacing: -0.01em;
   color: #667085;
 }
-</style>@/composables/eventBus
+</style>@/composables/eventBus@/composables/walletConnect
diff --git a/apps/mvp/src/composables/auth.ts b/apps/mvp/src/composables/auth.ts
@@ -5,7 +5,7 @@ import useEthers from "@/composables/ethers"
 import useLedger from "@/composables/ledger"
 import useTrezor from "@/composables/trezor"
 import useUser from "@/composables/user"
-import useWalletConnect from "@/composables/walletConnectV2"
+import useWalletConnect from "@/composables/walletConnect"
 import useWallets from "@/composables/wallets"
 import {
     Account,
@@ -20,7 +20,7 @@ const { browserProvidersList, loginWithEthers } = useEthers()
 const { loginWithLedger } = useLedger()
 const { loginWithTrezor } = useTrezor()
 const { setUser, user } = useUser()
-const { disconnectWalletConnect, loginWithWalletConnectV2, initializeWalletConnect, uninitializeWalletConnect } = useWalletConnect()
+const { disconnectWalletConnect, loginWithWalletConnect, initializeWalletConnect } = useWalletConnect()
 const { detectActiveWalletAddress } = useWallets()
 
 const initializedAuthComposable = ref(false)
@@ -132,9 +132,8 @@ export default function useAuth() {
                 if (addressExistsOnUser) return "Address already exists on this account"
 
                 // Check if it exists as a primary address of a different user
-                const {
-                    data: { sameAddress, walletProvider },
-                } = await checkIfPrimaryUserExists(provider as ProviderString, address)
+                const { data: { sameAddress } } = 
+                    await checkIfPrimaryUserExists(provider as ProviderString, address)
                 // If yes, ask user if they want to add it as a secondary to this account or if they want to log in with that account
                 if (sameAddress) {
                     return "Address already exists as a primary address on another account"
@@ -174,6 +173,7 @@ export default function useAuth() {
                 const browserWallet = browserProvidersList.includes(provider as ProviderString)
 
                 if (provider === "WalletConnect") {
+                    console.log("got to wallet connect login")
                     await loginWithProvider(loginCredentials as LoginCredentials)
                     await getUser()
                     return "Successfully logged in"
@@ -265,7 +265,7 @@ export default function useAuth() {
             } else if (provider === "Trezor") {
                 await loginWithTrezor(loginCredentials)
             } else if (provider === "WalletConnect") {
-                await loginWithWalletConnectV2(loginCredentials)
+                await loginWithWalletConnect(loginCredentials)
             } else {
                 console.log("Sign up not yet supported for this wallet provider")
             }
@@ -308,12 +308,7 @@ export default function useAuth() {
             }
         }
     })
-
-    onUnmounted(() => {
-        initializedAuthComposable.value = false
-        uninitializeWalletConnect()
-    })
-
+
     // TODO: Re-enable once we have a way to remove accounts in UI
     // async function removeConnectedAccount() {
     //     if (!user?.value?.address) {

diff --git a/apps/mvp/src/composables/operators.ts b/apps/mvp/src/composables/operators.ts
@@ -9,7 +9,7 @@ import useLedger from "@/composables/ledger"
 import useTrezor from "@/composables/trezor"
 import useUser from "@/composables/user"
 import useWallets from "@/composables/wallets"
-import useWalletConnectV2 from "@/composables/walletConnectV2"
+import useWalletConnect from "@/composables/walletConnect"
 import { CasimirManager, CasimirRegistry, CasimirViews } from "@casimir/ethereum/build/@types"
 
 let baseManager: CasimirManager
@@ -35,7 +35,7 @@ const { getEthersLedgerSigner } = useLedger()
 const { getEthersTrezorSigner } = useTrezor()
 const { user } = useUser()
 const { detectActiveNetwork, switchEthersNetwork } = useWallets()
-const { getWalletConnectSignerV2 } = useWalletConnectV2()
+const { getWalletConnectSigner } = useWalletConnect()
 const loadingInitializeOperators = ref(false)
 const loadingInitializeOperatorsError = ref(false)
 
@@ -210,7 +210,7 @@ export default function useOperators() {
             if (browserProvidersList.includes(walletProvider)) {
                 signer = getEthersBrowserSigner(walletProvider)
             } else if (walletProvider === "WalletConnect") {
-                await getWalletConnectSignerV2()
+                await getWalletConnectSigner()
             } else if (walletProvider === "Ledger") {
                 getEthersLedgerSigner()
             } else if (walletProvider === "Trezor") {

diff --git a/apps/mvp/src/composables/staking.ts b/apps/mvp/src/composables/staking.ts
@@ -7,7 +7,7 @@ import useLedger from "@/composables/ledger"
 import useTrezor from "@/composables/trezor"
 import useUser from "@/composables/user"
 import useWallets from "@/composables/wallets"
-import useWalletConnectV2 from "./walletConnectV2"
+import useWalletConnect from "./walletConnect"
 import { CasimirManager } from "@casimir/ethereum/build/@types"
 import { StakeDetails } from "@casimir/types"
 
@@ -17,7 +17,7 @@ const { getEthersLedgerSigner } = useLedger()
 const { getEthersTrezorSigner } = useTrezor()
 const { user } = useUser()
 const { detectActiveNetwork, switchEthersNetwork } = useWallets()
-const { getWalletConnectSignerV2 } = useWalletConnectV2()
+const { getWalletConnectSigner } = useWalletConnect()
 
 const stakingComposableInitialized = ref(false)
 const awaitingStakeOrWithdrawConfirmation = ref(false)
@@ -50,7 +50,9 @@ export default function useStaking() {
     async function deposit({ amount, walletProvider, type, pathIndex }: { amount: string, walletProvider: ProviderString, type: "default" | "eigen", pathIndex: number | undefined}) {
         stakeWithdrawError.value = ""
         try {
+            // This is currently handling the connectWalletConnect if no current session
             const activeNetwork = await detectActiveNetwork(walletProvider)
+            console.log("activeNetwork :>> ", activeNetwork)
             if (activeNetwork !== 5) {
                 await switchEthersNetwork(walletProvider, "0x5")
                 return window.location.reload()
@@ -60,7 +62,7 @@ export default function useStaking() {
             if (browserProvidersList.includes(walletProvider)) {
                 signer = getEthersBrowserSigner(walletProvider)
             } else if (walletProvider === "WalletConnect") {
-                signer = await getWalletConnectSignerV2()
+                signer = await getWalletConnectSigner()
             } else if (walletProvider === "Ledger") {
                 signer = getEthersLedgerSigner(pathIndex)
             } else if (walletProvider === "Trezor") {
@@ -166,7 +168,7 @@ export default function useStaking() {
         if (browserProvidersList.includes(walletProvider)) {
             signer = getEthersBrowserSigner(walletProvider)
         } else if (walletProvider === "WalletConnect") {
-            await getWalletConnectSignerV2()
+            await getWalletConnectSigner()
         } else if (walletProvider === "Ledger") {
             getEthersLedgerSigner()
         } else if (walletProvider === "Trezor") {
@@ -184,6 +186,7 @@ export default function useStaking() {
     async function withdraw({ amount, walletProvider, type }: { amount: string, walletProvider: ProviderString, type: "default" | "eigen" }) {
         try {
             stakeWithdrawError.value = ""
+            // This is currently handling the connectWalletConnect if no current session
             const activeNetwork = await detectActiveNetwork(walletProvider)
             if (activeNetwork !== 5) {
                 await switchEthersNetwork(walletProvider, "0x5")
@@ -194,7 +197,7 @@ export default function useStaking() {
             if (browserProvidersList.includes(walletProvider)) {
                 signer = getEthersBrowserSigner(walletProvider)
             } else if (walletProvider === "WalletConnect") {
-                await getWalletConnectSignerV2()
+                await getWalletConnectSigner()
             } else if (walletProvider === "Ledger") {
                 getEthersLedgerSigner()
             } else if (walletProvider === "Trezor") {