From 950a476f30117ee9f2bbd79944160809ed6770ba Mon Sep 17 00:00:00 2001 From: Jaco Date: Fri, 17 Sep 2021 13:03:49 +0300 Subject: [PATCH] Allow verification of new-style message wrapping (#6144) --- packages/page-signing/src/Verify.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/page-signing/src/Verify.tsx b/packages/page-signing/src/Verify.tsx index ebc1b2271c..d24a7decf8 100644 --- a/packages/page-signing/src/Verify.tsx +++ b/packages/page-signing/src/Verify.tsx @@ -6,6 +6,7 @@ import type { KeypairType } from '@polkadot/util-crypto/types'; import React, { useCallback, useEffect, useState } from 'react'; import styled from 'styled-components'; +import { wrapBytes } from '@polkadot/extension-dapp'; import { Badge, Dropdown, Input, InputAddress, Static } from '@polkadot/react-components'; import { useApi } from '@polkadot/react-hooks'; import { keyring } from '@polkadot/ui-keyring'; @@ -36,7 +37,11 @@ function Verify ({ className = '' }: Props): React.ReactElement { // We use signatureVerify to detect validity and crypto type if (isValid && publicKey) { - const verification = signatureVerify(data, signature, publicKey); + let verification = signatureVerify(data, signature, publicKey); + + if (verification.crypto === 'none') { + verification = signatureVerify(wrapBytes(data), signature, publicKey); + } if (verification.crypto !== 'none') { isValid = verification.isValid;