@matchain/matchid-sdk-react 0.1.10 → 0.1.12

package/dist/index.mjs

@@ -983,13 +983,14 @@ var useStore = create2((set) => ({
 var useStore_default = useStore;
 
 // src/hooks/useWallet.tsx
+import { toAccount } from "viem/accounts";
 var AppClientId = "react-sdk-" + getVersion();
 function useWallet() {
-  const { appid, token, overview } = useLocalStore_default();
+  const { appid, token, overview, address } = useLocalStore_default();
   const { setRecoveryModal, closeRecoveryModal } = useStore_default();
   const initWallet = ({
     did,
-    address
+    address: address2
   }) => {
     return window.waitMatchUntilWalletMessage(
       "initCore",
@@ -998,7 +999,7 @@ function useWallet() {
         AppClientId,
         UserId: did,
         AccessToken: token,
-        Address: address
+        Address: address2
       }
     );
   };
@@ -1011,33 +1012,21 @@ function useWallet() {
     userPasscode
   }) => {
     return await window.waitMatchUntilWalletMessage("generateWallet", {
+      chainType: "ethereum",
       recoveryType: "user_passcode_recovery_key",
       userPasscode
     });
   };
-  const signMessage = async (message, type) => {
+  const recoverAfter = async (func) => {
     return new Promise(async (resolve, reject) => {
       const res = await isRecovered();
       matchlog_default.log("isRecovered", res);
-      const getSign = async () => {
-        try {
-          const recoverRes = await window.waitMatchUntilWalletMessage("signMessage", {
-            message,
-            chainType: type
-          });
-          closeRecoveryModal();
-          resolve(recoverRes);
-        } catch (error) {
-          console.error("qwe-sign-error", error);
-          reject(error);
-        }
-      };
       if (!res) {
         setRecoveryModal({
           open: true,
           success: async () => {
             matchlog_default.log("recover Success");
-            await getSign();
+            await func(resolve, reject);
           },
           close: async () => {
             closeRecoveryModal();
@@ -1050,48 +1039,41 @@ function useWallet() {
         });
       } else {
         await recoveryWallet("ethereum", "user_passcode_recovery_key");
-        await getSign();
+        await func(resolve, reject);
       }
     });
   };
-  const signTransaction = async (transaction, type) => {
-    return new Promise(async (resolve, reject) => {
-      const res = await isRecovered();
-      matchlog_default.log("isRecovered", res);
-      const getSign = async () => {
-        try {
-          const recoverRes = await window.waitMatchUntilWalletMessage("signTransaction", {
-            transaction,
-            chainType: type
-          });
-          closeRecoveryModal();
-          resolve(recoverRes);
-        } catch (error) {
-          console.error("qwe-sign-error", error);
-          reject(error);
-        }
-      };
-      if (!res) {
-        setRecoveryModal({
-          open: true,
-          success: async () => {
-            matchlog_default.log("recover Success");
-            await getSign();
-          },
-          close: async () => {
-            closeRecoveryModal();
-            reject(new Error("recover modal close"));
-          }
+  const signMessage = async (message, type) => {
+    const getSign = async (resolve, reject) => {
+      try {
+        const recoverRes = await window.waitMatchUntilWalletMessage("signMessage", {
+          message,
+          chainType: type
         });
-        await initWallet({
-          address: overview?.address || "",
-          did: overview?.did?.split(":")[2] || ""
+        closeRecoveryModal();
+        resolve(recoverRes);
+      } catch (error) {
+        console.error("qwe-sign-error", error);
+        reject(error);
+      }
+    };
+    return await recoverAfter(getSign);
+  };
+  const signTransaction = async (transaction, type) => {
+    const getSign = async (resolve, reject) => {
+      try {
+        const recoverRes = await window.waitMatchUntilWalletMessage("signTransaction", {
+          transaction,
+          chainType: type
         });
-      } else {
-        await recoveryWallet("ethereum", "user_passcode_recovery_key");
-        await getSign();
+        closeRecoveryModal();
+        resolve(recoverRes);
+      } catch (error) {
+        console.error("qwe-sign-error", error);
+        reject(error);
       }
-    });
+    };
+    return await recoverAfter(getSign);
   };
   const recoveryWallet = async (chainType, recoveryType, userPasscode) => {
     return await window.waitMatchUntilWalletMessage("recoveryWallet", {
@@ -1100,13 +1082,32 @@ function useWallet() {
       userPasscode
     });
   };
+  const evmAccount = address ? toAccount({
+    address,
+    async signMessage({ message }) {
+      return await signMessage(message);
+    },
+    async signTransaction(transaction, options) {
+      const { account, ...restTransaction } = transaction;
+      const sign = await signTransaction({
+        ...restTransaction
+      });
+      return sign;
+    },
+    async signTypedData(typedData) {
+      return "0x";
+    }
+  }) : void 0;
   return {
+    evmAccount,
+    address,
     recoveryWallet,
     initWallet,
     generateWallet,
     signMessage,
     signTransaction,
-    isRecovered
+    isRecovered,
+    recoverAfter
   };
 }
 
@@ -1365,8 +1366,6 @@ function useWalletInit({
         if (existingIframe.src !== endpoints.login + "wallet") {
           setWalletInited(false);
           existingIframe.src = endpoints.login + "wallet";
-        } else {
-          setWalletInited(true);
         }
       }
     }
@@ -2103,8 +2102,78 @@ function usePohList(options) {
     ...options
   });
 }
+
+// src/config/chains/index.ts
+var chains_exports = {};
+__export(chains_exports, {
+  MatchMain: () => matchMain,
+  MatchTest: () => matchTest
+});
+
+// src/config/chains/MatchMain.ts
+import { defineChain } from "viem";
+var matchMain = /* @__PURE__ */ defineChain({
+  //定义match链
+  id: 698,
+  name: "Matchain",
+  nativeCurrency: { name: "Match Coin", symbol: "BNB", decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ["https://rpc.matchain.io"]
+    }
+  },
+  blockExplorers: {
+    default: {
+      name: "Matchscan",
+      url: "https://matchscan.io/",
+      apiUrl: "https://matchscan.io/api"
+    }
+  },
+  iconUrl: "https://matchscan.io/static/identicon_logos/blockies.png",
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11"
+    }
+  }
+  // testnet: true,
+});
+
+// src/config/chains/MatchTest.ts
+import { defineChain as defineChain2 } from "viem";
+var matchTest = /* @__PURE__ */ defineChain2({
+  //定义matchTest链
+  id: 699,
+  name: "MatchTest",
+  nativeCurrency: { name: "Match Coin", symbol: "BNB", decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ["https://testnet-rpc.matchain.io"]
+    }
+  },
+  blockExplorers: {
+    default: {
+      name: "Matchscan",
+      url: "https://testnet.matchscan.io/",
+      apiUrl: "https://testnet.matchscan.io/api"
+    }
+  },
+  iconUrl: "https://testnet.matchscan.io/static/identicon_logos/blockies.png",
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 751532
+    },
+    ensRegistry: { address: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e" },
+    ensUniversalResolver: {
+      address: "0xc8Af999e38273D658BE1b921b88A9Ddf005769cC",
+      blockCreated: 5317080
+    }
+  }
+  // testnet: true,
+});
 export {
   api_exports as Api,
+  chains_exports as Chains,
   components_exports as Components,
   hooks_exports as Hooks,
   MatchProvider,