@dynamic-labs/ethereum 4.0.0-alpha.50 → 4.0.0-alpha.51

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+## [4.0.0-alpha.51](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.50...v4.0.0-alpha.51) (2024-12-30)
+
+
+### Bug Fixes
+
+* changing copy of linking same wallet ([#7489](https://github.com/dynamic-labs/dynamic-auth/issues/7489)) ([e7d6b95](https://github.com/dynamic-labs/dynamic-auth/commit/e7d6b957043eaf8c06a4e8ef480ec9b027abdb5e))
+* normalize user reject error from Rainbow and BitGet ([#7721](https://github.com/dynamic-labs/dynamic-auth/issues/7721)) ([78a2e41](https://github.com/dynamic-labs/dynamic-auth/commit/78a2e41e235743f0c652be746a8bee74d4e06629))
+
 ## [4.0.0-alpha.50](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.49...v4.0.0-alpha.50) (2024-12-28)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.0.0-alpha.50";
+var version = "4.0.0-alpha.51";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.0.0-alpha.50";
+var version = "4.0.0-alpha.51";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "4.0.0-alpha.50",
+  "version": "4.0.0-alpha.51",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -24,14 +24,14 @@
     "eventemitter3": "5.0.1",
     "buffer": "6.0.3",
     "@metamask/sdk": "0.30.1",
-    "@dynamic-labs/assert-package-version": "4.0.0-alpha.50",
-    "@dynamic-labs/embedded-wallet-evm": "4.0.0-alpha.50",
-    "@dynamic-labs/ethereum-core": "4.0.0-alpha.50",
-    "@dynamic-labs/logger": "4.0.0-alpha.50",
-    "@dynamic-labs/types": "4.0.0-alpha.50",
-    "@dynamic-labs/utils": "4.0.0-alpha.50",
-    "@dynamic-labs/wallet-book": "4.0.0-alpha.50",
-    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.50"
+    "@dynamic-labs/assert-package-version": "4.0.0-alpha.51",
+    "@dynamic-labs/embedded-wallet-evm": "4.0.0-alpha.51",
+    "@dynamic-labs/ethereum-core": "4.0.0-alpha.51",
+    "@dynamic-labs/logger": "4.0.0-alpha.51",
+    "@dynamic-labs/types": "4.0.0-alpha.51",
+    "@dynamic-labs/utils": "4.0.0-alpha.51",
+    "@dynamic-labs/wallet-book": "4.0.0-alpha.51",
+    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.51"
   },
   "peerDependencies": {
     "viem": "^2.7.12"

package/src/utils/normalizeRpcError/normalizeRpcError.cjs

@@ -11,10 +11,41 @@ var viem = require('viem');
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const normalizeRpcError = (err) => {
-    if (err.code === undefined && err.message === 'Request rejected') {
-        throw new viem.UserRejectedRequestError(err);
+    /**
+     * When the error already comply with the EIP-1193 standard, we don't need to normalize it
+     */
+    if (err.code === 4001) {
+        throw err;
     }
+    let mappedError = null;
+    try {
+        mappedError = mapRpcError(err);
+    }
+    catch (e) {
+        // ignore errors when mapping
+    }
+    if (mappedError) {
+        throw mappedError;
+    }
+    /**
+     * If no error is mapped, we rethrow the original error
+     */
     throw err;
 };
+const mapRpcError = (err) => {
+    /**
+     * Checks for user rejection error message
+     * Rainbow Extension will return a message like "User rejected the request"
+     * BitGet will return a message like "user reject this request"
+     * Keplr will return a message that matches "Request rejected"
+     */
+    if (typeof err.message === 'string' &&
+        (err.message.includes('User rejected the request') ||
+            err.message.includes('user reject this request') ||
+            err.message === 'Request rejected')) {
+        return new viem.UserRejectedRequestError(err);
+    }
+    return null;
+};
 
 exports.normalizeRpcError = normalizeRpcError;

package/src/utils/normalizeRpcError/normalizeRpcError.js

@@ -7,10 +7,41 @@ import { UserRejectedRequestError } from 'viem';
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const normalizeRpcError = (err) => {
-    if (err.code === undefined && err.message === 'Request rejected') {
-        throw new UserRejectedRequestError(err);
+    /**
+     * When the error already comply with the EIP-1193 standard, we don't need to normalize it
+     */
+    if (err.code === 4001) {
+        throw err;
     }
+    let mappedError = null;
+    try {
+        mappedError = mapRpcError(err);
+    }
+    catch (e) {
+        // ignore errors when mapping
+    }
+    if (mappedError) {
+        throw mappedError;
+    }
+    /**
+     * If no error is mapped, we rethrow the original error
+     */
     throw err;
 };
+const mapRpcError = (err) => {
+    /**
+     * Checks for user rejection error message
+     * Rainbow Extension will return a message like "User rejected the request"
+     * BitGet will return a message like "user reject this request"
+     * Keplr will return a message that matches "Request rejected"
+     */
+    if (typeof err.message === 'string' &&
+        (err.message.includes('User rejected the request') ||
+            err.message.includes('user reject this request') ||
+            err.message === 'Request rejected')) {
+        return new UserRejectedRequestError(err);
+    }
+    return null;
+};
 
 export { normalizeRpcError };