@dynamic-labs/cosmos 3.0.0-alpha.51 → 3.0.0-alpha.52

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 
+## [3.0.0-alpha.52](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.51...v3.0.0-alpha.52) (2024-08-28)
+
+
+### Features
+
+* add support for custom keplr chains ([#6635](https://github.com/dynamic-labs/DynamicAuth/issues/6635)) ([f0aa2da](https://github.com/dynamic-labs/DynamicAuth/commit/f0aa2dac2a2b259d145ff52174da7cc6ef963182))
+
+
+### Bug Fixes
+
+* better error handling on solana transaction decoding ([#6731](https://github.com/dynamic-labs/DynamicAuth/issues/6731)) ([a71af86](https://github.com/dynamic-labs/DynamicAuth/commit/a71af869395c9b99c04f0cac78a73e1b2b17bafe))
+
 ## [3.0.0-alpha.51](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.50...v3.0.0-alpha.51) (2024-08-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/cosmos",
-  "version": "3.0.0-alpha.51",
+  "version": "3.0.0-alpha.52",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -27,10 +27,10 @@
   },
   "dependencies": {
     "@keplr-wallet/types": "0.12.121",
-    "@dynamic-labs/types": "3.0.0-alpha.51",
-    "@dynamic-labs/utils": "3.0.0-alpha.51",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.51",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.51"
+    "@dynamic-labs/types": "3.0.0-alpha.52",
+    "@dynamic-labs/utils": "3.0.0-alpha.52",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.52",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.52"
   },
   "peerDependencies": {}
 }

package/src/connectors/CosmosWalletConnector.cjs

@@ -12,25 +12,21 @@ class CosmosWalletConnector extends walletConnectorCore.WalletConnectorBase {
         super(opts);
         this.connectedChain = 'COSMOS';
         this.supportedChains = ['COSMOS'];
-        this.chainIdMap = {
-            401: 'cosmoshub-4',
-            402: 'axelar-dojo-1',
-            403: 'osmosis-1',
-        };
-        this.reverseChainIdMap = {
-            'axelar-dojo-1': 402,
-            'cosmoshub-4': 401,
-            'osmosis-1': 403,
-        };
         this.evmNetworks = utils.parseEvmNetworks(opts.cosmosNetworks);
+        this.chainIdMapping = this.evmNetworks.map((network) => ({
+            cosmosNetworkId: network.name,
+            dynamicChainId: utils.parseChainId(network.networkId),
+            evmNetwork: network,
+        }));
     }
     getSelectedNetwork() {
-        const selectedNetwork = this.evmNetworks.find((network) => network.networkId === this.reverseChainIdMap[this.getChainId()]);
-        return selectedNetwork;
+        const selectedNetwork = this.chainIdMapping.find((mapping) => mapping.cosmosNetworkId === this.getChainId());
+        return selectedNetwork === null || selectedNetwork === void 0 ? void 0 : selectedNetwork.evmNetwork;
     }
     getNetwork() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.reverseChainIdMap[this.getChainId()];
+            var _a;
+            return (_a = this.getSelectedNetwork()) === null || _a === void 0 ? void 0 : _a.chainId;
         });
     }
     getLcdUrl() {

package/src/connectors/CosmosWalletConnector.d.ts

@@ -1,7 +1,6 @@
 import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { Chain, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { CosmoNetwork } from '../types';
 export interface IFetchBalanceResponse {
     balances: IFetchBalanceBalance[];
     pagination: IFetchBalancePagination;
@@ -18,17 +17,21 @@ export type CosmosWalletConnectorOpts = {
     cosmosNetworks: GenericNetwork[];
     walletBook: WalletBookSchema;
 };
+type CosmosChainIDMapObject = {
+    dynamicChainId: number;
+    cosmosNetworkId: string;
+    evmNetwork: EvmNetwork;
+};
 export declare abstract class CosmosWalletConnector extends WalletConnectorBase {
     evmNetworks: EvmNetwork[];
     connectedChain: Chain;
     supportedChains: Chain[];
-    chainIdMap: Record<number, CosmoNetwork>;
-    reverseChainIdMap: Record<CosmoNetwork, number>;
+    chainIdMapping: CosmosChainIDMapObject[];
     constructor(opts: CosmosWalletConnectorOpts);
-    abstract getChainId(): CosmoNetwork;
-    abstract setChainId(chainId: CosmoNetwork | null): void;
+    abstract getChainId(): string;
+    abstract setChainId(chainId: string | null): void;
     getSelectedNetwork(): EvmNetwork | undefined;
-    getNetwork(): Promise<number>;
+    getNetwork(): Promise<number | undefined>;
     getLcdUrl(): string | undefined;
     getDenom(): string | undefined;
     getBalance(address: string): Promise<string | undefined>;
@@ -36,3 +39,4 @@ export declare abstract class CosmosWalletConnector extends WalletConnectorBase
     getConnectedAccounts(): Promise<string[]>;
     endSession(): Promise<void>;
 }
+export {};

package/src/connectors/CosmosWalletConnector.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
-import { parseEvmNetworks } from '@dynamic-labs/utils';
+import { parseEvmNetworks, parseChainId } from '@dynamic-labs/utils';
 import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
 
 class CosmosWalletConnector extends WalletConnectorBase {
@@ -8,25 +8,21 @@ class CosmosWalletConnector extends WalletConnectorBase {
         super(opts);
         this.connectedChain = 'COSMOS';
         this.supportedChains = ['COSMOS'];
-        this.chainIdMap = {
-            401: 'cosmoshub-4',
-            402: 'axelar-dojo-1',
-            403: 'osmosis-1',
-        };
-        this.reverseChainIdMap = {
-            'axelar-dojo-1': 402,
-            'cosmoshub-4': 401,
-            'osmosis-1': 403,
-        };
         this.evmNetworks = parseEvmNetworks(opts.cosmosNetworks);
+        this.chainIdMapping = this.evmNetworks.map((network) => ({
+            cosmosNetworkId: network.name,
+            dynamicChainId: parseChainId(network.networkId),
+            evmNetwork: network,
+        }));
     }
     getSelectedNetwork() {
-        const selectedNetwork = this.evmNetworks.find((network) => network.networkId === this.reverseChainIdMap[this.getChainId()]);
-        return selectedNetwork;
+        const selectedNetwork = this.chainIdMapping.find((mapping) => mapping.cosmosNetworkId === this.getChainId());
+        return selectedNetwork === null || selectedNetwork === void 0 ? void 0 : selectedNetwork.evmNetwork;
     }
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.reverseChainIdMap[this.getChainId()];
+            var _a;
+            return (_a = this.getSelectedNetwork()) === null || _a === void 0 ? void 0 : _a.chainId;
         });
     }
     getLcdUrl() {

package/src/connectors/KeplrWalletConnector.cjs

@@ -15,8 +15,19 @@ class KeplrWalletConnector extends CosmosWalletConnector.CosmosWalletConnector {
         this.overrideKey = 'keplr';
         this._handleAccountChange = this._handleAccountChange.bind(this);
     }
+    getDefaultChainId() {
+        if (this.chainIdMapping.length === 0) {
+            return 'cosmoshub-4';
+        }
+        if (this.chainIdMapping.find((chain) => chain.cosmosNetworkId === 'cosmoshub-4')) {
+            return 'cosmoshub-4';
+        }
+        else {
+            return this.chainIdMapping[0].cosmosNetworkId;
+        }
+    }
     getChainId() {
-        const defaultChainId = 'cosmoshub-4';
+        const defaultChainId = this.getDefaultChainId();
         const storedChainId = localStorage.getItem(DYNAMIC_KEPLR_NETWORK_ID);
         return storedChainId !== null && storedChainId !== void 0 ? storedChainId : defaultChainId;
     }
@@ -50,9 +61,7 @@ class KeplrWalletConnector extends CosmosWalletConnector.CosmosWalletConnector {
     }
     connect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const chainIdsToConnect = this.evmNetworks.map((network) => this.chainIdMap[network.chainId]);
-            yield this.keplr.enable(chainIdsToConnect);
-            this.setChainId(this.chainIdMap[this.evmNetworks[0].chainId]);
+            yield this.keplr.enable(this.chainIdMapping.map((mapping) => mapping.cosmosNetworkId));
         });
     }
     getAddress() {
@@ -113,8 +122,12 @@ class KeplrWalletConnector extends CosmosWalletConnector.CosmosWalletConnector {
         return _tslib.__awaiter(this, arguments, void 0, function* ({ networkChainId, }) {
             if (!networkChainId)
                 return;
-            this.setChainId(this.chainIdMap[networkChainId]);
-            this.emit('chainChange', { chain: networkChainId.toString() });
+            this.chainIdMapping.forEach((mapping) => {
+                if (mapping.dynamicChainId === networkChainId) {
+                    this.setChainId(mapping.cosmosNetworkId);
+                    this.emit('chainChange', { chain: networkChainId.toString() });
+                }
+            });
         });
     }
 }

