🐛 Fix gas over estimation (#49)

* 🐛 Fix send-nft gas over estimation * 🐛 Fix gas estimation should not be digit based
likecoin · Nov 17, 2023 · d19f260 · d19f260
1 parent 8756ff0
commit d19f260
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 20 deletions.
diff --git a/list-and-sell-nft/index.js b/list-and-sell-nft/index.js
@@ -11,9 +11,9 @@ import {
   // eslint-disable-next-line import/extensions
 } from './config/config.js';
 
-const defaultExpirationInMs = Date.now() + 15552000000
-const gasNeedDigits = 5;
-const amountNeedDigits = 6;
+const defaultExpirationInMs = Date.now() + 15552000000;
+const DEFAULT_GAS_AMOUNT = 200000;
+const DEFAULT_GAS_PRICE = 10000;
 
 function sleep(ms) {
   return new Promise((resolve) => { setTimeout(resolve, ms); });
@@ -52,10 +52,15 @@ function getGasFee(count) {
     amount: [
       {
         denom: DENOM,
-        amount: `${new BigNumber(count).shiftedBy(amountNeedDigits).toFixed(0)}`,
+        amount: new BigNumber(count)
+          .multipliedBy(DEFAULT_GAS_AMOUNT)
+          .multipliedBy(DEFAULT_GAS_PRICE)
+          .toFixed(0),
       },
     ],
-    gas: `${new BigNumber(count).shiftedBy(gasNeedDigits).toFixed(0)}`,
+    gas: new BigNumber(count)
+      .multipliedBy(DEFAULT_GAS_AMOUNT)
+      .toFixed(0),
   };
 }
 

diff --git a/send-like/index.js b/send-like/index.js
@@ -12,10 +12,15 @@ const memo = process.env.MEMO || '';
 ////////////// adjust delay //////////////
 const waitTime = Number(10000)
 
+const DEFAULT_GAS_AMOUNT = 200000;
+const DEFAULT_GAS_PRICE = 10000;
+
 const wallet = await DirectSecp256k1HdWallet.fromMnemonic(mnemonic, { prefix: 'like' });
 const [firstAccount] = await wallet.getAccounts();
+
 const rpcEndpoint = process.env.IS_TESTNET ? 'https://node.testnet.like.co/rpc/' : 'https://mainnet-node.like.co/rpc/';
 const denom = process.env.IS_TESTNET ? "nanoekil" : "nanolike"
+
 const client = await SigningStargateClient.connectWithSigner(
 	rpcEndpoint,
 	wallet,
@@ -55,11 +60,16 @@ async function run() {
 	const fee = {
 		amount: [
 			{
-				denom: denom,
-				amount: `${new BigNumber(msgAnyArray.length).shiftedBy(6).toFixed(0)}`,
+				denom,
+				amount: new BigNumber(msgAnyArray.length)
+					.multipliedBy(DEFAULT_GAS_AMOUNT)
+					.multipliedBy(DEFAULT_GAS_PRICE)
+					.toFixed(0),
 			},
 		],
-		gas: `${new BigNumber(msgAnyArray.length).shiftedBy(5).toFixed(0)}`,
+		gas: new BigNumber(msgAnyArray.length)
+			.multipliedBy(DEFAULT_GAS_AMOUNT)
+			.toFixed(0),
 	};
 
 	console.log('total:', total)

diff --git a/send-nft/index.js b/send-nft/index.js
@@ -14,8 +14,8 @@ import {
   // eslint-disable-next-line import/extensions
 } from './config/config.js';
 
-const gasNeedDigits = 5;
-const amountNeedDigits = 6;
+const DEFAULT_GAS_AMOUNT = 200000;
+const DEFAULT_GAS_PRICE = 10000;
 
 function sleep(ms) {
   return new Promise((resolve) => { setTimeout(resolve, ms); });
@@ -76,10 +76,15 @@ function getGasFee(count) {
     amount: [
       {
         denom: DENOM,
-        amount: `${new BigNumber(count).shiftedBy(amountNeedDigits).toFixed(0)}`,
+        amount: new BigNumber(count)
+          .multipliedBy(DEFAULT_GAS_AMOUNT)
+          .multipliedBy(DEFAULT_GAS_PRICE)
+          .toFixed(0),
       },
     ],
-    gas: `${new BigNumber(count).shiftedBy(gasNeedDigits).toFixed(0)}`,
+    gas: new BigNumber(count)
+      .multipliedBy(DEFAULT_GAS_AMOUNT)
+      .toFixed(0),
   };
 }
 

diff --git a/web-ui/utils/cosmos.ts b/web-ui/utils/cosmos.ts
@@ -8,6 +8,9 @@ import { addParamToUrl } from '.'
 import { RPC_URL, LIKER_NFT_FEE_WALLET } from '~/constant'
 import network from '~/constant/network'
 
+const DEFAULT_GAS_AMOUNT = 200000
+const DEFAULT_GAS_PRICE = 10000
+
 export const royaltyRateBasisPoints = 1000 // 10% as in current chain config
 export const royaltyFeeAmount = 25000 // 2.5%
 export const royaltyUserAmount = 1000000 - royaltyFeeAmount // 1000000 - fee
@@ -34,16 +37,15 @@ export function getGasFee (count: number) {
     amount: [
       {
         denom: network.feeCurrencies[0].coinMinimalDenom,
-        amount: `${new BigNumber(count)
-          .shiftedBy(network.feeCurrencies[0].coinDecimals)
-          .shiftedBy(-4) // *10000
-          .toFixed(0)}`
+        amount: new BigNumber(count)
+          .multipliedBy(DEFAULT_GAS_AMOUNT)
+          .multipliedBy(DEFAULT_GAS_PRICE)
+          .toFixed(0)
       }
     ],
-    gas: `${new BigNumber(count)
-      .shiftedBy(network.feeCurrencies[0].coinDecimals)
-      .shiftedBy(-3) // * 1000
-      .toFixed(0)}`
+    gas: new BigNumber(count)
+      .multipliedBy(DEFAULT_GAS_AMOUNT)
+      .toFixed(0)
   }
 }