Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch eth-sig-util to @metamask/eth-sig-util #286

Merged
merged 9 commits into from
Apr 30, 2024
Merged

Switch eth-sig-util to @metamask/eth-sig-util #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e2d101
Switch eth-sig-util to @metamask/eth-sig-util
tmashuang Jan 24, 2024
4b99e8e
Polyfill packages
tmashuang Jan 24, 2024
160a859
Merge branch 'main' into mm-eth-sig-util
legobeat Apr 15, 2024
4d62d12
Remove extraneous packages not needed to start test dapp
tmashuang Apr 19, 2024
f71f340
No resolution for extraneous packages webpack config
tmashuang Apr 19, 2024
73d43fd
Remove extra package missed in previous commit
tmashuang Apr 19, 2024
ad790e4
Merge branch 'main' into mm-eth-sig-util
tmashuang Apr 19, 2024
3cc8efa
Merge branch 'main' into mm-eth-sig-util
legobeat Apr 23, 2024
6bfbc7d
Merge branch 'main' into mm-eth-sig-util
tmashuang Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"@metamask/auto-changelog": "^2.5.0",
"@metamask/eslint-config": "^6.0.0",
"@metamask/eslint-config-nodejs": "^6.0.0",
"@metamask/eth-sig-util": "^7.0.1",
"@metamask/onboarding": "^1.0.0",
"@openzeppelin/contracts": "4.9.6",
"assert": "^2.1.0",
Expand All @@ -52,7 +53,6 @@
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.0",
"eth-sig-util": "^2.5.3",
"ethereumjs-util": "^5.1.1",
"@web3modal/ethers5": "^3.2.0",
"@walletconnect/modal": "^2.6.2",
Expand Down
34 changes: 18 additions & 16 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ import { createWeb3Modal, defaultConfig } from '@web3modal/ethers5';
import {
encrypt,
recoverPersonalSignature,
recoverTypedSignatureLegacy,
recoverTypedSignature,
recoverTypedSignature_v4 as recoverTypedSignatureV4,
} from 'eth-sig-util';
} from '@metamask/eth-sig-util';
import { ethers } from 'ethers';
import { toChecksumAddress } from 'ethereumjs-util';
import { getPermissionsDisplayString, stringifiableToHex } from './utils';
Expand Down Expand Up @@ -2037,11 +2035,11 @@ const initializeFormElements = () => {
encryptButton.onclick = () => {
try {
ciphertextDisplay.innerText = stringifiableToHex(
encrypt(
encryptionKeyDisplay.innerText,
{ data: encryptMessageInput.value },
'x25519-xsalsa20-poly1305',
),
encrypt({
publicKey: encryptionKeyDisplay.innerText,
data: encryptMessageInput.value,
version: 'x25519-xsalsa20-poly1305',
}),
);
decryptButton.disabled = false;
} catch (error) {
Expand Down Expand Up @@ -2252,7 +2250,7 @@ const initializeFormElements = () => {
const sign = personalSignResult.innerHTML;
const recoveredAddr = recoverPersonalSignature({
data: msg,
sig: sign,
signature: sign,
});
if (recoveredAddr === from) {
console.log(`SigUtil Successfully verified signer as ${recoveredAddr}`);
Expand Down Expand Up @@ -2331,9 +2329,10 @@ const initializeFormElements = () => {
try {
const from = accounts[0];
const sign = signTypedDataResult.innerHTML;
const recoveredAddr = await recoverTypedSignatureLegacy({
const recoveredAddr = await recoverTypedSignature({
data: msgParams,
sig: sign,
signature: sign,
version: 'V1',
});
if (toChecksumAddress(recoveredAddr) === toChecksumAddress(from)) {
console.log(`Successfully verified signer as ${recoveredAddr}`);
Expand Down Expand Up @@ -2450,7 +2449,8 @@ const initializeFormElements = () => {
const sign = signTypedDataV3Result.innerHTML;
const recoveredAddr = await recoverTypedSignature({
data: msgParams,
sig: sign,
signature: sign,
version: 'V3',
});
if (toChecksumAddress(recoveredAddr) === toChecksumAddress(from)) {
console.log(`Successfully verified signer as ${recoveredAddr}`);
Expand Down Expand Up @@ -2595,9 +2595,10 @@ const initializeFormElements = () => {
try {
const from = accounts[0];
const sign = signTypedDataV4Result.innerHTML;
const recoveredAddr = recoverTypedSignatureV4({
const recoveredAddr = recoverTypedSignature({
data: msgParams,
sig: sign,
signature: sign,
version: 'V4',
});
if (toChecksumAddress(recoveredAddr) === toChecksumAddress(from)) {
console.log(`Successfully verified signer as ${recoveredAddr}`);
Expand Down Expand Up @@ -2744,9 +2745,10 @@ const initializeFormElements = () => {
};
try {
const sign = signPermitResult.innerHTML;
const recoveredAddr = recoverTypedSignatureV4({
const recoveredAddr = recoverTypedSignature({
data: msgParams,
sig: sign,
signature: sign,
version: 'V4',
});
if (toChecksumAddress(recoveredAddr) === toChecksumAddress(from)) {
console.log(`Successfully verified signer as ${recoveredAddr}`);
Expand Down
4 changes: 4 additions & 0 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ module.exports = {
assert: require.resolve('assert/'),
process: require.resolve('process/browser'),
stream: require.resolve('stream-browserify'),
http: false,
https: false,
zlib: false,
url: false,
},
},
devtool: 'eval-source-map',
Expand Down
Loading
Loading