carbon-js-sdk 0.3.43 → 0.3.45

package/lib/CarbonSDK.js

@@ -258,8 +258,8 @@ class CarbonSDK {
         return __awaiter(this, void 0, void 0, function* () {
             const chainInfo = yield provider_1.KeplrAccount.getChainInfo(this);
             const chainId = chainInfo.chainId;
-            const keplrKey = yield keplr.getKey(chainId);
             yield keplr.experimentalSuggestChain(chainInfo);
+            const keplrKey = yield keplr.getKey(chainId);
             yield keplr.enable(chainId);
             const wallet = wallet_1.CarbonWallet.withKeplr(keplr, chainInfo, keplrKey, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
             return this.connect(wallet);
@@ -269,8 +269,8 @@ class CarbonSDK {
         return __awaiter(this, void 0, void 0, function* () {
             const chainId = this.chainId;
             const chainInfo = yield provider_1.LeapAccount.getChainInfo(this);
-            const leapKey = yield leap.getKey(chainId);
             yield leap.experimentalSuggestChain(chainInfo);
+            const leapKey = yield leap.getKey(chainId);
             yield leap.enable(chainId);
             const wallet = wallet_1.CarbonWallet.withLeap(leap, chainId, leapKey, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
             return this.connect(wallet);

package/lib/codec/liquiditypool/legacy.d.ts

@@ -0,0 +1,18 @@
+import Long from "long";
+import _m0 from "protobufjs/minimal";
+export declare const protobufPackage = "Switcheo.carbon.liquiditypool";
+export interface ParamsV2170 {
+    rewardReductionThreshold: Long;
+}
+export declare const ParamsV2170: {
+    encode(message: ParamsV2170, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): ParamsV2170;
+    fromJSON(object: any): ParamsV2170;
+    toJSON(message: ParamsV2170): unknown;
+    fromPartial(object: DeepPartial<ParamsV2170>): ParamsV2170;
+};
+declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
+    [K in keyof T]?: DeepPartial<T[K]>;
+} : Partial<T>;
+export {};

package/lib/codec/liquiditypool/legacy.js

@@ -0,0 +1,64 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ParamsV2170 = exports.protobufPackage = void 0;
+/* eslint-disable */
+const long_1 = __importDefault(require("long"));
+const minimal_1 = __importDefault(require("protobufjs/minimal"));
+exports.protobufPackage = "Switcheo.carbon.liquiditypool";
+const baseParamsV2170 = { rewardReductionThreshold: long_1.default.UZERO };
+exports.ParamsV2170 = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (!message.rewardReductionThreshold.isZero()) {
+            writer.uint32(8).uint64(message.rewardReductionThreshold);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = Object.assign({}, baseParamsV2170);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.rewardReductionThreshold = reader.uint64();
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseParamsV2170);
+        message.rewardReductionThreshold =
+            object.rewardReductionThreshold !== undefined &&
+                object.rewardReductionThreshold !== null
+                ? long_1.default.fromString(object.rewardReductionThreshold)
+                : long_1.default.UZERO;
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.rewardReductionThreshold !== undefined &&
+            (obj.rewardReductionThreshold = (message.rewardReductionThreshold || long_1.default.UZERO).toString());
+        return obj;
+    },
+    fromPartial(object) {
+        const message = Object.assign({}, baseParamsV2170);
+        message.rewardReductionThreshold =
+            object.rewardReductionThreshold !== undefined &&
+                object.rewardReductionThreshold !== null
+                ? long_1.default.fromValue(object.rewardReductionThreshold)
+                : long_1.default.UZERO;
+        return message;
+    },
+};
+if (minimal_1.default.util.Long !== long_1.default) {
+    minimal_1.default.util.Long = long_1.default;
+    minimal_1.default.configure();
+}

package/lib/constant/ibc.js

@@ -661,7 +661,7 @@ exports.EmbedChainInfosInit = {
                 },
             },
         ],
-        features: ["ibc-transfer", "ibc-go"],
+        features: ["ibc-transfer", "ibc-go", "eth-address-gen", "eth-key-sign"],
         explorerUrlToTx: "https://www.mintscan.io/evmos/txs/{txHash}",
     },
     [ChainIds.Microtick]: {

package/lib/provider/amino/types/coin.js

@@ -24,8 +24,8 @@ const utils_1 = require("../utils");
 const TxTypes = {
     MintToken: "carbon/MsgMintToken",
     Withdraw: "carbon/MsgWithdraw",
-    DepositToGroup: "carbon/MsgDepositToGroup",
-    WithdrawFromGroup: "carbon/MsgWithdrawFromGroup",
+    DepositToGroup: "coin/DepositToGroup",
+    WithdrawFromGroup: "coin/WithdrawFromGroup",
 };
 const MsgWithdraw = {
     aminoType: TxTypes.Withdraw,

package/lib/provider/keplr/KeplrAccount.d.ts

@@ -16,6 +16,8 @@ declare class KeplrAccount {
         } | undefined;
     };
     static createKeplrSigner(keplr: Keplr, chainInfo: ChainInfo, account: Key): CarbonSigner;
+    static queryFeeCurrencies(configProvider: SDKProvider): Promise<FeeCurrency[]>;
+    static processCurrencies(feeCurrencies: FeeCurrency[]): AppCurrency[];
     static getChainInfo(configProvider: SDKProvider): Promise<ChainInfo>;
 }
 declare namespace KeplrAccount { }

package/lib/provider/keplr/KeplrAccount.js

@@ -45,14 +45,12 @@ class KeplrAccount {
             getAccounts,
         };
     }
-    static getChainInfo(configProvider) {
+    static queryFeeCurrencies(configProvider) {
         return __awaiter(this, void 0, void 0, function* () {
-            const config = configProvider.getConfig();
-            const bech32Prefix = config.Bech32Prefix;
-            const chainId = yield configProvider.query.chain.getChainId();
-            const gasPricesResult = yield configProvider.query.fee.MinGasPriceAll({});
             const tokenClient = configProvider.getTokenClient();
             const coingeckoIdMap = tokenClient.geckoTokenNames;
+            // Query minGasPrices from on-chain (for testnet/devnet/localhost)
+            const gasPricesResult = yield configProvider.query.fee.MinGasPriceAll({});
             const feeCurrencies = gasPricesResult.minGasPrices.reduce((result, price) => {
                 var _a, _b, _c;
                 const token = tokenClient.tokenForDenom(price.denom);
@@ -76,14 +74,45 @@ class KeplrAccount {
                 });
                 return result;
             }, []);
+            return feeCurrencies;
+        });
+    }
+    static processCurrencies(feeCurrencies) {
+        return feeCurrencies.reduce((prevCurrencies, feeCurrency) => {
+            const currentFeeCurrency = {
+                coinDenom: feeCurrency.coinDenom,
+                coinMinimalDenom: feeCurrency.coinMinimalDenom,
+                coinDecimals: feeCurrency.coinDecimals,
+                coinGeckoId: feeCurrency.coinGeckoId,
+            };
+            prevCurrencies.push(currentFeeCurrency);
+            return prevCurrencies;
+        }, []);
+    }
+    static getChainInfo(configProvider) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = configProvider.getConfig();
+            const bech32Prefix = config.Bech32Prefix;
+            const chainId = yield configProvider.query.chain.getChainId();
+            // Query fee currencies from keplr-chain-registry
+            const keplrChainInfo = yield (yield util_1.FetchUtils.fetch("https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/master/cosmos/carbon.json")).json();
+            if (config.network === constant_1.Network.MainNet) {
+                if (keplrChainInfo.nodeProvider) {
+                    delete keplrChainInfo.nodeProvider;
+                }
+                return keplrChainInfo;
+            }
+            const feeCurrencies = yield this.queryFeeCurrencies(configProvider);
+            const networkFees = [KeplrAccount.SWTH_CURRENCY, ...feeCurrencies];
+            const currencies = this.processCurrencies(networkFees);
             return {
-                feeCurrencies: [KeplrAccount.SWTH_CURRENCY, ...feeCurrencies],
+                feeCurrencies: networkFees,
                 bip44: KeplrAccount.BASE_CHAIN_INFO.bip44,
-                currencies: [KeplrAccount.SWTH_CURRENCY, ...feeCurrencies],
+                currencies: currencies,
                 stakeCurrency: KeplrAccount.SWTH_CURRENCY,
                 rest: config.restUrl,
                 rpc: config.tmRpcUrl,
-                chainName: config.network === constant_1.Network.MainNet ? `Carbon` : `Carbon (${config.network})`,
+                chainName: `Carbon (${config.network})`,
                 chainId: chainId,
                 bech32Config: {
                     bech32PrefixAccAddr: `${bech32Prefix}`,

package/lib/util/blockchain.js

@@ -199,6 +199,7 @@ const blockchainForChainId = (chainId, network = network_1.Network.MainNet) => {
             switch (chainId) {
                 case 1:
                     return Blockchain.Btc;
+                case 0:
                 case 5:
                     return Blockchain.Carbon;
                 case 79:
@@ -215,12 +216,21 @@ const blockchainForChainId = (chainId, network = network_1.Network.MainNet) => {
             }
         case network_1.Network.DevNet:
             switch (chainId) {
+                case 0:
+                    return Blockchain.Carbon;
+                case 1:
+                    return Blockchain.Btc;
+                case 2:
                 case 350:
                     return Blockchain.Ethereum;
                 case 5:
                     return Blockchain.Neo;
                 case 79:
                     return Blockchain.BinanceSmartChain;
+                case 111:
+                    return Blockchain.Zilliqa;
+                default:
+                    return undefined;
             }
         case network_1.Network.LocalHost:
             return undefined;

package/lib/wallet/CarbonWallet.js

@@ -112,13 +112,13 @@ class CarbonWallet {
     static withKeplr(keplr, chainInfo, keplrKey, opts = {}) {
         const signer = provider_1.KeplrAccount.createKeplrSigner(keplr, chainInfo, keplrKey);
         const publicKeyBase64 = Buffer.from(keplrKey.pubKey).toString("base64");
-        const wallet = CarbonWallet.withSigner(signer, publicKeyBase64, opts);
+        const wallet = CarbonWallet.withSigner(signer, publicKeyBase64, Object.assign(Object.assign({}, opts), { providerAgent: 'keplr-extension' }));
         return wallet;
     }
     static withLeap(leap, chainId, leapKey, opts = {}) {
         const signer = provider_1.LeapAccount.createLeapSigner(leap, chainId);
         const publicKeyBase64 = Buffer.from(leapKey.pubKey).toString("base64");
-        const wallet = CarbonWallet.withSigner(signer, publicKeyBase64, opts);
+        const wallet = CarbonWallet.withSigner(signer, publicKeyBase64, Object.assign(Object.assign({}, opts), { providerAgent: 'leap-extension' }));
         return wallet;
     }
     static withAddress(bech32Address, opts = {}) {

package/package.json

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