carbon-js-sdk 0.11.66 → 0.11.67

package/lib/CarbonSDK.js

@@ -375,7 +375,7 @@ class CarbonSDK {
             let message;
             let signature;
             if (signMessageRequired) {
-                const result = yield MetaMask_1.MetaMask.signAndRecoverPubKey(metamask, opts === null || opts === void 0 ? void 0 : opts.enableJwtAuth);
+                const result = yield MetaMask_1.MetaMask.signAndRecoverPubKey(metamask, opts === null || opts === void 0 ? void 0 : opts.enableJwtAuth, opts === null || opts === void 0 ? void 0 : opts.authMessage);
                 pubKey = result.publicKey;
                 message = result.message;
                 signature = result.signature;
@@ -388,7 +388,7 @@ class CarbonSDK {
                     public_key: Buffer.from(pubKey, 'base64').toString('hex'),
                     signature: signature,
                 };
-                yield wallet.reloadJwtToken(authRequest);
+                yield wallet.reloadJwtToken(authRequest, opts === null || opts === void 0 ? void 0 : opts.authMessage);
             }
             return this.connect(wallet, opts);
         });
@@ -406,7 +406,7 @@ class CarbonSDK {
             let message;
             let signature;
             if (signMessageRequired) {
-                const result = yield RainbowKitAccount_1.default.signAndRecoverPubKey(rainbowKit, opts === null || opts === void 0 ? void 0 : opts.enableJwtAuth);
+                const result = yield RainbowKitAccount_1.default.signAndRecoverPubKey(rainbowKit, opts === null || opts === void 0 ? void 0 : opts.enableJwtAuth, opts === null || opts === void 0 ? void 0 : opts.authMessage);
                 pubKey = result.publicKey;
                 message = result.message;
                 signature = result.signature;
@@ -419,7 +419,7 @@ class CarbonSDK {
                     public_key: Buffer.from(pubKey, 'base64').toString('hex'),
                     signature: signature,
                 };
-                yield wallet.reloadJwtToken(authRequest);
+                yield wallet.reloadJwtToken(authRequest, opts === null || opts === void 0 ? void 0 : opts.authMessage);
             }
             return this.connect(wallet, opts);
         });

package/lib/provider/metamask/MetaMask.d.ts

