@reef-knot/wallet-adapter-safe 1.2.0 → 2.0.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { WalletAdapterType } from '@reef-knot/types';
+import type { WalletAdapterType } from '@reef-knot/types';
 export declare const id = "safe";
 export declare const name = "Safe";
 export declare const Safe: WalletAdapterType;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,eAAO,MAAM,EAAE,SAAS,CAAC;AACzB,eAAO,MAAM,IAAI,SAAS,CAAC;AAE3B,eAAO,MAAM,IAAI,EAAE,iBAoClB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,eAAO,MAAM,EAAE,SAAS,CAAC;AACzB,eAAO,MAAM,IAAI,SAAS,CAAC;AAgB3B,eAAO,MAAM,IAAI,EAAE,iBA8DjB,CAAC"}

package/dist/index.js

@@ -1,39 +1,71 @@
 import { __awaiter } from './_virtual/_tslib.js';
-import { SafeConnector } from 'wagmi/connectors/safe';
+import { safe } from 'wagmi/connectors';
+import { withTimeout } from 'viem';
 
 const id = 'safe';
 const name = 'Safe';
+const getSafeConnector = ({
+  allowedDomains = []
+}) => safe({
+  allowedDomains: [/app.safe.global$/, /holesky-safe.protofire.io$/, ...allowedDomains],
+  debug: false
+});
 const Safe = ({
-  chains
-}) => {
-  const safeConnector = new SafeConnector({
-    chains,
-    options: {
-      allowedDomains: [/app.safe.global$/, /holesky-safe.protofire.io$/],
-      debug: false
-    }
-  });
-  return {
-    walletName: name,
-    walletId: id,
-    autoConnectOnly: true,
-    detector: () => __awaiter(void 0, void 0, void 0, function* () {
-      // If opened in an iframe. This is an important check for Safe.
-      // The updated wagmi SafeConnector already has this check, but the currently used SafeConnector for wagmi 0.x hasn't.
-      if (globalThis.window && globalThis.window.parent !== globalThis.window) {
-        // The Promise.race is needed to handle regular iframes, not related to Safe,
-        // because in such iframes Safe SDK Promises can get stuck without resolving,
-        // so we are using a small timeout for them.
-        return Promise.race([new Promise(resolve => {
-          safeConnector.getProvider().then(() => resolve(true)).catch(() => resolve(false));
-        }), new Promise(resolve => {
-          setTimeout(() => resolve(false), 200);
-        })]);
+  safeAllowedDomains
+}) => ({
+  walletName: name,
+  walletId: id,
+  type: safe.type,
+  autoConnectOnly: true,
+  detector: () => __awaiter(void 0, void 0, void 0, function* () {
+    // We cannot longer use `safeConnector.getProvider()` directly
+    // because in the current wagmi version it must be initialized
+    // with `wagmi/createConfig/setup` otherewise the `getProvider` method is not accessible.
+    // https://github.com/wevm/wagmi/blob/fa5864bfb3ebfb0dc147b35003152a17a785ade6/packages/core/src/createConfig.ts#L96-L111
+    //
+    // We also do not use wagmi config here because we prefer to create a connection on flight
+    // when the connect button is clicked. This approach helps us to avoid connector collisions
+    // that appear in wagmi sometimes when it has multiple injected connectors in the config list
+    // which leading to some bugs detected during manual ui tests.
+    //
+    // So, with that being said, as we do not have an access to `safeConnector.getProvider`
+    // we forced to copy an implementation from its original source  to implement a wallet detector:
+    // https://github.com/wevm/wagmi/blob/fa5864bfb3ebfb0dc147b35003152a17a785ade6/packages/connectors/src/safe.ts#L85-L116
+    var _a;
+    const isIframe = globalThis.window && ((_a = globalThis.window) === null || _a === void 0 ? void 0 : _a.parent) !== globalThis.window;
+    if (!isIframe) return false;
+    try {
+      const {
+        default: SafeAppsSDK
+      } = yield import('@safe-global/safe-apps-sdk');
+      let SDK;
+      if (typeof SafeAppsSDK !== 'function' && typeof SafeAppsSDK.default === 'function') {
+        SDK = SafeAppsSDK.default;
+      } else {
+        SDK = SafeAppsSDK;
       }
+      const parameters = {
+        allowedDomains: safeAllowedDomains
+      };
+      const sdk = new SDK(parameters);
+      // `getInfo` hangs when not used in Safe App iFrame
+      // https://github.com/safe-global/safe-apps-sdk/issues/263#issuecomment-1029835840
+      const safeSdk = yield withTimeout(() => sdk.safe.getInfo(), {
+        timeout: 200
+      });
+      if (!safeSdk) return false;
+      const {
+        SafeAppProvider
+      } = yield import('@safe-global/safe-apps-provider');
+      const provider = new SafeAppProvider(safeSdk, sdk);
+      return !!provider;
+    } catch (_b) {
       return false;
-    }),
-    connector: safeConnector
-  };
-};
+    }
+  }),
+  createConnectorFn: getSafeConnector({
+    allowedDomains: safeAllowedDomains
+  })
+});
 
 export { Safe, id, name };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/wallet-adapter-safe",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -32,12 +32,14 @@
     "lint": "eslint --ext ts,tsx,js,mjs ."
   },
   "devDependencies": {
-    "@reef-knot/types": "^1.7.0",
+    "@reef-knot/types": "^2.0.0",
     "@svgr/rollup": "^6.5.1",
     "eslint-config-custom": "*"
   },
   "peerDependencies": {
-    "wagmi": "^0.12.19",
-    "@reef-knot/types": "^1.2.1"
+    "viem": "2.13.3",
+    "wagmi": "2.10.4",
+    "@reef-knot/types": "^2.0.0",
+    "@tanstack/react-query": "^5.29.0"
   }
 }