package/src/connectors/KeplrWalletConnector.d.ts

@@ -1,5 +1,4 @@
 import { Keplr as KeplrWallet } from '@keplr-wallet/types';
-import { CosmoNetwork } from '../types';
 import { CosmosWalletConnector, CosmosWalletConnectorOpts } from './CosmosWalletConnector';
 export type SwitchNetworkOps = {
     networkChainId?: number;
@@ -11,8 +10,9 @@ export declare class KeplrWalletConnector extends CosmosWalletConnector {
     name: string;
     overrideKey: string;
     constructor(opts: CosmosWalletConnectorOpts);
-    getChainId(): CosmoNetwork;
-    setChainId(chainId: CosmoNetwork | null): void;
+    getDefaultChainId(): string;
+    getChainId(): string;
+    setChainId(chainId: string | null): void;
     getWalletClient(): KeplrWallet;
     protected getAccount(): Promise<import("@keplr-wallet/types").AccountData>;
     get keplr(): KeplrWallet;
@@ -25,7 +25,7 @@ export declare class KeplrWalletConnector extends CosmosWalletConnector {
     teardownEventListeners(): void;
     protected getSignDoc(message: string): {
         account_number: string;
-        chain_id: CosmoNetwork;
+        chain_id: string;
         fee: {
             amount: never[];
             gas: string;

package/src/connectors/KeplrWalletConnector.js

@@ -11,8 +11,19 @@ class KeplrWalletConnector extends CosmosWalletConnector {
         this.overrideKey = 'keplr';
         this._handleAccountChange = this._handleAccountChange.bind(this);
     }
+    getDefaultChainId() {
+        if (this.chainIdMapping.length === 0) {
+            return 'cosmoshub-4';
+        }
+        if (this.chainIdMapping.find((chain) => chain.cosmosNetworkId === 'cosmoshub-4')) {
+            return 'cosmoshub-4';
+        }
+        else {
+            return this.chainIdMapping[0].cosmosNetworkId;
+        }
+    }
     getChainId() {
-        const defaultChainId = 'cosmoshub-4';
+        const defaultChainId = this.getDefaultChainId();
         const storedChainId = localStorage.getItem(DYNAMIC_KEPLR_NETWORK_ID);
         return storedChainId !== null && storedChainId !== void 0 ? storedChainId : defaultChainId;
     }
@@ -46,9 +57,7 @@ class KeplrWalletConnector extends CosmosWalletConnector {
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            const chainIdsToConnect = this.evmNetworks.map((network) => this.chainIdMap[network.chainId]);
-            yield this.keplr.enable(chainIdsToConnect);
-            this.setChainId(this.chainIdMap[this.evmNetworks[0].chainId]);
+            yield this.keplr.enable(this.chainIdMapping.map((mapping) => mapping.cosmosNetworkId));
         });
     }
     getAddress() {
@@ -109,8 +118,12 @@ class KeplrWalletConnector extends CosmosWalletConnector {
         return __awaiter(this, arguments, void 0, function* ({ networkChainId, }) {
             if (!networkChainId)
                 return;
-            this.setChainId(this.chainIdMap[networkChainId]);
-            this.emit('chainChange', { chain: networkChainId.toString() });
+            this.chainIdMapping.forEach((mapping) => {
+                if (mapping.dynamicChainId === networkChainId) {
+                    this.setChainId(mapping.cosmosNetworkId);
+                    this.emit('chainChange', { chain: networkChainId.toString() });
+                }
+            });
         });
     }
 }

package/src/types.d.ts

@@ -3,4 +3,3 @@ declare global {
     interface Window extends KeplrWindow {
     }
 }
-export type CosmoNetwork = 'cosmoshub-4' | 'axelar-dojo-1' | 'osmosis-1';