@@ -39,7 +39,7 @@ export declare class MetaMask extends Eip6963Provider {
     private blockchain;
     private connectedAccount;
     static createMetamaskSigner(metamask: MetaMask, evmChainId: string, pubKeyBase64: string, addressOptions: SWTHAddressOptions): CarbonSigner;
-    static signAndRecoverPubKey(provider: MetaMask, enableJwtAuth?: boolean): Promise<{
+    static signAndRecoverPubKey(provider: MetaMask, enableJwtAuth?: boolean, customMsg?: string): Promise<{
         publicKey: string;
         signature: string;
         message: string;

package/lib/provider/metamask/MetaMask.js

@@ -269,16 +269,16 @@ class MetaMask extends eip6963Provider_1.Eip6963Provider {
             signMessage,
         };
     }
-    static signAndRecoverPubKey(provider, enableJwtAuth) {
+    static signAndRecoverPubKey(provider, enableJwtAuth, customMsg = evm_1.DEFAULT_PUBLIC_KEY_MESSAGE) {
         return __awaiter(this, void 0, void 0, function* () {
             const address = yield provider.defaultAccount();
-            const message = enableJwtAuth ? index_1.AuthUtils.getAuthMessage() : evm_1.DEFAULT_PUBLIC_KEY_MESSAGE;
-            const signature = yield provider.personalSign(address, message);
-            const publicKeyHex = index_1.EvmUtils.recoverPublicKey(message, signature);
+            const signMessage = enableJwtAuth ? index_1.AuthUtils.getAuthMessage(customMsg) : customMsg;
+            const signature = yield provider.personalSign(address, signMessage);
+            const publicKeyHex = index_1.EvmUtils.recoverPublicKey(signMessage, signature);
             return {
                 publicKey: Buffer.from(publicKeyHex, 'hex').toString('base64'),
                 signature,
-                message,
+                message: signMessage,
             };
         });
     }

package/lib/provider/rainbowKit/RainbowKitAccount.d.ts

@@ -25,7 +25,7 @@ declare class RainbowKitAccount extends Eip6963Provider {
     verifyNetworkAndConnectedAccount(evmHexAddress: string, evmChainId: string): Promise<void>;
     verifyConnectedAccount(address: string): Promise<void>;
     verifyNetwork(evmChainId: string): Promise<void>;
-    static signAndRecoverPubKey(provider: RainbowKitAccount, enableJwtAuth?: boolean): Promise<{
+    static signAndRecoverPubKey(provider: RainbowKitAccount, enableJwtAuth?: boolean, customMsg?: string): Promise<{
         publicKey: string;
         signature: string;
         message: string;

package/lib/provider/rainbowKit/RainbowKitAccount.js

@@ -253,16 +253,16 @@ class RainbowKitAccount extends eip6963Provider_1.Eip6963Provider {
             yield this.changeNetworkIfRequired("Carbon", network);
         });
     }
-    static signAndRecoverPubKey(provider, enableJwtAuth) {
+    static signAndRecoverPubKey(provider, enableJwtAuth, customMsg = evm_1.DEFAULT_PUBLIC_KEY_MESSAGE) {
         return __awaiter(this, void 0, void 0, function* () {
             const address = yield provider.defaultAccount();
-            const message = enableJwtAuth ? index_1.AuthUtils.getAuthMessage() : evm_1.DEFAULT_PUBLIC_KEY_MESSAGE;
-            const signature = yield provider.personalSign(address, message);
-            const publicKeyHex = index_1.EvmUtils.recoverPublicKey(message, signature);
+            const signMessage = enableJwtAuth ? index_1.AuthUtils.getAuthMessage(customMsg) : customMsg;
+            const signature = yield provider.personalSign(address, signMessage);
+            const publicKeyHex = index_1.EvmUtils.recoverPublicKey(signMessage, signature);
             return {
                 publicKey: Buffer.from(publicKeyHex, 'hex').toString('base64'),
                 signature,
-                message,
+                message: signMessage,
             };
         });
     }

package/lib/util/auth.d.ts

@@ -25,7 +25,7 @@ export declare type GrantRequest = {
     signature: string;
     refresh_token?: string;
 });
-export declare const getAuthMessage: () => string;
+export declare const getAuthMessage: (message: string) => string;
 export declare const hasExpired: (exp?: number) => boolean;
 export declare const hasRefreshTokenExpired: (refreshToken: string) => boolean;
 export declare const isValidIssuer: (iss: string | undefined, network: Network) => boolean;

package/lib/util/auth.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidIssuer = exports.hasRefreshTokenExpired = exports.hasExpired = exports.getAuthMessage = exports.GrantType = exports.expirybufferSeconds = void 0;
 const constant_1 = require("../constant");
 const dayjs_1 = __importDefault(require("dayjs"));
-const evm_1 = require("./evm");
 exports.expirybufferSeconds = 30;
 var GrantType;
 (function (GrantType) {
@@ -14,9 +13,9 @@ var GrantType;
     GrantType["SignatureEth"] = "signature_eth";
     GrantType["RefreshToken"] = "refresh_token";
 })(GrantType = exports.GrantType || (exports.GrantType = {}));
-const getAuthMessage = () => {
+const getAuthMessage = (message) => {
     const timestamp = dayjs_1.default().format('YYYY/MM/DD HH:mm:ss Z');
-    return `${evm_1.DEFAULT_PUBLIC_KEY_MESSAGE}\n[${timestamp}]`;
+    return `${message}\n[${timestamp}]`;
 };
 exports.getAuthMessage = getAuthMessage;
 const hasExpired = (exp = 0) => {

package/lib/wallet/CarbonWallet.d.ts

@@ -34,6 +34,7 @@ export interface CarbonWalletGenericOpts {
     gasFee?: GasFee;
     isRainbowKit?: boolean;
     enableJwtAuth?: boolean;
+    authMessage?: string;
     jwt?: AccessTokenResponse;
     /**
      * Optional callback that will be called before signing is requested/executed.
@@ -156,7 +157,7 @@ export declare class CarbonWallet {
     static withRainbowKit(rainbowKit: RainbowKitAccount, evmChainId: string, compressedPubKeyBase64: string, addressOptions: SWTHAddressOptions, walletProvider: SupportedEip6963Provider, opts?: Omit<CarbonWalletInitOpts, "signer">): CarbonWallet;
     static withAddress(bech32Address: string, opts?: Partial<CarbonWalletInitOpts>): CarbonWallet;
     initialize(queryClient: CarbonQueryClient, gasFee: GasFee, fallbackConfig?: OverrideConfig | null, opts?: CarbonWalletGenericOpts): Promise<CarbonWallet>;
-    reloadJwtToken(request?: GrantRequest): Promise<void>;
+    reloadJwtToken(request?: GrantRequest, authMessage?: string): Promise<void>;
     queryViewOnlyEvmHexAddress(): Promise<void>;
     private refreshJwtToken;
     private getNewJwtToken;

package/lib/wallet/CarbonWallet.js

@@ -28,6 +28,7 @@ const address_1 = require("../util/address");
 const auth_2 = require("../util/auth");
 const blockchain_1 = require("../util/blockchain");
 const ethermint_1 = require("../util/ethermint");
+const evm_1 = require("../util/evm");
 const fetch_1 = require("../util/fetch");
 const generic_1 = require("../util/generic");
 const number_1 = require("../util/number");
@@ -182,7 +183,7 @@ class CarbonWallet {
             if (!this.tmClient)
                 promises.push(this.reconnectTmClient(fallbackConfig));
             if ((opts === null || opts === void 0 ? void 0 : opts.enableJwtAuth) && !this.isViewOnlyWallet())
-                promises.push(this.reloadJwtToken());
+                promises.push(this.reloadJwtToken(undefined, opts === null || opts === void 0 ? void 0 : opts.authMessage));
             if (this.isViewOnlyWallet())
                 promises.push(this.queryViewOnlyEvmHexAddress());
             yield Promise.all(promises);
@@ -190,22 +191,22 @@ class CarbonWallet {
             return this;
         });
     }
-    reloadJwtToken(request) {
+    reloadJwtToken(request, authMessage = evm_1.DEFAULT_PUBLIC_KEY_MESSAGE) {
         return __awaiter(this, void 0, void 0, function* () {
             const network = this.network;
             if (this.jwt) {
                 const { iss, exp } = jwt_decode_1.jwtDecode(this.jwt.access_token);
                 if (!auth_2.isValidIssuer(iss, network))
-                    return this.getNewJwtToken(request);
+                    return this.getNewJwtToken(authMessage, request);
                 const accessTokenExpired = auth_2.hasExpired(exp);
                 if (accessTokenExpired) {
                     if (!auth_2.hasRefreshTokenExpired(this.jwt.refresh_token))
                         return this.refreshJwtToken(this.jwt.refresh_token);
-                    return this.getNewJwtToken(request);
+                    return this.getNewJwtToken(authMessage, request);
                 }
                 return;
             }
-            return this.getNewJwtToken(request);
+            return this.getNewJwtToken(authMessage, request);
         });
     }
     queryViewOnlyEvmHexAddress() {
@@ -233,19 +234,19 @@ class CarbonWallet {
             this.jwt = response.data.result;
         });
     }
-    getNewJwtToken(request) {
+    getNewJwtToken(authMessage, request) {
         return __awaiter(this, void 0, void 0, function* () {
-            const req = request !== null && request !== void 0 ? request : yield this.constructGrantRequest();
+            const req = request !== null && request !== void 0 ? request : yield this.constructGrantRequest(authMessage);
             const response = yield axios_1.default.post(this.networkConfig.authUrl, req);
             this.jwt = response.data.result;
         });
     }
-    constructGrantRequest() {
+    constructGrantRequest(authMessage) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield util_1.GenericUtils.callIgnoreError(() => { var _a; return (_a = this.onRequestAuth) === null || _a === void 0 ? void 0 : _a.call(this); });
                 const address = this.isEvmWallet() ? this.evmHexAddress : this.bech32Address;
-                const message = util_1.AuthUtils.getAuthMessage();
+                const message = util_1.AuthUtils.getAuthMessage(authMessage);
                 const signature = yield this.signer.signMessage(address, message);
                 return {
                     grant_type: this.isEvmWallet() ? auth_2.GrantType.SignatureEth : auth_2.GrantType.SignatureCosmos,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.11.66",
+  "version": "0.11.67",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",