carbon-js-sdk 0.10.4 → 0.10.6-beta.1

package/lib/provider/keplr/KeplrAccount.js

@@ -65,12 +65,18 @@ class KeplrAccount {
                 throw (error_1.parseEvmError(error));
             }
         });
+        const signMessage = (address, message) => __awaiter(this, void 0, void 0, function* () {
+            const chainId = chainInfo.chainId;
+            const { signature } = yield keplr.signArbitrary(chainId, address, message);
+            return Buffer.from(signature, 'base64').toString('hex');
+        });
         return {
             type: wallet_1.CarbonSignerTypes.BrowserInjected,
             signDirect,
             signAmino,
             getAccounts,
             sendEvmTransaction,
+            signMessage,
         };
     }
     static createKeplrSignerAmino(keplr, chainInfo, account) {
@@ -105,11 +111,17 @@ class KeplrAccount {
                 throw (error_1.parseEvmError(error));
             }
         });
+        const signMessage = (address, message) => __awaiter(this, void 0, void 0, function* () {
+            const chainId = chainInfo.chainId;
+            const { signature } = yield keplr.signArbitrary(chainId, address, message);
+            return Buffer.from(signature, 'base64').toString('hex');
+        });
         return {
             type: wallet_1.CarbonSignerTypes.BrowserInjected,
             signAmino,
             getAccounts,
             sendEvmTransaction,
+            signMessage,
         };
     }
     static queryFeeCurrencies(configProvider) {

package/lib/provider/leap/LeapAccount.d.ts

@@ -1,5 +1,5 @@
 import { CarbonSigner } from "../../wallet";
-import { Leap } from "@cosmos-kit/leap";
+import { Leap } from "@cosmos-kit/leap-extension";
 import { AppCurrency, ChainInfo, FeeCurrency } from "@keplr-wallet/types";
 import SDKProvider from "../sdk";
 declare class LeapAccount {

package/lib/provider/leap/LeapAccount.js

@@ -47,12 +47,17 @@ class LeapAccount {
         const sendEvmTransaction = (api, req) => __awaiter(this, void 0, void 0, function* () {
             throw new Error("signing not available");
         });
+        const signMessage = (address, message) => __awaiter(this, void 0, void 0, function* () {
+            const { signature } = yield leap.signArbitrary(chainId, address, message);
+            return Buffer.from(signature, 'base64').toString('hex');
+        });
         return {
             type: wallet_1.CarbonSignerTypes.BrowserInjected,
             signDirect,
             signAmino,
             getAccounts,
             sendEvmTransaction,
+            signMessage,
         };
     }
     static createLeapSignerAmino(leap, chainId) {
@@ -75,11 +80,16 @@ class LeapAccount {
         const sendEvmTransaction = (api, req) => __awaiter(this, void 0, void 0, function* () {
             throw new Error("signing not available");
         });
+        const signMessage = (address, message) => __awaiter(this, void 0, void 0, function* () {
+            const { signature } = yield leap.signArbitrary(chainId, address, message);
+            return Buffer.from(signature, 'base64').toString('hex');
+        });
         return {
             type: wallet_1.CarbonSignerTypes.BrowserInjected,
             signAmino,
             getAccounts,
             sendEvmTransaction,
+            signMessage,
         };
     }
     static getChainId(configProvider) {

package/lib/provider/leap/index.d.ts

@@ -1,3 +1,3 @@
 export { default, LeapExtended } from "./LeapAccount";
 export { Key } from "@cosmos-kit/core";
-export { Leap } from "@cosmos-kit/leap";
+export { Leap } from "@cosmos-kit/leap-extension";

package/lib/provider/metamask/MetaMask.js

@@ -361,6 +361,9 @@ class MetaMask {
                 throw (error_1.parseEvmError(error, index_1.ProviderAgent.MetamaskExtension));
             }
         });
+        const signMessage = (address, message) => __awaiter(this, void 0, void 0, function* () {
+            return metamask.personalSign(address, message);
+        });
         return {
             type: wallet_1.CarbonSignerTypes.BrowserInjected,
             legacyEip712SignMode: metamask.legacyEip712SignMode,
@@ -369,6 +372,7 @@ class MetaMask {
             getAccounts,
             signLegacyEip712,
             sendEvmTransaction,
+            signMessage,
         };
     }
     static getNetworkParams(network, blockchain = 'Ethereum') {

package/lib/provider/o3/O3Wallet.js

@@ -80,6 +80,9 @@ class O3Wallet {
             sendEvmTransaction: () => __awaiter(this, void 0, void 0, function* () {
                 throw new Error("signing not available");
             }),
+            signMessage() {
+                throw new Error("signing not available");
+            },
         };
     }
     connectWallet() {

package/lib/util/index.d.ts

@@ -14,3 +14,4 @@ export * as CarbonTx from "./tx";
 export * as TypeUtils from "./type";
 export * as GrantUtils from "./grant";
 export * as AllianceUtils from "./alliance";
+export * as MessageUtils from "./message";

package/lib/util/index.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AllianceUtils = exports.GrantUtils = exports.TypeUtils = exports.CarbonTx = exports.TransferUtils = exports.TokenUtils = exports.NumberUtils = exports.NetworkUtils = exports.IBCUtils = exports.GovUtils = exports.GenericUtils = exports.FetchUtils = exports.ExternalUtils = exports.BlockchainUtils = exports.APIUtils = exports.AddressUtils = void 0;
+exports.MessageUtils = exports.AllianceUtils = exports.GrantUtils = exports.TypeUtils = exports.CarbonTx = exports.TransferUtils = exports.TokenUtils = exports.NumberUtils = exports.NetworkUtils = exports.IBCUtils = exports.GovUtils = exports.GenericUtils = exports.FetchUtils = exports.ExternalUtils = exports.BlockchainUtils = exports.APIUtils = exports.AddressUtils = void 0;
 exports.AddressUtils = __importStar(require("./address"));
 exports.APIUtils = __importStar(require("./api"));
 exports.BlockchainUtils = __importStar(require("./blockchain"));
@@ -36,3 +36,4 @@ exports.CarbonTx = __importStar(require("./tx"));
 exports.TypeUtils = __importStar(require("./type"));
 exports.GrantUtils = __importStar(require("./grant"));
 exports.AllianceUtils = __importStar(require("./alliance"));
+exports.MessageUtils = __importStar(require("./message"));

package/lib/util/message.d.ts

@@ -0,0 +1,2 @@
+import { StdSignDoc } from "@cosmjs/amino";
+export declare const constructAdr36SignDoc: (address: string, message: string) => StdSignDoc;

package/lib/util/message.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.constructAdr36SignDoc = void 0;
+const constructAdr36SignDoc = (address, message) => {
+    const msgSignData = { signer: address, data: Buffer.from(message).toString('base64') };
+    const msgs = [{ type: 'sign/MsgSignData', value: msgSignData }];
+    const fee = {
+        gas: '0',
+        amount: [],
+    };
+    const signDoc = {
+        chain_id: '',
+        account_number: '0',
+        sequence: '0',
+        fee,
+        msgs,
+        memo: '',
+    };
+    return signDoc;
+};
+exports.constructAdr36SignDoc = constructAdr36SignDoc;

package/lib/wallet/CarbonSigner.d.ts

@@ -14,16 +14,19 @@ export declare enum CarbonSignerTypes {
 export interface EvmSigner {
     readonly sendEvmTransaction: (api: CarbonSDK, req: ethers.providers.TransactionRequest) => Promise<string>;
 }
+export interface ArbitraryMessageSigner {
+    readonly signMessage: (address: string, message: string) => Promise<string>;
+}
 export interface EIP712Signer extends EvmSigner {
     legacyEip712SignMode: boolean;
     readonly signLegacyEip712: (signerAddress: string, signDoc: StdSignDoc) => Promise<LegacyEIP712AminoSignResponse>;
 }
 export declare type CarbonSigner = DirectCarbonSigner | AminoCarbonSigner | CarbonEIP712Signer;
-export declare type CarbonEIP712Signer = (DirectCarbonSigner | AminoCarbonSigner) & EIP712Signer;
-export declare type DirectCarbonSigner = OfflineDirectSigner & EvmSigner & {
+export declare type CarbonEIP712Signer = (DirectCarbonSigner | AminoCarbonSigner) & EIP712Signer & ArbitraryMessageSigner;
+export declare type DirectCarbonSigner = OfflineDirectSigner & EvmSigner & ArbitraryMessageSigner & {
     type: CarbonSignerTypes;
 };
-export declare type AminoCarbonSigner = OfflineAminoSigner & EvmSigner & {
+export declare type AminoCarbonSigner = OfflineAminoSigner & EvmSigner & ArbitraryMessageSigner & {
     type: CarbonSignerTypes;
 };
 export declare type LegacyEIP712AminoSignResponse = AminoSignResponse & {
@@ -43,12 +46,14 @@ export declare class CarbonPrivateKeySigner implements DirectCarbonSigner, Amino
     signAmino(signerAddress: string, signDoc: StdSignDoc): Promise<AminoSignResponse>;
     signDirect(signerAddress: string, signDoc: SignDoc): Promise<DirectSignResponse>;
     sendEvmTransaction(api: CarbonSDK, req: ethers.providers.TransactionRequest): Promise<string>;
+    signMessage(address: string, message: string): Promise<string>;
 }
 export declare class CarbonNonSigner implements DirectCarbonSigner {
     type: CarbonSignerTypes;
     getAccounts(): Promise<readonly AccountData[]>;
     signDirect(): Promise<DirectSignResponse>;
     sendEvmTransaction(api: CarbonSDK, req: ethers.providers.TransactionRequest): Promise<string>;
+    signMessage(address: string, message: string): Promise<string>;
 }
 export declare class CarbonLedgerSigner implements AminoCarbonSigner {
     readonly ledger: CosmosLedger;
@@ -58,5 +63,6 @@ export declare class CarbonLedgerSigner implements AminoCarbonSigner {
     getAccounts(): Promise<readonly AccountData[]>;
     signAmino(_: string, doc: StdSignDoc): Promise<AminoSignResponse>;
     sendEvmTransaction(api: CarbonSDK, req: ethers.providers.TransactionRequest): Promise<string>;
+    signMessage(_: string, message: string): Promise<string>;
     constructor(ledger: CosmosLedger);
 }

package/lib/wallet/CarbonSigner.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CarbonLedgerSigner = exports.CarbonNonSigner = exports.CarbonPrivateKeySigner = exports.isCarbonEIP712Signer = exports.CarbonSignerTypes = void 0;
 const generic_1 = require("../util/generic");
+const message_1 = require("../util/message");
 const amino_1 = require("@cosmjs/amino");
 const proto_signing_1 = require("@cosmjs/proto-signing");
 var CarbonSignerTypes;
@@ -67,6 +68,13 @@ class CarbonPrivateKeySigner {
             throw new Error("signing not available");
         });
     }
+    signMessage(address, message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const aminoWallet = yield this.initAminoWallet();
+            const signedDoc = yield aminoWallet.signAmino(address, message_1.constructAdr36SignDoc(address, message));
+            return Buffer.from(signedDoc.signature.signature, 'base64').toString('hex');
+        });
+    }
 }
 exports.CarbonPrivateKeySigner = CarbonPrivateKeySigner;
 class CarbonNonSigner {
@@ -88,6 +96,11 @@ class CarbonNonSigner {
             throw new Error("signing not available");
         });
     }
+    signMessage(address, message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error("signing not available");
+        });
+    }
 }
 exports.CarbonNonSigner = CarbonNonSigner;
 // Uses amino because ledger does not work with protobuf yet
