@exodus/ethereum-lib 4.2.1 → 4.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "4.2.1",
+  "version": "4.2.3",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "files": [
@@ -44,5 +44,5 @@
     "ms": "^2.1.1",
     "reselect": "~3.0.1"
   },
-  "gitHead": "419d8b4d0d4f8617b8da97a5dd9d3e328a948ae6"
+  "gitHead": "932d009fbd44833d111c7b73142f62e671623ab3"
 }

package/src/fee-data/cronos.js

@@ -1,12 +1,13 @@
 import { FeeData } from '@exodus/asset-lib'
 import { asset } from '@exodus/cronos-meta'
 
+// https://cronoscan.com/chart/gasprice
 export default new FeeData({
   config: {
-    gasPrice: '5100 Gwei',
-    max: '5700 Gwei',
-    min: '4700 Gwei',
-    fuelThreshold: '4800 Gwei',
+    gasPrice: '11250 Gwei',
+    max: '250000 Gwei',
+    min: '10000 Gwei',
+    fuelThreshold: '10000 Gwei',
     gasPriceEconomicalRate: 0.8,
     gasPriceMinimumRate: 0.6,
     enableFeeDelegation: false,

package/src/unsigned-tx/create-ethereumjs-tx.js

@@ -1,47 +1,38 @@
-/* @flow */
 import { Transaction, FeeMarketEIP1559Transaction } from '@exodus/ethereumjs-tx'
-import Common from '@exodus/ethereumjs-common'
+import Common, { Hardfork } from '@exodus/ethereumjs-common'
 
-import type { UnsignedTransaction } from '@exodus/models/lib/types'
-import { CUSTOM_CHAINS } from '../constants'
-
-export default function createEthereumJsTx(unsignedTx: UnsignedTransaction) {
+export default function createEthereumJsTx(unsignedTx) {
   const {
-    txData: { gasPrice, tipGasPrice: maxPriorityFeePerGas, chainId: chain, ...txData },
+    txData: { chainId, ...txData },
     txMeta: { eip1559Enabled },
   } = unsignedTx
+  const { gasPrice, tipGasPrice } = txData
 
-  let tx
   /*
-    To assemble an EIP 1559 tx,
-    both `tipGasPrice` and `eip` must have been set in the input object used to build `unsignedTx`.
-    Whether bsc will support EIP 1559 is unknown.
-    So we must prevent building accidentally an EIP1559 tx on bsc if tipGasPrice is set
-    `eip` will be set with s corresponding feature flag in the wallet
+    EIP1559 is not supported by all ethereum-like assets.
+    e.g BSC does not support EIP1559 at the moment, prevent building an EIP1559 transaction
+    if `tipGasPrice` or `maxPriorityFeePerGas` is set.
   */
-  if (maxPriorityFeePerGas && eip1559Enabled) {
-    tx = FeeMarketEIP1559Transaction.fromTxData(
+  const isEip1559Tx = !!(unsignedTx.txData.tipGasPrice || unsignedTx.txData.maxPriorityFeePerGas)
+  if (eip1559Enabled && isEip1559Tx) {
+    return FeeMarketEIP1559Transaction.fromTxData(
       {
         maxFeePerGas: gasPrice,
-        maxPriorityFeePerGas,
-        type: '0x02', // https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/tx#gas-fee-market-transactions-eip-1559,
+        maxPriorityFeePerGas: tipGasPrice,
+        // `maxPriorityFeePerGas`, `maxFeePerGas` set in `txData` below take precedence over ^.
         ...txData,
       },
       {
-        common: new Common({
-          chain,
-          hardfork: 'london',
-          customChains: CUSTOM_CHAINS,
-          eips: [1559],
-        }),
+        common: Common.custom(
+          {
+            chainId,
+          },
+          { hardfork: Hardfork.London }
+        ),
       }
     )
   } else {
     // Legacy tx
-    tx = Transaction.fromTxData(
-      { gasPrice, ...txData },
-      { common: Common.custom({ chainId: chain }) }
-    )
+    return Transaction.fromTxData(txData, { common: Common.custom({ chainId }) })
   }
-  return tx
 }