Merge pull request #988 from liquality/fix/eip-712-improvements

bradleySuira · web-flow · commit 3637e16399e1 · 2023-01-26T08:00:02.000-05:00
fix: fixes for EIP-712 injection
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liquality-wallet",
-  "version": "0.83.7",
+  "version": "0.83.8",
   "private": true,
   "author": "Liquality <info@liquality.io>",
   "scripts": {
diff --git a/src/locales/cb/pages.json b/src/locales/cb/pages.json
@@ -222,8 +222,9 @@
     "signTransaction": "Pirmahi ang Transaksyon",
     "requestToSign": "Paghangyo sa Pagpirma",
     "request": "Request",
-    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
-    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network: %{network}",
+    "chainIdErrorApprovedChain": "You connected to this dapp, using this other network: %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId: %{chainId}",
     "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
diff --git a/src/locales/cb/whats_new.json b/src/locales/cb/whats_new.json
@@ -3,7 +3,8 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)",
+      "Warning for non compliant EIP-712 injection request"
     ]
   },
   {
diff --git a/src/locales/en/pages.json b/src/locales/en/pages.json
@@ -222,8 +222,9 @@
     "signTransaction": "Sign Transaction",
     "requestToSign": "Request to Sign",
     "request": "Request",
-    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
-    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network: %{network}",
+    "chainIdErrorApprovedChain": "You connected to this dapp, using this other network: %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId: %{chainId}",
     "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
diff --git a/src/locales/en/whats_new.json b/src/locales/en/whats_new.json
@@ -3,7 +3,8 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)",
+      "Warning for non compliant EIP-712 injection request"
     ]
   },
   {
diff --git a/src/locales/es/pages.json b/src/locales/es/pages.json
@@ -222,8 +222,9 @@
     "signTransaction": "Firmar Transacción",
     "requestToSign": "Solicitud de Firma",
     "request": "Solicitud",
-    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
-    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network: %{network}",
+    "chainIdErrorApprovedChain": "You connected to this dapp, using this other network: %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId: %{chainId}",
     "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
diff --git a/src/locales/es/whats_new.json b/src/locales/es/whats_new.json
@@ -3,7 +3,8 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)",
+      "Warning for non compliant EIP-712 injection request"
     ]
   },
   {
diff --git a/src/locales/ph/pages.json b/src/locales/ph/pages.json
@@ -222,8 +222,9 @@
     "signTransaction": "I-sign ang Transaksyon",
     "requestToSign": "Kahilingan na Pumirma",
     "request": "Kahilingan",
-    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
-    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network: %{network}",
+    "chainIdErrorApprovedChain": "You connected to this dapp, using this other network: %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId: %{chainId}",
     "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
diff --git a/src/locales/ph/whats_new.json b/src/locales/ph/whats_new.json
@@ -3,7 +3,8 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)",
+      "Warning for non compliant EIP-712 injection request"
     ]
   },
   {
diff --git a/src/locales/pt/pages.json b/src/locales/pt/pages.json
@@ -222,8 +222,9 @@
     "signTransaction": "Assinar Transação",
     "requestToSign": "Solicitação para Assinar",
     "request": "Solicitar",
-    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
-    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network: %{network}",
+    "chainIdErrorApprovedChain": "You connected to this dapp, using this other network: %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId: %{chainId}",
     "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
diff --git a/src/locales/pt/whats_new.json b/src/locales/pt/whats_new.json
@@ -3,7 +3,8 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)",
+      "Warning for non compliant EIP-712 injection request"
     ]
   },
   {
diff --git a/src/locales/zh/pages.json b/src/locales/zh/pages.json
@@ -222,8 +222,9 @@
     "signTransaction": "签署交易",
     "requestToSign": "请求签名",
     "request": "请求",
-    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network %{network}",
-    "chainIdErrorRequestedChainId": "Requested chainId %{chainId}",
+    "chainIdErrorNetwork": "This site %{origin} is requesting a signature for the network: %{network}",
+    "chainIdErrorApprovedChain": "You connected to this dapp, using this other network: %{network}",
+    "chainIdErrorRequestedChainId": "Requested chainId: %{chainId}",
     "chainIdErrorRequestedAsset": "Requested asset: %{asset}"
   },
   "send": {
diff --git a/src/locales/zh/whats_new.json b/src/locales/zh/whats_new.json
@@ -3,7 +3,8 @@
     "page": "1",
     "title": "What's New?",
     "content": [
-      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"
+      "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)",
+      "Warning for non compliant EIP-712 injection request"
     ]
   },
   {
diff --git a/src/manifest.json b/src/manifest.json
@@ -1,6 +1,6 @@
 {
   "manifest_version": 2,
-  "version": "0.83.7",
+  "version": "0.83.8",
   "name": "__MSG_appName__",
   "description": "__MSG_appDesc__",
   "default_locale": "en",
diff --git a/src/views/PermissionSign.vue b/src/views/PermissionSign.vue
@@ -16,14 +16,23 @@
             </div>
           </div>
           <template v-else>
-            <div class="row">
+            <div class="row mt-2">
               <div class="col">
-                {{
-                  $t('pages.permission.chainIdErrorNetwork', {
-                    network: requestedChain ? requestedChain.name : 'UNKNOWN',
-                    origin: request.origin
-                  })
-                }}
+                <p>
+                  {{
+                    $t('pages.permission.chainIdErrorNetwork', {
+                      network: requestedChain ? requestedChain.name : 'UNKNOWN',
+                      origin: request.origin
+                    })
+                  }}
+                </p>
+                <p>
+                  {{
+                    $t('pages.permission.chainIdErrorApprovedChain', {
+                      network: approvedChainName
+                    })
+                  }}
+                </p>
               </div>
             </div>
             <div class="row mt-3">
@@ -142,7 +151,8 @@ export default {
       signRequestModalOpen: false,
       showErrorModal: false,
       requestedChainId: null,
-      requestedChain: null
+      requestedChain: null,
+      approvedChainName: ''
     }
   },
   methods: {
@@ -240,22 +250,29 @@ export default {
        **/
       this.requestedChainId = `${msgParams.data?.domain?.chainId}`.trim()
       // the requested chainId can be an integer, string or hex so we should convert it to int if we get an hex
-      const chainIdToValidate = isHex(this.requestedChainId)
+      const chainIdToValidate = this.requestedChainId.match(/^0[xX][0-9a-fA-F]+/i)
         ? parseInt(this.requestedChainId, 16)
         : this.requestedChainId
 
+      debugger
       // We shuold try to get the chain details from the requested chainId if it's valid
       const supportedChains = getAllSupportedChains()[this.activeNetwork] || {}
-      console.log(supportedChains)
-      this.requestedChain = Object.keys(supportedChains).find(
+
+      const requestedChainName = Object.keys(supportedChains).find(
         (chain) => supportedChains[chain]?.network?.chainId == chainIdToValidate
       )
-
+      if (requestedChainName) {
+        this.requestedChain = supportedChains[requestedChainName]
+      }
       // We get the chains inside the dapp permissions, the chain name should be inside the list
       const chains = Object.keys(this.dappConnections[this.request.origin] || {})
         .map((chainName) => getChain(this.activeNetwork, chainName))
         .filter((i) => i)
-      if (chains.findIndex((chain) => chain.network.chainId == chainIdToValidate) < 0) {
+      const index = chains.findIndex((chain) => chain.network.chainId == chainIdToValidate)
+      if (chains.length > 0) {
+        this.approvedChainName = chains[0].name
+      }
+      if (index < 0) {
         console.error(
           `The request chainId is not matching with the asset chainId and stored permissions, RequestChainId: ${msgParams.data?.domain?.chainId}`,
           this.request

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "liquality-wallet",`
`3`		`- "version": "0.83.7",`
	`3`	`+ "version": "0.83.8",`
`4`	`4`	`"private": true,`
`5`	`5`	`"author": "Liquality <info@liquality.io>",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`"page": "1",`
`4`	`4`	`"title": "What's New?",`
`5`	`5`	`"content": [`
`6`		`- "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)"`
	`6`	`+ "Fixes for Thorchain cross-chain Swaps (ETH<=>BTC)",`
	`7`	`+ "Warning for non compliant EIP-712 injection request"`
`7`	`8`	`]`
`8`	`9`	`},`
`9`	`10`	`{`