[C-927] Fix 0x prefix in native (#3788)

AudiusProject · Aug 31, 2022 · b2033d5 · b2033d5
1 parent 287f5e2
commit b2033d5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/libs/src/api/Account.ts b/libs/src/api/Account.ts
@@ -241,7 +241,7 @@ export class Account extends Base {
 
       const unixTs = Math.round(new Date().getTime() / 1000) // current unix timestamp (sec)
       const data = `Click sign to authenticate with identity service: ${unixTs}`
-      const signature = await this.web3Manager.sign(data)
+      const signature = await this.web3Manager.sign(Buffer.from(data, 'utf-8'))
 
       const recoveryData = {
         login: recoveryInfo.login,
@@ -709,7 +709,9 @@ export class Account extends Base {
     this.REQUIRES(Services.IDENTITY_SERVICE)
     const unixTs = Math.round(new Date().getTime() / 1000) // current unix timestamp (sec)
     const message = `Click sign to authenticate with identity service: ${unixTs}`
-    const signature = await this.ethWeb3Manager.sign(message)
+    const signature = await this.ethWeb3Manager.sign(
+      Buffer.from(message, 'utf-8')
+    )
     const wallet = this.ethWeb3Manager.getWalletAddress()
     return await this.identityService.updateMinimumDelegationAmount(
       wallet,

diff --git a/libs/src/services/identity/IdentityService.ts b/libs/src/services/identity/IdentityService.ts
@@ -567,7 +567,9 @@ export class IdentityService {
     if (this.web3Manager) {
       const unixTs = Math.round(new Date().getTime() / 1000) // current unix timestamp (sec)
       const message = `Click sign to authenticate with identity service: ${unixTs}`
-      const signature = await this.web3Manager?.sign(message)
+      const signature = await this.web3Manager?.sign(
+        Buffer.from(message, 'utf-8')
+      )
       return {
         [AuthHeaders.MESSAGE]: message,
         [AuthHeaders.SIGNATURE]: signature

diff --git a/libs/src/services/web3Manager/Web3Manager.ts b/libs/src/services/web3Manager/Web3Manager.ts
@@ -139,17 +139,17 @@ export class Web3Manager {
    * Signs provided string data (should be timestamped).
    * @param data
    */
-  async sign(data: string) {
+  async sign(data: string | Buffer) {
     if (this.useExternalWeb3) {
       const account = this.getWalletAddress()
       if (this.isServer) {
         return await this.web3?.eth.sign(
-          this.web3.utils.fromUtf8(data),
+          this.web3.utils.fromUtf8(data as string),
           account
         )
       } else {
         return await this.web3?.eth.personal.sign(
-          this.web3.utils.fromUtf8(data),
+          this.web3.utils.fromUtf8(data as string),
           account,
           ''
         )