carbon-js-sdk 0.10.3 → 0.10.5

package/lib/wallet/CarbonWallet.d.ts

@@ -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

@@ -244,7 +244,7 @@ class CarbonWallet {
             const isEvmWallet = this.isEvmWallet();
             if (hasEvmAddressBalances && !hasCarbonBalances && !isEvmWallet) {
                 this.sequenceInvalidated = true;
-                throw new Error('Transaction is not allowed from a non-evm wallet for an account with only funds in evm address');
+                throw new Error(`Transaction is not allowed from a non-evm wallet for an account with only funds in evm address: evmAddress: ${this.evmBech32Address}, carbonAddress: ${this.bech32Address}`);
             }
         });
     }
@@ -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.3",
+  "version": "0.10.5",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",