Merge branch 'main' of github.com:WalletConnect/web-examples into fea…

…t/sa-connection-improvments
reown-com · Feb 1, 2024 · 9525e8c · 9525e8c
2 parents 8bc06be + 46bfda7
commit 9525e8c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 322 deletions.
diff --git a/advanced/wallets/react-wallet-v2/package.json b/advanced/wallets/react-wallet-v2/package.json
@@ -36,7 +36,6 @@
     "cosmos-wallet": "1.2.0",
     "ethers": "5.7.2",
     "framer-motion": "6.5.1",
-    "mnemonic-keyring": "1.4.0",
     "near-api-js": "^0.45.0",
     "next": "12.1.5",
     "permissionless": "0.0.20",

diff --git a/advanced/wallets/react-wallet-v2/src/components/SmartAccountCard.tsx b/advanced/wallets/react-wallet-v2/src/components/SmartAccountCard.tsx
@@ -1,6 +1,6 @@
 import ChainCard from '@/components/ChainCard'
 import SettingsStore from '@/store/SettingsStore'
-import { truncate } from '@/utils/HelperUtil'
+import { styledToast, truncate } from '@/utils/HelperUtil'
 import { updateSignClientChainId } from '@/utils/WalletConnectUtil'
 import { Avatar, Button, Text, Tooltip, Loading } from '@nextui-org/react'
 import { eip155Wallets } from '@/utils/EIP155WalletUtil'
@@ -134,7 +134,7 @@ export default function SmartAccountCard({
             css={{ marginTop: 10, width: '100%' }}
             onClick={onCreateSmartAccount}
           >
-            {loading ? <Loading size="sm" /> : 'Create Smart Account'}
+            {loading ? <Loading size="sm" css={{ paddingTop: 10 }} /> : 'Create Smart Account'}
           </Button>
         </>
       )}

diff --git a/advanced/wallets/react-wallet-v2/src/hooks/useSmartAccount.ts b/advanced/wallets/react-wallet-v2/src/hooks/useSmartAccount.ts
@@ -4,6 +4,8 @@ import { Chain, VITALIK_ADDRESS } from "@/utils/SmartAccountUtils";
 import { useCallback, useEffect, useState } from "react";
 import { useSnapshot } from "valtio";
 import { Hex } from "viem";
+import { styledToast } from "@/utils/HelperUtil";
+import { TransactionExecutionError } from "viem";
 
 export default function useSmartAccount(signerPrivateKey: Hex, chain: Chain) {
     const [loading, setLoading] = useState(false)
@@ -20,6 +22,12 @@ export default function useSmartAccount(signerPrivateKey: Hex, chain: Chain) {
         setLoading(false)
       }
       catch (e) {
+        if (e instanceof TransactionExecutionError) {
+          // shorten the error message
+          styledToast(e.cause.message, 'error')
+        } else if (e instanceof Error) {
+          styledToast(e.message, 'error')
+        }
         console.error(e)
         setLoading(false)
       }  

diff --git a/advanced/wallets/react-wallet-v2/src/lib/CosmosLib.ts b/advanced/wallets/react-wallet-v2/src/lib/CosmosLib.ts
@@ -3,7 +3,7 @@ import { fromHex } from '@cosmjs/encoding'
 import { DirectSecp256k1Wallet } from '@cosmjs/proto-signing'
 // @ts-expect-error
 import { SignDoc } from '@cosmjs/proto-signing/build/codec/cosmos/tx/v1beta1/tx'
-import Keyring from 'mnemonic-keyring'
+import { Wallet } from 'ethers'
 
 /**
  * Constants
@@ -24,27 +24,29 @@ interface IInitArguments {
  * Library
  */
 export default class CosmosLib {
-  private keyring: Keyring
+  private mnemonic: string
   private directSigner: DirectSecp256k1Wallet
   private aminoSigner: Secp256k1Wallet
 
-  constructor(keyring: Keyring, directSigner: DirectSecp256k1Wallet, aminoSigner: Secp256k1Wallet) {
+  constructor(mnemonic: string, directSigner: DirectSecp256k1Wallet, aminoSigner: Secp256k1Wallet) {
     this.directSigner = directSigner
-    this.keyring = keyring
+    this.mnemonic = mnemonic
     this.aminoSigner = aminoSigner
   }
 
   static async init({ mnemonic, path, prefix }: IInitArguments) {
-    const keyring = await Keyring.init({ mnemonic: mnemonic ?? Keyring.generateMnemonic() })
-    const privateKey = fromHex(keyring.getPrivateKey(path ?? DEFAULT_PATH))
+    const wallet = mnemonic
+      ? Wallet.fromMnemonic(mnemonic, path ?? DEFAULT_PATH)
+      : Wallet.createRandom({ path: path ?? DEFAULT_PATH })
+    const privateKey = fromHex(wallet.privateKey.replace('0x', ''))
     const directSigner = await DirectSecp256k1Wallet.fromKey(privateKey, prefix ?? DEFAULT_PREFIX)
     const aminoSigner = await Secp256k1Wallet.fromKey(privateKey, prefix ?? DEFAULT_PREFIX)
 
-    return new CosmosLib(keyring, directSigner, aminoSigner)
+    return new CosmosLib(wallet.mnemonic.phrase, directSigner, aminoSigner)
   }
 
   public getMnemonic() {
-    return this.keyring.mnemonic
+    return this.mnemonic
   }
 
   public async getAddress() {

diff --git a/advanced/wallets/react-wallet-v2/src/lib/TezosLib.ts b/advanced/wallets/react-wallet-v2/src/lib/TezosLib.ts
@@ -1,7 +1,7 @@
 import { TezosToolkit } from '@taquito/taquito'
 import { InMemorySigner } from '@taquito/signer'
 import { localForger } from '@taquito/local-forging'
-import Keyring from 'mnemonic-keyring'
+import { Wallet } from 'ethers/'
 
 /**
  * Constants
@@ -50,7 +50,7 @@ export default class TezosLib {
 
   static async init({ mnemonic, path, curve }: IInitArguments) {
     const params = {
-      mnemonic: mnemonic ?? Keyring.generateMnemonic(),
+      mnemonic: mnemonic ?? Wallet.createRandom().mnemonic.phrase,
       derivationPath: path ?? DEFAULT_PATH,
       curve: curve ?? DEFAULT_CURVE
     }