@@ -134,5 +147,15 @@ class CarbonLedgerSigner {
             throw new Error("signing not available");
         });
     }
+    signMessage(_, message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const account = yield this.retrieveAccount();
+            const { pubkey, address } = account;
+            const doc = JSON.stringify(message_1.constructAdr36SignDoc(address, message));
+            const signBytes = yield this.ledger.sign(doc);
+            const { signature } = amino_1.encodeSecp256k1Signature(pubkey, signBytes);
+            return Buffer.from(signature, 'base64').toString('hex');
+        });
+    }
 }
 exports.CarbonLedgerSigner = CarbonLedgerSigner;

package/lib/wallet/CarbonWallet.d.ts

@@ -15,7 +15,7 @@ import { Account, DeliverTxResponse } from "@cosmjs/stargate";
 import { Tendermint37Client } from "@cosmjs/tendermint-rpc";
 import { BroadcastTxAsyncResponse, BroadcastTxSyncResponse, TxResponse } from "@cosmjs/tendermint-rpc/build/tendermint37/responses";
 import { Key as LeapKey } from "@cosmos-kit/core";
-import { Leap } from "@cosmos-kit/leap";
+import { Leap } from "@cosmos-kit/leap-extension";
 import { Key } from "@keplr-wallet/types";
 import { TxRaw as StargateTxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { CarbonSigner, CarbonSignerTypes } from "./CarbonSigner";
@@ -189,6 +189,7 @@ export declare class CarbonWallet {
     getSmartWalletPrivateKey(blockchain?: SmartWalletBlockchain): Buffer | null;
     reconnectTmClient(fallbackConfig: OverrideConfig | null): Promise<void>;
     private reloadAccountInfo;
+    private delay;
     private getAccount;
     reloadAccountSequence(): Promise<void>;
     reloadMergeAccountStatus(): Promise<void>;

package/lib/wallet/CarbonWallet.js

@@ -646,24 +646,34 @@ class CarbonWallet {
             return (_a = bech32Acc !== null && bech32Acc !== void 0 ? bech32Acc : evmBech32Acc) !== null && _a !== void 0 ? _a : undefined;
         });
     }
