chore: move detectSIWEMessage to utils package

Author: iosh

packages/popup/package.json

@@ -35,7 +35,6 @@
     "@fluent-wallet/tx-history-checker": "workspace:*",
     "@fluent-wallet/use-rpc": "workspace:packages/ui/useRPC",
     "@fluent-wallet/utils": "workspace:packages/utils",
-    "@spruceid/siwe-parser": "patch:@spruceid/siwe-parser@npm%3A3.0.0#~/.yarn/patches/@spruceid-siwe-parser-npm-3.0.0-4572197cda.patch",
     "bn.js": "5.2.1",
     "dayjs": "1.10.7",
     "i18next": "21.5.2",

packages/popup/src/pages/RequestSignature/index.js

@@ -16,12 +16,12 @@ import {
 } from '../../hooks/useApi'
 
 import {RPC_METHODS} from '../../constants'
-import {detectSIWEMessage} from '../../utils'
 import {useMemo} from 'react'
 import {TypedDataSign} from './components/TypedDataSign'
 import {PersonalSign} from './components/PersonalSign'
 import {SignInSign} from './components/SignInSign'
 import Alert from '@fluent-wallet/component-alert'
+import {detectSIWEMessage} from '@fluent-wallet/utils'
 const {PERSONAL_SIGN, ACCOUNT_GROUP_TYPE} = RPC_METHODS
 
 function RequestSignature() {

packages/popup/src/utils/index.js

@@ -6,7 +6,6 @@ import {validateBase32Address} from '@fluent-wallet/base32-address'
 import {isHexAddress, isChecksummed, toChecksum} from '@fluent-wallet/account'
 import {CFX_MAINNET_CHAINID, ETH_MAINNET_CHAINID} from '@fluent-wallet/consts'
 import {isArray, isString} from '@fluent-wallet/checks'
-import {ParsedMessage} from '@spruceid/siwe-parser'
 import {
   PASSWORD_REG_EXP,
   RPC_METHODS,
@@ -403,27 +402,3 @@ export const formatNsName = nsName => {
 
   return nsName
 }
-
-export const detectSIWEMessage = message => {
-  try {
-    const sanitizedMessage = stripHexPrefix(message)
-    const bytes = new Uint8Array(sanitizedMessage.length / 2)
-    for (let i = 0; i < sanitizedMessage.length; i += 2) {
-      bytes[i / 2] = Number.parseInt(sanitizedMessage.substr(i, 2), 16)
-    }
-    const decoder = new TextDecoder('utf-8')
-
-    const decodedMessage = decoder.decode(bytes)
-
-    const parsedMessage = new ParsedMessage(decodedMessage)
-
-    return {
-      parsedMessage,
-      isSIWEMessage: true,
-    }
-  } catch (e) {
-    return {
-      isSIWEMessage: false,
-    }
-  }
-}

packages/utils/index.js

@@ -1,6 +1,7 @@
 import randombytes from 'randombytes'
 import {Buffer} from 'buffer'
 import BN from 'bn.js'
+import {ParsedMessage} from '@spruceid/siwe-parser'
 
 export const randomHex = function (size) {
   return '0x' + randombytes(size).toString('hex')
@@ -200,3 +201,27 @@ export const setLength = setLengthLeft
 export const setLengthRight = function (msg, length) {
   return setLength(msg, length, true)
 }
+
+export const detectSIWEMessage = message => {
+  try {
+    const sanitizedMessage = stripHexPrefix(message)
+    const bytes = new Uint8Array(sanitizedMessage.length / 2)
+    for (let i = 0; i < sanitizedMessage.length; i += 2) {
+      bytes[i / 2] = Number.parseInt(sanitizedMessage.substr(i, 2), 16)
+    }
+    const decoder = new TextDecoder('utf-8')
+
+    const decodedMessage = decoder.decode(bytes)
+
+    const parsedMessage = new ParsedMessage(decodedMessage)
+
+    return {
+      parsedMessage,
+      isSIWEMessage: true,
+    }
+  } catch (e) {
+    return {
+      isSIWEMessage: false,
+    }
+  }
+}

packages/utils/package.json

@@ -4,6 +4,7 @@
   "type": "module",
   "main": "index.js",
   "dependencies": {
+    "@spruceid/siwe-parser": "patch:@spruceid/siwe-parser@npm%3A3.0.0#~/.yarn/patches/@spruceid-siwe-parser-npm-3.0.0-4572197cda.patch",
     "bn.js": "5.2.1",
     "is-hex-prefixed": "^1.0.0",
     "randombytes": "^2.1.0",

yarn.lock

@@ -5052,6 +5052,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@fluent-wallet/utils@workspace:packages/utils"
   dependencies:
+    "@spruceid/siwe-parser": "patch:@spruceid/siwe-parser@npm%3A3.0.0#~/.yarn/patches/@spruceid-siwe-parser-npm-3.0.0-4572197cda.patch"
     bn.js: "npm:5.2.1"
     is-hex-prefixed: "npm:^1.0.0"
     randombytes: "npm:^2.1.0"
@@ -18373,7 +18374,6 @@ __metadata:
     "@fluent-wallet/tx-history-checker": "workspace:*"
     "@fluent-wallet/use-rpc": "workspace:packages/ui/useRPC"
     "@fluent-wallet/utils": "workspace:packages/utils"
-    "@spruceid/siwe-parser": "patch:@spruceid/siwe-parser@npm%3A3.0.0#~/.yarn/patches/@spruceid-siwe-parser-npm-3.0.0-4572197cda.patch"
     bn.js: "npm:5.2.1"
     dayjs: "npm:1.10.7"
     i18next: "npm:21.5.2"