From 0f5218220eae92abbac66a3c3de3342d7764a9a0 Mon Sep 17 00:00:00 2001 From: Senji888 <44082144+Ben-Rey@users.noreply.github.com> Date: Thu, 24 Aug 2023 10:30:43 +0200 Subject: [PATCH] fix signature from wallet pro (#461) * fix signature from wallet pro * fix wallet pro version * patch --- package-lock.json | 12 ++++++------ package.json | 4 ++-- src/web3/accounts/WalletProviderAccount.ts | 7 +++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8231b3a4..3f5344c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "@massalabs/massa-web3", - "version": "2.2.0", + "version": "2.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@massalabs/massa-web3", - "version": "2.2.0", + "version": "2.2.1", "license": "(MIT AND Apache-2.0)", "dependencies": { - "@massalabs/wallet-provider": "^1.3.2", + "@massalabs/wallet-provider": "^1.3.3", "@noble/ed25519": "^1.7.3", "@noble/hashes": "^1.2.0", "@types/ws": "^8.5.4", @@ -1471,9 +1471,9 @@ } }, "node_modules/@massalabs/wallet-provider": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@massalabs/wallet-provider/-/wallet-provider-1.3.2.tgz", - "integrity": "sha512-aqQTueogva2viRDR5kEZU4ePmyix7F84Z0HvpwbXA7Rzx01aq5pnhMuMmBIdHyViN2B+zOQvtKYmepEv/NkvBg==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@massalabs/wallet-provider/-/wallet-provider-1.3.3.tgz", + "integrity": "sha512-43yix68rJPrNBl8T8cnYFLhX0WI+jIKMLjC5Bp+PEyl0y1jQh4bUg7jY/vocFdlBkD5MaxUQ55rAoIlOLLmPAA==", "dependencies": { "@hicaru/bearby.js": "^0.4.7", "@massalabs/web3-utils": "^1.4.1", diff --git a/package.json b/package.json index 51ea4e18..ed08eafe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@massalabs/massa-web3", - "version": "2.2.0", + "version": "2.2.1", "description": "massa's web3 sdk client", "main": "dist/cmd/index.js", "module": "dist/esm/index.js", @@ -58,7 +58,7 @@ "bundle.min.js" ], "dependencies": { - "@massalabs/wallet-provider": "^1.3.2", + "@massalabs/wallet-provider": "^1.3.3", "@noble/ed25519": "^1.7.3", "@noble/hashes": "^1.2.0", "@types/ws": "^8.5.4", diff --git a/src/web3/accounts/WalletProviderAccount.ts b/src/web3/accounts/WalletProviderAccount.ts index df0b3cc9..6f5e7a91 100644 --- a/src/web3/accounts/WalletProviderAccount.ts +++ b/src/web3/accounts/WalletProviderAccount.ts @@ -1,6 +1,5 @@ import { IBaseAccount } from '../../interfaces/IBaseAccount'; import { IAccount } from '@massalabs/wallet-provider'; -import { base58Encode } from '../../utils/Xbqcrypto'; import { ISignature } from '../../interfaces/ISignature'; import { IRollsData } from '../../interfaces/IRollsData'; import { ITransactionData } from '../../interfaces/ITransactionData'; @@ -18,12 +17,12 @@ export class WalletProviderAccount implements IBaseAccount { if (data instanceof Uint8Array) { data = Buffer.from(data); } + const signatureData = await this.account.sign(data); - let bytes_signature = signatureData.signature; - const base58Encoded = base58Encode(bytes_signature); + return { publicKey: signatureData.publicKey, - base58Encoded, + base58Encoded: signatureData.base58Encoded, }; }