-    getAccount(queryAddress) {
+    delay(ms) {
+        return new Promise(resolve => setTimeout(resolve, ms));
+    }
+    getAccount(queryAddress, retryCount = 0) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const account = (yield this.getQueryClient().auth.Account({ address: queryAddress })).account;
-                if (!account)
-                    return;
-                const { accountNumber, sequence, address } = auth_1.BaseAccount.decode(account.value);
-                return {
-                    address,
-                    accountNumber: accountNumber.toNumber(),
-                    sequence: sequence.toNumber(),
-                };
+                const result = yield this.getQueryClient().auth.Account({ address: queryAddress });
+                if (result === null || result === void 0 ? void 0 : result.account) {
+                    const { accountNumber, sequence, address } = auth_1.BaseAccount.decode(result.account.value);
+                    return {
+                        address,
+                        pubkey: null,
+                        accountNumber: accountNumber.toNumber(),
+                        sequence: sequence.toNumber(),
+                    };
+                }
             }
             catch (error) {
                 if (!this.isAccountNotFoundError(error, queryAddress))
                     throw error;
             }
-            return;
+            // when grant is just created, querying grantee account info immediately may fail maybe due to backend caching
+            // retry query after 1s to buffer for backend to catch up
+            if (retryCount < 1) {
+                yield this.delay(1000);
+                return this.getAccount(queryAddress, retryCount + 1);
+            }
+            return undefined;
         });
     }
     reloadAccountSequence() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.10.4",
+  "version": "0.10.6-beta.1",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -41,7 +41,7 @@
     "@cityofzion/neon-core-next": "npm:@cityofzion/neon-core@^5.0.0",
     "@cityofzion/neon-js": "^4.9.0",
     "@cosmjs/stargate": "~0.31.3",
-    "@cosmos-kit/leap": "^0.13.14",
+    "@cosmos-kit/leap": "^0.15.12",
     "@improbable-eng/grpc-web": "^0.15.0",
     "@improbable-eng/grpc-web-node-http-transport": "^0.15.0",
     "@keplr-wallet/types": "^0.11.64",