@startbahn/startrail-sdk-js 1.25.1 → 1.25.2

package/dist/startrail-sdk.js

@@ -165579,21 +165579,24 @@ class Service {
      * Sign message with the Ethereum private key associated to your wallet
      * @throws Will throw an error
      */
-    signMessage(message, isPopup) {
+    signMessage(message, disableCustomPrefix) {
         return __awaiter(this, void 0, void 0, function* () {
             let customMessage = { message: '', prefix: '' };
-            let messageHash;
-            if (!isPopup) {
+            let paramsToBeSigned;
+            if (this.wallet === undefined)
+                throw new error_1.CustomError(Error(constant_1.StartrailSdkErrorCodeEnum.WALLET_NOT_INITIALIZED)).sdk();
+            const wallet = this.wallet.wallet;
+            if (!disableCustomPrefix && wallet instanceof torus_1.default) {
                 // For customPrefix in defined in torus-embed
                 customMessage = util_1.createCustomMessage(globalThis.location.hostname, message);
-                messageHash = util_1.generateMessageHash(customMessage.message);
+                paramsToBeSigned = [wallet.EOA, util_1.generateMessageHash(customMessage.message), { customPrefix: customMessage.prefix, customMessage: message }];
             }
             else {
-                messageHash = util_1.generateMessageHash(message);
+                paramsToBeSigned = [wallet.EOA, util_1.generateMessageHash(message)];
             }
             try {
-                const signature = yield this.wallet.signMessage(messageHash, message, (customMessage.prefix || undefined));
-                return { signature, prefix: customMessage.prefix };
+                const signature = yield this.wallet.signMessage(paramsToBeSigned);
+                return { signature, prefix: customMessage.prefix || undefined };
             }
             catch (error) {
                 return this._throwExceptionOrReturnFalse(error);
@@ -165926,16 +165929,18 @@ class Startrail {
     }
     /**
      * Sign message with the Ethereum private key associated to your wallet
+     * @param message Original message to be signed
+     * @param disableCustomPrefix Default adds a custom prefix to the message so that Startrail/Torus wallet allows signing without popup consent
      * @throws Will throw an error
      */
-    signMessage(message, isPopup) {
+    signMessage(message, disableCustomPrefix) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.store.torusStatus.popupInprogress)
                 return false;
             this.store.switchPopupState();
             try {
                 yield this.service.initAndLogin();
-                return yield this.service.signMessage(message, isPopup);
+                return yield this.service.signMessage(message, disableCustomPrefix);
             }
             finally {
                 this.store.switchPopupState();
@@ -166464,12 +166469,11 @@ class WalletBuilder {
      * @param hashedMessage
      * @todo Fix d.ts in @toruslabs/torus-embed
      */
-    signMessage(messageHash, message, customPrefix) {
+    signMessage(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.wallet === undefined)
                 throw new error_1.CustomError(Error(constant_1.StartrailSdkErrorCodeEnum.WALLET_NOT_INITIALIZED)).sdk();
-            const params = customPrefix ? [this.wallet.EOA, messageHash, { customPrefix, customMessage: message }] : [this.wallet.EOA, messageHash];
-            return this.wallet.signMessage(this.wallet.EOA, params);
+            return this.wallet.signMessage(params);
         });
     }
     signTypedDataMessage(typedData) {
@@ -166534,14 +166538,14 @@ class Wallet {
         this.EOA = '';
         this.initialEOA = ''; // To detect EOA switched from the initial to different one with browser based extension wallets such as Metamask
     }
-    signMessage(eoa, params) {
+    signMessage(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const web3 = new web3_1.default(this.provider);
             return yield (() => new Promise((resolve, reject) => {
                 web3.currentProvider.send({
                     method: 'eth_sign',
                     params,
-                    from: eoa
+                    from: this.EOA
                 }, (err, res) => {
                     if (err) {
                         reject(err);
@@ -166666,13 +166670,13 @@ class Metamask extends base_1.default {
             };
         });
     }
-    signMessage(eoa, params) {
+    signMessage(params) {
         const _super = Object.create(null, {
             signMessage: { get: () => super.signMessage }
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield _super.signMessage.call(this, eoa, params);
+                return yield _super.signMessage.call(this, params);
             }
             catch (e) {
                 throw new error_1.CustomError(e).sdk();
@@ -166855,13 +166859,13 @@ class Torus extends base_1.default {
      * @param hashedMessage
      * @todo Fix d.ts in @toruslabs/torus-embed
      */
-    signMessage(eoa, params) {
+    signMessage(params) {
         const _super = Object.create(null, {
             signMessage: { get: () => super.signMessage }
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield _super.signMessage.call(this, eoa, params);
+                return yield _super.signMessage.call(this, params);
             }
             catch (e) {
                 throw new error_1.CustomError(e).torus();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startbahn/startrail-sdk-js",
-  "version": "1.25.1",
+  "version": "1.25.2",
   "description": "Startrail Api for JS SDK",
   "main": "dist/startrail-sdk.js",
   "unpkg": "dist/startrail-sdk.js",

package/types/startrail-sdk-js.d.ts

@@ -29,9 +29,11 @@ declare module '@startbahn/startrail-sdk-js' {
       getUserInfo(): Promise<Type.UserInfo | false>;
       /**
         * Sign message with the Ethereum private key associated to your wallet
+        * @param message Original message to be signed
+        * @param disableCustomPrefix Default adds a custom prefix to the message so that Startrail/Torus wallet allows signing without popup consent
         * @throws Will throw an error
         */
-      signMessage(message: string, isPopup?: boolean): Promise<Type.MessageSignature | false>;
+      signMessage(message: string, disableCustomPrefix?: boolean): Promise<Type.MessageSignature | false>;
       /**
         * Create SRR
         * Send tx to Startrail Ethereum smart-contract with meta-tx in which signature is generated by your private key
@@ -288,8 +290,12 @@ declare module '@startbahn/startrail-sdk-js/types' {
   }
   export interface MessageSignature {
       signature: string;
-      prefix?: string;
+      prefix: string | undefined;
   }
+  export type MessageToBeSigned = [string, string] | [string, string, {
+      customPrefix: string;
+      customMessage: string;
+  }];
   export interface startrailLUWAddress {
       startrailLUWAddress: string;
   }
@@ -645,7 +651,7 @@ declare module '@startbahn/startrail-sdk-js/service' {
         * Sign message with the Ethereum private key associated to your wallet
         * @throws Will throw an error
         */
-      signMessage(message: string, isPopup?: boolean): Promise<Type.MessageSignature | false>;
+      signMessage(message: string, disableCustomPrefix?: boolean): Promise<Type.MessageSignature | false>;
       /**
         * Sign typed data according to EIP-712 standard
         */
@@ -800,7 +806,7 @@ declare module '@startbahn/startrail-sdk-js/errorClass' {
 }
 
 declare module '@startbahn/startrail-sdk-js/walletBuilder' {
-  import { EIP712TypedData, Language, OverwriteStartrailSDKConfig, UserInfo } from '@startbahn/startrail-sdk-js/types';
+  import { EIP712TypedData, Language, MessageToBeSigned, OverwriteStartrailSDKConfig, UserInfo } from '@startbahn/startrail-sdk-js/types';
   import Wallet from '@startbahn/startrail-sdk-js/wallets/base';
   class WalletBuilder {
       wallet?: Wallet;
@@ -831,7 +837,7 @@ declare module '@startbahn/startrail-sdk-js/walletBuilder' {
         * @param hashedMessage
         * @todo Fix d.ts in @toruslabs/torus-embed
         */
-      signMessage(messageHash: string, message: string, customPrefix: string | undefined): Promise<string>;
+      signMessage(params: MessageToBeSigned): Promise<string>;
       signTypedDataMessage(typedData: EIP712TypedData): Promise<string>;
       /**
         * Change language on your browser wallet if it's provided
@@ -1019,7 +1025,7 @@ declare module '@startbahn/startrail-sdk-js/constant' {
 }
 
 declare module '@startbahn/startrail-sdk-js/wallets/base' {
-  import { EIP712TypedData, OverwriteStartrailSDKConfig, UserInfo } from '@startbahn/startrail-sdk-js/types';
+  import { EIP712TypedData, MessageToBeSigned, OverwriteStartrailSDKConfig, UserInfo } from '@startbahn/startrail-sdk-js/types';
   abstract class Wallet {
     EOA: string;
     initialEOA: string;
@@ -1028,7 +1034,7 @@ declare module '@startbahn/startrail-sdk-js/wallets/base' {
     abstract init(): Promise<void>;
     abstract login(): Promise<string[]>;
     abstract getUserInfo(): Promise<UserInfo>;
-    signMessage(eoa: string, params: object): Promise<string>;
+    signMessage(params: MessageToBeSigned): Promise<string>;
     signTypedDataMessage(eoa: string, typedData: EIP712TypedData): Promise<string>;
     logout(): Promise<void>;
     overwriteConfig(partialConfig: OverwriteStartrailSDKConfig): void;