@matchain/matchid-sdk-react 0.1.10 → 0.1.12

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import React$1, { PropsWithChildren, CSSProperties, ReactNode } from 'react';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as viem from 'viem';
-import { SignableMessage, Hex, TransactionSerializable } from 'viem';
+import { SignableMessage, Hex, TransactionSerializable, Account } from 'viem';
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { UseQueryOptions } from '@tanstack/react-query/src/types';
 
@@ -190,20 +190,20 @@ declare function PasswordModal({ title, isOpen, onSuccess, ...props }: ModalWith
     onSuccess?: () => void;
 }): react_jsx_runtime.JSX.Element;
 
-declare const index$2_Button: typeof Button;
-declare const index$2_EmailModal: typeof EmailModal;
-declare const index$2_Field: typeof Field;
-declare const index$2_Input: typeof Input;
-declare const index$2_LoginBox: typeof LoginBox;
-declare const index$2_LoginButton: typeof LoginButton;
-declare const index$2_LoginModal: typeof LoginModal;
-declare const index$2_LoginPanel: typeof LoginPanel;
-declare const index$2_Modal: typeof Modal;
-declare const index$2_ModalWithHeader: typeof ModalWithHeader;
-declare const index$2_PasswordModal: typeof PasswordModal;
-declare const index$2_UsernameModal: typeof UsernameModal;
-declare namespace index$2 {
-  export { index$2_Button as Button, index$2_EmailModal as EmailModal, index$2_Field as Field, index$2_Input as Input, index$2_LoginBox as LoginBox, index$2_LoginButton as LoginButton, index$2_LoginModal as LoginModal, index$2_LoginPanel as LoginPanel, index$2_Modal as Modal, index$2_ModalWithHeader as ModalWithHeader, index$2_PasswordModal as PasswordModal, index$2_UsernameModal as UsernameModal };
+declare const index$3_Button: typeof Button;
+declare const index$3_EmailModal: typeof EmailModal;
+declare const index$3_Field: typeof Field;
+declare const index$3_Input: typeof Input;
+declare const index$3_LoginBox: typeof LoginBox;
+declare const index$3_LoginButton: typeof LoginButton;
+declare const index$3_LoginModal: typeof LoginModal;
+declare const index$3_LoginPanel: typeof LoginPanel;
+declare const index$3_Modal: typeof Modal;
+declare const index$3_ModalWithHeader: typeof ModalWithHeader;
+declare const index$3_PasswordModal: typeof PasswordModal;
+declare const index$3_UsernameModal: typeof UsernameModal;
+declare namespace index$3 {
+  export { index$3_Button as Button, index$3_EmailModal as EmailModal, index$3_Field as Field, index$3_Input as Input, index$3_LoginBox as LoginBox, index$3_LoginButton as LoginButton, index$3_LoginModal as LoginModal, index$3_LoginPanel as LoginPanel, index$3_Modal as Modal, index$3_ModalWithHeader as ModalWithHeader, index$3_PasswordModal as PasswordModal, index$3_UsernameModal as UsernameModal };
 }
 
 declare function useUserInfo(): {
@@ -247,14 +247,17 @@ interface UseWalletReturnType {
     recoveryWallet: (chainType: ChainType | undefined, recoveryType: RecoveryType, userPasscode?: string) => Promise<void>;
     signMessage: (message: SignableMessage, type?: ChainType) => Promise<Hex>;
     signTransaction: (transaction: TransactionSerializable, type?: ChainType) => Promise<`0x02${string}` | `0x01${string}` | `0x03${string}` | `0x04${string}` | viem.TransactionSerializedLegacy>;
+    address: string;
+    evmAccount: Account | undefined;
+    recoverAfter: (func: (resolve: (value: any) => void, reject: (reason: string) => void) => Promise<any>) => Promise<any>;
 }
 declare function useWallet(): UseWalletReturnType;
 
-declare const index$1_useMatchEvents: typeof useMatchEvents;
-declare const index$1_useUserInfo: typeof useUserInfo;
-declare const index$1_useWallet: typeof useWallet;
-declare namespace index$1 {
-  export { index$1_useMatchEvents as useMatchEvents, index$1_useUserInfo as useUserInfo, index$1_useWallet as useWallet };
+declare const index$2_useMatchEvents: typeof useMatchEvents;
+declare const index$2_useUserInfo: typeof useUserInfo;
+declare const index$2_useWallet: typeof useWallet;
+declare namespace index$2 {
+  export { index$2_useMatchEvents as useMatchEvents, index$2_useUserInfo as useUserInfo, index$2_useWallet as useWallet };
 }
 
 interface MyResponseType<T> {
@@ -299,10 +302,90 @@ declare namespace poh {
   export { poh_usePohList as usePohList, poh_verifyPohApi as verifyPohApi };
 }
 
-declare const index_bind: typeof bind;
-declare const index_poh: typeof poh;
+declare const index$1_bind: typeof bind;
+declare const index$1_poh: typeof poh;
+declare namespace index$1 {
+  export { index$1_bind as bind, index$1_poh as poh };
+}
+
+declare const matchMain: {
+    blockExplorers: {
+        readonly default: {
+            readonly name: "Matchscan";
+            readonly url: "https://matchscan.io/";
+            readonly apiUrl: "https://matchscan.io/api";
+        };
+    };
+    contracts: {
+        readonly multicall3: {
+            readonly address: "0xca11bde05977b3631167028862be2a173976ca11";
+        };
+    };
+    id: 698;
+    name: "Matchain";
+    nativeCurrency: {
+        readonly name: "Match Coin";
+        readonly symbol: "BNB";
+        readonly decimals: 18;
+    };
+    rpcUrls: {
+        readonly default: {
+            readonly http: readonly ["https://rpc.matchain.io"];
+        };
+    };
+    sourceId?: number | undefined;
+    testnet?: boolean | undefined;
+    custom?: Record<string, unknown> | undefined;
+    fees?: viem.ChainFees<undefined> | undefined;
+    formatters?: undefined;
+    serializers?: viem.ChainSerializers<undefined, viem.TransactionSerializable> | undefined;
+    readonly iconUrl: "https://matchscan.io/static/identicon_logos/blockies.png";
+};
+
+declare const matchTest: {
+    blockExplorers: {
+        readonly default: {
+            readonly name: "Matchscan";
+            readonly url: "https://testnet.matchscan.io/";
+            readonly apiUrl: "https://testnet.matchscan.io/api";
+        };
+    };
+    contracts: {
+        readonly multicall3: {
+            readonly address: "0xca11bde05977b3631167028862be2a173976ca11";
+            readonly blockCreated: 751532;
+        };
+        readonly ensRegistry: {
+            readonly address: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e";
+        };
+        readonly ensUniversalResolver: {
+            readonly address: "0xc8Af999e38273D658BE1b921b88A9Ddf005769cC";
+            readonly blockCreated: 5317080;
+        };
+    };
+    id: 699;
+    name: "MatchTest";
+    nativeCurrency: {
+        readonly name: "Match Coin";
+        readonly symbol: "BNB";
+        readonly decimals: 18;
+    };
+    rpcUrls: {
+        readonly default: {
+            readonly http: readonly ["https://testnet-rpc.matchain.io"];
+        };
+    };
+    sourceId?: number | undefined;
+    testnet?: boolean | undefined;
+    custom?: Record<string, unknown> | undefined;
+    fees?: viem.ChainFees<undefined> | undefined;
+    formatters?: undefined;
+    serializers?: viem.ChainSerializers<undefined, viem.TransactionSerializable> | undefined;
+    readonly iconUrl: "https://testnet.matchscan.io/static/identicon_logos/blockies.png";
+};
+
 declare namespace index {
-  export { index_bind as bind, index_poh as poh };
+  export { matchMain as MatchMain, matchTest as MatchTest };
 }
 
-export { index as Api, index$2 as Components, index$1 as Hooks, MatchProvider, useMatch };
+export { index$1 as Api, index as Chains, index$3 as Components, index$2 as Hooks, MatchProvider, useMatch };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import React$1, { PropsWithChildren, CSSProperties, ReactNode } from 'react';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as viem from 'viem';
-import { SignableMessage, Hex, TransactionSerializable } from 'viem';
+import { SignableMessage, Hex, TransactionSerializable, Account } from 'viem';
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { UseQueryOptions } from '@tanstack/react-query/src/types';
 
@@ -190,20 +190,20 @@ declare function PasswordModal({ title, isOpen, onSuccess, ...props }: ModalWith
     onSuccess?: () => void;
 }): react_jsx_runtime.JSX.Element;
 
-declare const index$2_Button: typeof Button;
-declare const index$2_EmailModal: typeof EmailModal;
-declare const index$2_Field: typeof Field;
-declare const index$2_Input: typeof Input;
-declare const index$2_LoginBox: typeof LoginBox;
-declare const index$2_LoginButton: typeof LoginButton;
-declare const index$2_LoginModal: typeof LoginModal;
-declare const index$2_LoginPanel: typeof LoginPanel;
-declare const index$2_Modal: typeof Modal;
-declare const index$2_ModalWithHeader: typeof ModalWithHeader;
-declare const index$2_PasswordModal: typeof PasswordModal;
-declare const index$2_UsernameModal: typeof UsernameModal;
-declare namespace index$2 {
-  export { index$2_Button as Button, index$2_EmailModal as EmailModal, index$2_Field as Field, index$2_Input as Input, index$2_LoginBox as LoginBox, index$2_LoginButton as LoginButton, index$2_LoginModal as LoginModal, index$2_LoginPanel as LoginPanel, index$2_Modal as Modal, index$2_ModalWithHeader as ModalWithHeader, index$2_PasswordModal as PasswordModal, index$2_UsernameModal as UsernameModal };
+declare const index$3_Button: typeof Button;
+declare const index$3_EmailModal: typeof EmailModal;
+declare const index$3_Field: typeof Field;
+declare const index$3_Input: typeof Input;
+declare const index$3_LoginBox: typeof LoginBox;
+declare const index$3_LoginButton: typeof LoginButton;
+declare const index$3_LoginModal: typeof LoginModal;
+declare const index$3_LoginPanel: typeof LoginPanel;
+declare const index$3_Modal: typeof Modal;
+declare const index$3_ModalWithHeader: typeof ModalWithHeader;
+declare const index$3_PasswordModal: typeof PasswordModal;
+declare const index$3_UsernameModal: typeof UsernameModal;
+declare namespace index$3 {
+  export { index$3_Button as Button, index$3_EmailModal as EmailModal, index$3_Field as Field, index$3_Input as Input, index$3_LoginBox as LoginBox, index$3_LoginButton as LoginButton, index$3_LoginModal as LoginModal, index$3_LoginPanel as LoginPanel, index$3_Modal as Modal, index$3_ModalWithHeader as ModalWithHeader, index$3_PasswordModal as PasswordModal, index$3_UsernameModal as UsernameModal };
 }
 
 declare function useUserInfo(): {
@@ -247,14 +247,17 @@ interface UseWalletReturnType {
     recoveryWallet: (chainType: ChainType | undefined, recoveryType: RecoveryType, userPasscode?: string) => Promise<void>;
     signMessage: (message: SignableMessage, type?: ChainType) => Promise<Hex>;
     signTransaction: (transaction: TransactionSerializable, type?: ChainType) => Promise<`0x02${string}` | `0x01${string}` | `0x03${string}` | `0x04${string}` | viem.TransactionSerializedLegacy>;
+    address: string;
+    evmAccount: Account | undefined;
+    recoverAfter: (func: (resolve: (value: any) => void, reject: (reason: string) => void) => Promise<any>) => Promise<any>;
 }
 declare function useWallet(): UseWalletReturnType;
 
-declare const index$1_useMatchEvents: typeof useMatchEvents;
-declare const index$1_useUserInfo: typeof useUserInfo;
-declare const index$1_useWallet: typeof useWallet;
-declare namespace index$1 {
-  export { index$1_useMatchEvents as useMatchEvents, index$1_useUserInfo as useUserInfo, index$1_useWallet as useWallet };
+declare const index$2_useMatchEvents: typeof useMatchEvents;
+declare const index$2_useUserInfo: typeof useUserInfo;
+declare const index$2_useWallet: typeof useWallet;
+declare namespace index$2 {
+  export { index$2_useMatchEvents as useMatchEvents, index$2_useUserInfo as useUserInfo, index$2_useWallet as useWallet };
 }
 
 interface MyResponseType<T> {
@@ -299,10 +302,90 @@ declare namespace poh {
   export { poh_usePohList as usePohList, poh_verifyPohApi as verifyPohApi };
 }
 
-declare const index_bind: typeof bind;
-declare const index_poh: typeof poh;
+declare const index$1_bind: typeof bind;
+declare const index$1_poh: typeof poh;
+declare namespace index$1 {
+  export { index$1_bind as bind, index$1_poh as poh };
+}
+
+declare const matchMain: {
+    blockExplorers: {
+        readonly default: {
+            readonly name: "Matchscan";
+            readonly url: "https://matchscan.io/";
+            readonly apiUrl: "https://matchscan.io/api";
+        };
+    };
+    contracts: {
+        readonly multicall3: {
+            readonly address: "0xca11bde05977b3631167028862be2a173976ca11";
+        };
+    };
+    id: 698;
+    name: "Matchain";
+    nativeCurrency: {
+        readonly name: "Match Coin";
+        readonly symbol: "BNB";
+        readonly decimals: 18;
+    };
+    rpcUrls: {
+        readonly default: {
+            readonly http: readonly ["https://rpc.matchain.io"];
+        };
+    };
+    sourceId?: number | undefined;
+    testnet?: boolean | undefined;
+    custom?: Record<string, unknown> | undefined;
+    fees?: viem.ChainFees<undefined> | undefined;
+    formatters?: undefined;
+    serializers?: viem.ChainSerializers<undefined, viem.TransactionSerializable> | undefined;
+    readonly iconUrl: "https://matchscan.io/static/identicon_logos/blockies.png";
+};
+
+declare const matchTest: {
+    blockExplorers: {
+        readonly default: {
+            readonly name: "Matchscan";
+            readonly url: "https://testnet.matchscan.io/";
+            readonly apiUrl: "https://testnet.matchscan.io/api";
+        };
+    };
+    contracts: {
+        readonly multicall3: {
+            readonly address: "0xca11bde05977b3631167028862be2a173976ca11";
+            readonly blockCreated: 751532;
+        };
+        readonly ensRegistry: {
+            readonly address: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e";
+        };
+        readonly ensUniversalResolver: {
+            readonly address: "0xc8Af999e38273D658BE1b921b88A9Ddf005769cC";
+            readonly blockCreated: 5317080;
+        };
+    };
+    id: 699;
+    name: "MatchTest";
+    nativeCurrency: {
+        readonly name: "Match Coin";
+        readonly symbol: "BNB";
+        readonly decimals: 18;
+    };
+    rpcUrls: {
+        readonly default: {
+            readonly http: readonly ["https://testnet-rpc.matchain.io"];
+        };
+    };
+    sourceId?: number | undefined;
+    testnet?: boolean | undefined;
+    custom?: Record<string, unknown> | undefined;
+    fees?: viem.ChainFees<undefined> | undefined;
+    formatters?: undefined;
+    serializers?: viem.ChainSerializers<undefined, viem.TransactionSerializable> | undefined;
+    readonly iconUrl: "https://testnet.matchscan.io/static/identicon_logos/blockies.png";
+};
+
 declare namespace index {
-  export { index_bind as bind, index_poh as poh };
+  export { matchMain as MatchMain, matchTest as MatchTest };
 }
 
-export { index as Api, index$2 as Components, index$1 as Hooks, MatchProvider, useMatch };
+export { index$1 as Api, index as Chains, index$3 as Components, index$2 as Hooks, MatchProvider, useMatch };

package/dist/index.js

@@ -31,6 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   Api: () => api_exports,
+  Chains: () => chains_exports,
   Components: () => components_exports,
   Hooks: () => hooks_exports,
   MatchProvider: () => MatchProvider,
@@ -1017,13 +1018,14 @@ var useStore = (0, import_zustand2.create)((set) => ({
 var useStore_default = useStore;
 
 // src/hooks/useWallet.tsx
+var import_accounts = require("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",
@@ -1032,7 +1034,7 @@ function useWallet() {
         AppClientId,
         UserId: did,
         AccessToken: token,
-        Address: address
+        Address: address2
       }
     );
   };
@@ -1045,33 +1047,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();
@@ -1084,48 +1074,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", {
@@ -1134,13 +1117,32 @@ function useWallet() {
       userPasscode
     });
   };
+  const evmAccount = address ? (0, import_accounts.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
   };
 }
 
@@ -1399,8 +1401,6 @@ function useWalletInit({
         if (existingIframe.src !== endpoints.login + "wallet") {
           setWalletInited(false);
           existingIframe.src = endpoints.login + "wallet";
-        } else {
-          setWalletInited(true);
         }
       }
     }
@@ -2137,9 +2137,79 @@ function usePohList(options) {
     ...options
   });
 }
+
+// src/config/chains/index.ts
+var chains_exports = {};
+__export(chains_exports, {
+  MatchMain: () => matchMain,
+  MatchTest: () => matchTest
+});
+
+// src/config/chains/MatchMain.ts
+var import_viem = require("viem");
+var matchMain = /* @__PURE__ */ (0, import_viem.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
+var import_viem2 = require("viem");
+var matchTest = /* @__PURE__ */ (0, import_viem2.defineChain)({
+  //定义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,
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Api,
+  Chains,
   Components,
   Hooks,
   MatchProvider,