#NOISSUE - fix eth + bsc kms gas estimations

fix marketplace listing for erc20 token with different decimals then 18
tatumio · Oct 6, 2021 · 87a557a · 87a557a
1 parent 95fea8a
commit 87a557a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tatumio/tatum",
-  "version": "1.26.8",
+  "version": "1.27.0",
   "description": "Tatum API client allows browsers and Node.js clients to interact with Tatum API.",
   "main": "dist/src/index.js",
   "repository": "https://github.com/tatumio/tatum-js",

diff --git a/src/nft/marketplace/listing.ts b/src/nft/marketplace/listing.ts
@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js';
 import {get, validateBody} from '../../connector/tatum';
-import {prepareApproveErc20} from '../../fungible';
+import {getErc20Decimals, prepareApproveErc20} from '../../fungible';
 import {helperBroadcastTx, helperPrepareSCCall} from '../../helpers';
 import {
     ApproveErc20,
@@ -235,8 +235,9 @@ export const prepareMarketplaceApproveErc20Spending = async (testnet: boolean, b
  */
 export const prepareMarketplaceCreateListing = async (testnet: boolean, body: CreateMarketplaceListing | CreateTronMarketplaceListing, provider?: string) => {
     await validateBody(body, body.chain === Currency.TRON ? CreateTronMarketplaceListing : CreateMarketplaceListing);
+    const decimals = body.erc20Address ? await getErc20Decimals(testnet, body.chain, body.erc20Address, provider) : 18;
     const params = [body.listingId, body.isErc721, body.nftAddress.trim(), `0x${new BigNumber(body.tokenId).toString(16)}`,
-        `0x${new BigNumber(body.price).multipliedBy(body.chain === Currency.TRON ? 1e6 : 1e18).toString(16)}`, body.seller.trim(), `0x${new BigNumber(body.amount || 0).toString(16)}`,
+        `0x${new BigNumber(body.price).multipliedBy(10 ** decimals).toString(16)}`, body.seller.trim(), `0x${new BigNumber(body.amount || 0).toString(16)}`,
         body.erc20Address || '0x0000000000000000000000000000000000000000'];
     if (body.chain === Currency.TRON) {
         throw new Error('Unsupported chain');

diff --git a/src/transaction/bsc.ts b/src/transaction/bsc.ts
@@ -92,18 +92,21 @@ const prepareBscSignedTransactionAbstraction = async (
  */
 export const signBscKMSTransaction = async (tx: TransactionKMS, fromPrivateKey: string, provider?: string) => {
     if (tx.chain !== Currency.BSC) {
-        throw Error('Unsupported chain.')
+        throw Error('Unsupported chain.');
+    }
+    const client = getBscClient(provider, fromPrivateKey);
+    const transactionConfig = JSON.parse(tx.serializedTransaction);
+    const gas = await client.eth.estimateGas(transactionConfig);
+    if (!transactionConfig.gas) {
+        transactionConfig.gas = gas;
     }
-    const client = getBscClient(provider, fromPrivateKey)
-    const transactionConfig = JSON.parse(tx.serializedTransaction)
-    transactionConfig.gas = await client.eth.estimateGas(transactionConfig)
     if (!transactionConfig.nonce) {
-        transactionConfig.nonce = await bscGetTransactionsCount(client.eth.defaultAccount as string)
+        transactionConfig.nonce = await bscGetTransactionsCount(client.eth.defaultAccount as string);
     }
     if (!transactionConfig.gasPrice || transactionConfig.gasPrice === '0' || transactionConfig.gasPrice === 0 || transactionConfig.gasPrice === '0x0') {
-        transactionConfig.gasPrice = await bscGetGasPriceInWei()
+        transactionConfig.gasPrice = await bscGetGasPriceInWei();
     }
-    return (await client.eth.accounts.signTransaction(transactionConfig, fromPrivateKey as string)).rawTransaction as string
+    return (await client.eth.accounts.signTransaction(transactionConfig, fromPrivateKey as string)).rawTransaction as string;
 }
 
 export const getBscBep20ContractDecimals = async (testnet: boolean, contractAddress: string, provider?: string) => {

diff --git a/src/transaction/eth.ts b/src/transaction/eth.ts
@@ -88,18 +88,21 @@ export const getClient = (provider?: string, privateKey?: string) => {
  */
 export const signEthKMSTransaction = async (tx: TransactionKMS, fromPrivateKey: string, provider?: string) => {
     if (tx.chain !== Currency.ETH) {
-        throw Error('Unsupported chain.')
+        throw Error('Unsupported chain.');
+    }
+    const client = getClient(provider, fromPrivateKey);
+    const transactionConfig = JSON.parse(tx.serializedTransaction);
+    const gas = await client.eth.estimateGas(transactionConfig);
+    if (!transactionConfig.gas) {
+        transactionConfig.gas = gas;
     }
-    const client = getClient(provider, fromPrivateKey)
-    const transactionConfig = JSON.parse(tx.serializedTransaction)
-    transactionConfig.gas = await client.eth.estimateGas(transactionConfig)
     if (!transactionConfig.nonce) {
-        transactionConfig.nonce = await ethGetTransactionsCount(client.eth.defaultAccount as string)
+        transactionConfig.nonce = await ethGetTransactionsCount(client.eth.defaultAccount as string);
     }
     if (!transactionConfig.gasPrice || transactionConfig.gasPrice === '0' || transactionConfig.gasPrice === 0 || transactionConfig.gasPrice === '0x0') {
-        transactionConfig.gasPrice = await ethGetGasPriceInWei()
+        transactionConfig.gasPrice = await ethGetGasPriceInWei();
     }
-    return (await client.eth.accounts.signTransaction(transactionConfig, fromPrivateKey as string)).rawTransaction as string
+    return (await client.eth.accounts.signTransaction(transactionConfig, fromPrivateKey as string)).rawTransaction as string;
 }
 
 /**