fix _initProviderState conflict

owallet-io · Feb 11, 2025 · 37ad504 · 37ad504
1 parent f3906fd
commit 37ad504
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 32 deletions.
diff --git a/apps/extension/src/stores/chain/index.tsx b/apps/extension/src/stores/chain/index.tsx
@@ -291,6 +291,7 @@ export class ChainStore extends BaseChainStore<ChainInfoWithCoreTypes> {
     if (!this.keyRingStore.selectedKeyInfo) {
       return;
     }
+    console.log("enableChainInfoInUI");
 
     const msg = new EnableChainsMsg(
       this.keyRingStore.selectedKeyInfo.id,

diff --git a/packages/background/src/keyring-ethereum/handler.ts b/packages/background/src/keyring-ethereum/handler.ts
@@ -69,7 +69,7 @@ const handleRequestJsonRpcToEvmMsg: (
   permissionInteractionService
 ) => {
   return async (env, msg) => {
-    if (msg.method !== "owallet_initProviderState") {
+    if (msg.method !== "keplr_initProviderState") {
       await permissionInteractionService.ensureEnabledForEVM(env, msg.origin);
     }
 

diff --git a/packages/background/src/keyring-ethereum/service.ts b/packages/background/src/keyring-ethereum/service.ts
@@ -324,10 +324,8 @@ export class KeyRingEthereumService {
     let currentChainId =
       this.permissionService.getCurrentChainIdForEVM(origin) ?? chainId;
 
-    console.log("currentChainId request", method, currentChainId, params);
-
     if (currentChainId == null) {
-      if (method === "owallet_initProviderState") {
+      if (method === "keplr_initProviderState") {
         return {
           currentEvmChainId: null,
           currentChainId: null,
@@ -402,7 +400,7 @@ export class KeyRingEthereumService {
 
     const result = (await (async () => {
       switch (method) {
-        case "owallet_initProviderState":
+        case "keplr_initProviderState":
         case "owallet_connect": {
           return {
             currentEvmChainId: currentChainEVMInfo.chainId,

diff --git a/packages/background/src/permission/service.ts b/packages/background/src/permission/service.ts
@@ -230,30 +230,30 @@ export class PermissionService {
       options,
     };
 
-    if (options?.isForEVM) {
-      const chainId = chainIds[0];
+    // if (options?.isForEVM) {
+    //   const chainId = chainIds[0];
 
-      this.addPermission([chainId], type, origins);
-      this.setCurrentChainIdForEVM(origins, chainId);
-    } else {
-      this.addPermission(chainIds, type, origins);
-    }
-
-    // await this.interactionService.waitApproveV2(
-    //   env,
-    //   "/permission",
-    //   INTERACTION_TYPE_PERMISSION,
-    //   permissionData,
-    //   (newChainId?: string) => {
-    //     if (options?.isForEVM) {
-    //       const chainId = newChainId ?? chainIds[0];
-    //       this.addPermission([chainId], type, origins);
-    //       this.setCurrentChainIdForEVM(origins, chainId);
-    //     } else {
-    //       this.addPermission(chainIds, type, origins);
-    //     }
-    //   }
-    // );
+    //   this.addPermission([chainId], type, origins);
+    //   this.setCurrentChainIdForEVM(origins, chainId);
+    // } else {
+    //   this.addPermission(chainIds, type, origins);
+    // }
+
+    await this.interactionService.waitApproveV2(
+      env,
+      "/permission",
+      INTERACTION_TYPE_PERMISSION,
+      permissionData,
+      (newChainId?: string) => {
+        if (options?.isForEVM) {
+          const chainId = newChainId ?? chainIds[0];
+          this.addPermission([chainId], type, origins);
+          this.setCurrentChainIdForEVM(origins, chainId);
+        } else {
+          this.addPermission(chainIds, type, origins);
+        }
+      }
+    );
   }
 
   async grantBasicAccessPermission(

diff --git a/packages/provider/src/core.ts b/packages/provider/src/core.ts
@@ -118,7 +118,6 @@ export class OWallet implements IOWallet, OWalletCoreTypes {
     });
   }
 
-  // TODO: 웹페이지에서도 필요할수도 있을 것 같으니 나중에 owallet의 API로 추가해준다.
   async isEnabled(chainIds: string | string[]): Promise<boolean> {
     if (typeof chainIds === "string") {
       chainIds = [chainIds];
@@ -1299,7 +1298,9 @@ class EthereumProvider extends EventEmitter implements IEthereumProvider {
       throw new Error("Invalid paramater: `method` must be a string");
     }
 
-    if (method !== "owallet_initProviderState") {
+    console.log("method request", method);
+
+    if (method !== "keplr_initProviderState") {
       await this.protectedEnableAccess();
     }
 
@@ -2209,7 +2210,7 @@ class TronProvider extends EventEmitter implements ITronProvider {
       throw new Error("Invalid paramater: `method` must be a string");
     }
 
-    if (method !== "owallet_initProviderState") {
+    if (method !== "keplr_initProviderState") {
       await this.protectedEnableAccess();
     }
 

diff --git a/packages/provider/src/inject.ts b/packages/provider/src/inject.ts
@@ -1267,7 +1267,7 @@ class EthereumProvider extends EventEmitter implements IEthereumProvider {
     }
 
     const initialProviderState = await this._requestMethod("request", {
-      method: "owallet_initProviderState",
+      method: "keplr_initProviderState",
     });
 
     if (initialProviderState) {

diff --git a/packages/router-extension/src/requester/extension.ts b/packages/router-extension/src/requester/extension.ts
@@ -13,6 +13,7 @@ export class InExtensionMessageRequester implements MessageRequester {
     msg: M
   ): Promise<M extends Message<infer R> ? R : never> {
     msg.validateBasic();
+    console.log("msg InExtensionMessageRequester", msg);
 
     // Set message's origin.
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment