From 936ad73a8932a488252ad355eb7fe3ec8ef1051d Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Tue, 8 Oct 2024 03:47:11 +0000 Subject: [PATCH] Use registry-sdk methods to parse gas and fees (#85) Part of [Service provider auctions for web deployments](https://www.notion.so/Service-provider-auctions-for-web-deployments-104a6b22d47280dbad51d28aa3a91d75) Co-authored-by: IshaVenikar Reviewed-on: https://git.vdb.to/cerc-io/laconic-registry-cli/pulls/85 Co-authored-by: Prathamesh Musale Co-committed-by: Prathamesh Musale --- package.json | 2 +- src/util/fees.ts | 26 +++----------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index c8c4b64..b2d24a5 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "typescript": "^4.6.3" }, "dependencies": { - "@cerc-io/registry-sdk": "^0.2.10", + "@cerc-io/registry-sdk": "^0.2.11", "@cosmjs/stargate": "^0.32.2", "fs-extra": "^10.1.0", "js-yaml": "^3.14.1", diff --git a/src/util/fees.ts b/src/util/fees.ts index 50e3afb..1ad5ad4 100644 --- a/src/util/fees.ts +++ b/src/util/fees.ts @@ -1,28 +1,8 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import assert from 'assert'; import { Arguments } from 'yargs'; -import { StdFee, GasPrice, parseCoins } from '@cosmjs/stargate'; - -export const parseGasAndFees = (gas?: string, fees?: string): StdFee | number | undefined => { - // If fees is not given or a number, treat it as a gas estimation multiplier - if (fees === null || fees === undefined) { - return undefined; - } - - const isFeesANumber = !isNaN(Number(fees)); - if (isFeesANumber) { - return Number(fees); - } - - // If fees is not a gas estimation multiplier, gas is required - assert(gas, 'Invalid gas.'); - - return { - amount: parseCoins(String(fees)), - gas: String(gas) - }; -}; +import { parseGasAndFees, getGasPrice as registryGetGasPrice } from '@cerc-io/registry-sdk'; +import { StdFee, GasPrice } from '@cosmjs/stargate'; export const getGasAndFees = (argv: Arguments, config: any = {}): StdFee | number | undefined => { return parseGasAndFees( @@ -33,5 +13,5 @@ export const getGasAndFees = (argv: Arguments, config: any = {}): StdFee | numbe export const getGasPrice = (argv: Arguments, config: any = {}): GasPrice | undefined => { const gasPriceString = argv.gasPrice || config.gasPrice; - return gasPriceString != null ? GasPrice.fromString(String(gasPriceString)) : undefined; + return registryGetGasPrice(gasPriceString); };