carbon-js-sdk 0.11.30 → 0.11.31

package/lib/clients/ETHClient.js

@@ -77,7 +77,7 @@ class ETHClient {
             const contract = new ethers_1.ethers.Contract(contractAddress, eth_1.ABIs.erc20, rpcProvider);
             const approvalAmount = ethers_1.ethers.BigNumber.from((_a = amount === null || amount === void 0 ? void 0 : amount.toString(10)) !== null && _a !== void 0 ? _a : ethers_1.ethers.constants.MaxUint256);
             const nonce = yield this.getTxNonce(ethAddress, params.nonce, rpcProvider);
-            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, approvalAmount, Object.assign(Object.assign({ nonce }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })));
+            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, approvalAmount, Object.assign(Object.assign({ nonce }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10) })), gasLimit && ({ gasLimit: gasLimit.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10) })));
             return approveResultTx;
         });
     }
@@ -122,10 +122,10 @@ class ETHClient {
                 toAddress,
                 toAssetHash, // _toAssetHash
             ], [
-                amount.toString(10),
-                feeAmount.toString(10),
-                amount.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) }));
+                amount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10),
+                feeAmount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10),
+                amount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10),
+            ], Object.assign(Object.assign(Object.assign({}, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10) })), gasLimit && ({ gasLimit: gasLimit.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10) })), { nonce, value: ethAmount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10) }));
             signCompleteCallback === null || signCompleteCallback === void 0 ? void 0 : signCompleteCallback();
             return bridgeResultTx;
         });
@@ -153,11 +153,11 @@ class ETHClient {
             feeAddress, // _feeAddress
             [
                 // _values
-                amount.toString(),
+                amount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10),
                 "0",
-                amount.toString(), // callAmount
-            ], 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(),
+                amount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10), // callAmount
+            ], Object.assign(Object.assign(Object.assign({ nonce, value: "0" }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10) })), gasLimit && ({ gasLimit: gasLimit.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10) })), (token.tokenAddress === "0000000000000000000000000000000000000000" && {
+                value: amount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10),
             })));
             signCompleteCallback === null || signCompleteCallback === void 0 ? void 0 : signCompleteCallback();
             return lockResultTx;

package/lib/clients/ZILClient.js

@@ -288,12 +288,12 @@ class ZILClient {
                 {
                     vname: "amount",
                     type: "Uint256",
-                    value: amount.toString(10),
+                    value: amount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10),
                 },
                 {
                     vname: "withdrawFeeAmount",
                     type: "Uint256",
-                    value: feeAmount.toString(10),
+                    value: feeAmount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10),
                 },
             ];
             const data = {
@@ -375,7 +375,7 @@ class ZILClient {
                 {
                     vname: "amount",
                     type: "Uint256",
-                    value: amount.toString(),
+                    value: amount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10),
                 },
                 {
                     vname: "feeAmount",

package/lib/modules/coin.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoinModule = void 0;
 const tx_1 = require("../codec/Switcheo/carbon/coin/tx");
 const util_1 = require("../util");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const base_1 = __importDefault(require("./base"));
 class CoinModule extends base_1.default {
     createWithdrawal(params, opts) {
@@ -24,8 +25,8 @@ class CoinModule extends base_1.default {
                 creator: wallet.bech32Address,
                 toAddress: params.toAddress,
                 denom: params.denom,
-                amount: params.amount.toString(10),
-                feeAmount: params.feeAmount.toString(10),
+                amount: params.amount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10),
+                feeAmount: params.feeAmount.dp(0, bignumber_js_1.default.ROUND_FLOOR).toString(10),
                 feeAddress: params.feeAddress,
                 feeDenom: params.feeDenom,
             });

package/lib/modules/grant.js

@@ -46,6 +46,8 @@ class GrantModule extends base_1.default {
                 };
             });
             let messages = encodedGrantMsgs;
+            // can only have one existing grant between granter and grantee
+            // to 'extend' have to revoke existing fee-grant and approve new fee-grant with new expiration
             if (params.existingGrantee) {
                 const encodedRevokeAllowanceMsg = [{
                         typeUrl: util_1.CarbonTx.Types.MsgRevokeAllowance,
@@ -81,7 +83,7 @@ class GrantModule extends base_1.default {
         });
     }
     revokeAuthAndAllowance(params, opts) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
             const authorizedSignlessMsgs = (_a = wallet.authorizedMsgs) !== null && _a !== void 0 ? _a : [];
@@ -97,7 +99,16 @@ class GrantModule extends base_1.default {
                     value: revokeMsg,
                 };
             });
-            const result = yield wallet.sendTxs(encodedRevokeGrantMsgs, opts);
+            let messages = encodedRevokeGrantMsgs;
+            const encodedRevokeAllowanceMsg = [{
+                    typeUrl: util_1.CarbonTx.Types.MsgRevokeAllowance,
+                    value: tx_2.MsgRevokeAllowance.fromPartial({
+                        granter: (_b = params.granter) !== null && _b !== void 0 ? _b : wallet.bech32Address,
+                        grantee: params.grantee,
+                    }),
+                }];
+            messages = messages.concat(encodedRevokeAllowanceMsg);
+            const result = yield wallet.sendTxs(messages, opts);
             return result;
         });
     }

package/lib/wallet/CarbonWallet.d.ts

@@ -105,8 +105,6 @@ export interface AccountInfo extends Account {
 export interface Grantee {
     expiry: Date;
     signer: OfflineDirectSigner;
-    address: string;
-    authMsgsVersion: number;
 }
 export declare class CarbonWallet {
     network: Network;

package/lib/wallet/CarbonWallet.js

@@ -246,10 +246,9 @@ class CarbonWallet {
     isGranteeValid() {
         if (!this.grantee)
             return false;
-        const { expiry, authMsgsVersion } = this.grantee;
+        const { expiry } = this.grantee;
         const hasNotExpired = dayjs_1.default.utc(expiry).isAfter(dayjs_1.default.utc().add(grant_1.BUFFER_PERIOD, 'seconds'));
-        const versionUpToDate = authMsgsVersion === this.authorizedMsgsVersion;
-        return hasNotExpired && versionUpToDate && !!this.grantee.signer;
+        return hasNotExpired && !!this.grantee.signer;
     }
     updateNetwork(network) {
         this.network = network;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.11.30",
+  "version": "0.11.31",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -73,6 +73,7 @@
     "wif": "^2.0.6"
   },
   "devDependencies": {
+    "@ledgerhq/hw-transport-node-hid": "^6.29.5",
     "@types/lodash": "^4.14.174",
     "@types/node": "^17.0.6",
     "@types/node-fetch": "^2.5.12",