Merge pull request #115 from massalabs/return-signatures-as-base58enc…

…oded-string

update sig type to base58encoded string

src/account/Account.ts

@@ -2,7 +2,7 @@ import {
   IAccountBalanceRequest,
   IAccountBalanceResponse,
 } from './AccountBalance';
-import { IAccountSignRequest, IAccountSignResponse } from './AccountSign';
+import { IAccountSignOutput, IAccountSignRequest } from './AccountSign';
 import { connector } from '../connector/Connector';
 import { IAccountDetails } from './IAccountDetails';
 import { AvailableCommands, ITransactionDetails } from '..';
@@ -89,15 +89,15 @@ export class Account implements IAccount {
    * @param data - The message to be signed.
    * @returns An IAccountSignResponse object. It contains the signature of the message.
    */
-  public async sign(data: Buffer | Uint8Array): Promise<IAccountSignResponse> {
-    return new Promise<IAccountSignResponse>((resolve, reject) => {
+  public async sign(data: Buffer | Uint8Array): Promise<IAccountSignOutput> {
+    return new Promise<IAccountSignOutput>((resolve, reject) => {
       connector.sendMessageToContentScript(
         this._providerName,
         AvailableCommands.AccountSign,
         { address: this._address, data } as IAccountSignRequest,
         (result, err) => {
           if (err) return reject(err);
-          return resolve(result as IAccountSignResponse);
+          return resolve(result as IAccountSignOutput);
         },
       );
     });

src/account/AccountSign.ts

@@ -12,5 +12,13 @@ export interface IAccountSignRequest {
  */
 export interface IAccountSignResponse {
   publicKey: string;
-  signature: Uint8Array;
+  signature: string;
+}
+
+/**
+ * This interface represents the output of a sign() method
+ */
+export interface IAccountSignOutput {
+  publicKey: string;
+  base58Encoded: string;
 }

src/account/IAccount.ts

@@ -1,6 +1,6 @@
 import { ITransactionDetails } from '..';
 import { IAccountBalanceResponse } from './AccountBalance';
-import { IAccountSignResponse } from './AccountSign';
+import { IAccountSignOutput } from './AccountSign';
 import { Args } from '@massalabs/web3-utils';
 
 /**
@@ -12,7 +12,7 @@ export interface IAccount {
   name(): string;
   providerName(): string;
   balance(): Promise<IAccountBalanceResponse>;
-  sign(data: Buffer | Uint8Array | string): Promise<IAccountSignResponse>;
+  sign(data: Buffer | Uint8Array | string): Promise<IAccountSignOutput>;
   buyRolls(amount: bigint, fee: bigint): Promise<ITransactionDetails>;
   sellRolls(amount: bigint, fee: bigint): Promise<ITransactionDetails>;
   sendTransaction(

src/bearbyWallet/BearbyAccount.ts

@@ -20,6 +20,7 @@ import { NodeStatus } from './NodeStatus';
 import { JSON_RPC_REQUEST_METHOD } from './jsonRpcMethods';
 import axios, { AxiosRequestHeaders, AxiosResponse } from 'axios';
 import { decode } from 'bs58check';
+import { IAccountSignOutput } from '../account/AccountSign';
 /**
  * The maximum allowed gas for a read operation
  */
@@ -115,7 +116,7 @@ export class BearbyAccount implements IAccount {
   // need testing
   public async sign(
     data: Buffer | Uint8Array | string,
-  ): Promise<IAccountSignResponse> {
+  ): Promise<IAccountSignOutput> {
     await this.connect();
 
     let strData: string;
@@ -128,8 +129,8 @@ export class BearbyAccount implements IAccount {
     const signature = await web3.wallet.signMessage(strData);
     return {
       publicKey: signature.publicKey,
-      signature: decode(signature.signature),
-    } as IAccountSignResponse;
+      base58Encoded: signature.signature,
+    };
   }
 
   // need testing

src/massaStation/MassaStationAccount.ts

@@ -17,6 +17,8 @@ import {
 } from '@massalabs/web3-utils';
 
 import { argsToBase64, uint8ArrayToBase64 } from '../utils/argsToBase64';
+import { IAccountSignOutput } from '../account/AccountSign';
+import { encode as base58Encode } from 'bs58check';
 
 /**
  * The maximum allowed gas for a read operation
@@ -137,8 +139,9 @@ export class MassaStationAccount implements IAccount {
    */
   public async sign(
     data: Buffer | Uint8Array | string,
-  ): Promise<IAccountSignResponse> {
+  ): Promise<IAccountSignOutput> {
     let signOpResponse: JsonRpcResponseData<IAccountSignResponse> = null;
+
     try {
       signOpResponse = await postRequest<IAccountSignResponse>(
         `${MASSA_STATION_ACCOUNTS_URL}/${this._name}/sign`,
@@ -151,16 +154,18 @@ export class MassaStationAccount implements IAccount {
       console.error(`MassaStation account signing error`);
       throw ex;
     }
+
     if (signOpResponse.isError || signOpResponse.error) {
       throw signOpResponse.error;
     }
-    // convert signOpResponse.result.signature to Uint8Array
-    const signature = new Uint8Array(
-      Buffer.from(signOpResponse.result.signature),
+
+    const signature = base58Encode(
+      Buffer.from(signOpResponse.result.signature, 'base64'),
     );
+
     return {
       publicKey: signOpResponse.result.publicKey,
-      signature: signature,
+      base58Encoded: signature,
     };
   }