carbon-js-sdk 0.4.14 → 0.4.16

package/lib/CarbonSDK.js

@@ -236,6 +236,10 @@ class CarbonSDK {
         });
     }
     disconnect() {
+        var _a;
+        if ((_a = this.wallet) === null || _a === void 0 ? void 0 : _a.isLedgerSigner()) {
+            this.wallet.signer.ledger.disconnect();
+        }
         return new CarbonSDK(Object.assign(Object.assign({}, this), { wallet: null, skipInit: true }));
     }
     connectWithPrivateKey(privateKey, opts) {

package/lib/clients/ETHClient.d.ts

@@ -12,8 +12,8 @@ export interface ETHClientOpts {
     blockchain: typeof ETHClient.SUPPORTED_BLOCKCHAINS[number];
 }
 interface ETHTxParams {
-    gasPriceGwei: BigNumber;
-    gasLimit: BigNumber;
+    gasPriceGwei?: BigNumber;
+    gasLimit?: BigNumber;
     ethAddress: string;
     signer: ethers.Signer;
     nonce?: number;
@@ -26,8 +26,8 @@ export interface BridgeParams {
     recoveryAddress: string;
     toAddress: string;
     feeAmount: BigNumber;
-    gasPriceGwei: BigNumber;
-    gasLimit: BigNumber;
+    gasPriceGwei?: BigNumber;
+    gasLimit?: BigNumber;
     signer: ethers.Signer;
     signCompleteCallback?: () => void;
     nonce?: number;

package/lib/clients/ETHClient.js

@@ -75,11 +75,7 @@ class ETHClient {
             const rpcProvider = this.getProvider();
             const contract = new ethers_1.ethers.Contract(contractAddress, eth_1.ABIs.erc20, rpcProvider);
             const nonce = yield this.getTxNonce(ethAddress, params.nonce, rpcProvider);
-            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, ethers_1.ethers.constants.MaxUint256, {
-                nonce,
-                gasPrice: gasPriceGwei.shiftedBy(9).toString(10),
-                gasLimit: gasLimit.toString(10),
-            });
+            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, ethers_1.ethers.constants.MaxUint256, Object.assign(Object.assign({ nonce }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })));
             return approveResultTx;
         });
     }
@@ -127,13 +123,7 @@ class ETHClient {
                 amount.toString(10),
                 feeAmount.toString(10),
                 amount.toString(10),
-            ], // callAmount
-            {
-                gasLimit: gasLimit.toString(10),
-                gasPrice: gasPriceGwei.shiftedBy(9).toString(10),
-                nonce,
-                value: ethAmount.toString(10),
-            });
+            ], Object.assign(Object.assign(Object.assign({}, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })), { nonce, value: ethAmount.toString(10) }));
             signCompleteCallback === null || signCompleteCallback === void 0 ? void 0 : signCompleteCallback();
             return bridgeResultTx;
         });
@@ -141,7 +131,7 @@ class ETHClient {
     lockDeposit(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { address, token, amount, gasPriceGwei, gasLimit, ethAddress, signer, signCompleteCallback } = params;
-            if (gasLimit.lt(150000)) {
+            if (gasLimit === null || gasLimit === void 0 ? void 0 : gasLimit.lt(150000)) {
                 throw new Error("Minimum gas required: 150,000");
             }
             const networkConfig = this.getNetworkConfig();
@@ -164,7 +154,7 @@ class ETHClient {
                 amount.toString(),
                 "0",
                 amount.toString(), // callAmount
-            ], Object.assign({ nonce, value: "0", gasPrice: gasPriceGwei.shiftedBy(9).toString(10), gasLimit: gasLimit.toString(10) }, (token.tokenAddress === "0000000000000000000000000000000000000000" && {
+            ], Object.assign(Object.assign(Object.assign({ nonce, value: "0" }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })), (token.tokenAddress === "0000000000000000000000000000000000000000" && {
                 value: amount.toString(),
             })));
             signCompleteCallback === null || signCompleteCallback === void 0 ? void 0 : signCompleteCallback();

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

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

package/lib/provider/keplr/KeplrAccount.js

@@ -45,6 +45,26 @@ class KeplrAccount {
             getAccounts,
         };
     }
+    static createKeplrSignerAmino(keplr, chainInfo, account) {
+        const signAmino = (signerAddress, doc) => __awaiter(this, void 0, void 0, function* () {
+            const signOpts = { preferNoSetFee: true };
+            return yield keplr.signAmino(chainInfo.chainId, signerAddress, doc, signOpts);
+        });
+        const getAccounts = () => __awaiter(this, void 0, void 0, function* () {
+            return [
+                {
+                    algo: "secp256k1",
+                    address: account.bech32Address,
+                    pubkey: account.pubKey,
+                },
+            ];
+        });
+        return {
+            type: wallet_1.CarbonSignerTypes.BrowserInjected,
+            signAmino,
+            getAccounts,
+        };
+    }
     static queryFeeCurrencies(configProvider) {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenClient = configProvider.getTokenClient();

package/lib/provider/ledger/ledger.d.ts

@@ -11,6 +11,7 @@ declare class CosmosLedger {
     testDevice(): Promise<this>;
     private isReady;
     connect(timeout?: number): Promise<this>;
+    disconnect(): Promise<void>;
     getCosmosAppVersion(): Promise<string>;
     isCosmosAppOpen(): Promise<void>;
     getOpenApp(): Promise<any>;

package/lib/provider/ledger/ledger.js

@@ -141,6 +141,11 @@ class CosmosLedger {
             return this;
         });
     }
+    disconnect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.cosmosApp.transport.close();
+        });
+    }
     // returns the cosmos app version as a string like "1.1.0"
     getCosmosAppVersion() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/wallet/CarbonWallet.js

@@ -110,7 +110,7 @@ class CarbonWallet {
             publicKeyBase64 }));
     }
     static withKeplr(keplr, chainInfo, keplrKey, opts = {}) {
-        const signer = provider_1.KeplrAccount.createKeplrSigner(keplr, chainInfo, keplrKey);
+        const signer = keplrKey.isNanoLedger ? provider_1.KeplrAccount.createKeplrSignerAmino(keplr, chainInfo, keplrKey) : provider_1.KeplrAccount.createKeplrSigner(keplr, chainInfo, keplrKey);
         const publicKeyBase64 = Buffer.from(keplrKey.pubKey).toString("base64");
         const wallet = CarbonWallet.withSigner(signer, publicKeyBase64, Object.assign(Object.assign({}, opts), { providerAgent: 'keplr-extension' }));
         return wallet;

package/package.json

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