@exodus/ethereum-lib 2.27.0-alpha.0 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.27.0-alpha.0",
+  "version": "3.0.0",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "files": [
@@ -15,19 +15,31 @@
   },
   "dependencies": {
     "@exodus/asset-lib": "^3.7.1",
-    "@exodus/assets": "8.0.84",
+    "@exodus/assets": "^8.0.84",
+    "@exodus/avalanchec-meta": "^1.0.1",
     "@exodus/basic-utils": "^0.7.0",
     "@exodus/bip32": "^1.0.0",
+    "@exodus/bsc-meta": "^1.0.11",
+    "@exodus/ethereum-meta": "^1.0.21",
+    "@exodus/ethereumarbnova-meta": "^1.0.2",
+    "@exodus/ethereumarbone-meta": "^1.0.2",
+    "@exodus/ethereumclassic-meta": "^1.0.1",
+    "@exodus/ethereumgoerli-meta": "^1.0.3",
     "@exodus/ethereumjs-common": "^2.4.0-exodus.6",
     "@exodus/ethereumjs-tx": "^3.3.0-exodus.6",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
+    "@exodus/fantommainnet-meta": "^1.0.3",
+    "@exodus/harmonymainnet-meta": "^1.0.0",
     "@exodus/key-utils": "^1.0.0",
+    "@exodus/matic-meta": "^1.0.8",
     "@exodus/models": "^8.10.4",
+    "@exodus/optimism-meta": "^1.0.0",
+    "@exodus/rootstock-meta": "^1.0.2",
     "@exodus/solidity-contract": "^1.1.3",
     "base-x": "^3.0.2",
     "lodash": "^4.17.15",
     "ms": "^2.1.1",
     "reselect": "~3.0.1"
   },
-  "gitHead": "3241be77078ca4bf456bd7b2e8f3fe545142c92e"
+  "gitHead": "b299a67ebe7a7c23638d868b074df4d20b3f56d9"
 }

package/src/abi/index.js

@@ -14,7 +14,6 @@ import maticStakingManager from './matic-staking-manager'
 import fantomSfc from './fantom-sfc'
 import ensRegistry from './ens-registry'
 import ensResolver from './ens-resolver'
-import optimismGasOracle from './optimism-gas-oracle'
 
 export default {
   ant,
@@ -33,5 +32,4 @@ export default {
   fantomSfc,
   ensRegistry,
   ensResolver,
-  optimismGasOracle,
 }

package/src/create-contract/index.js

@@ -30,8 +30,6 @@ export default function createContract(address, contractName) {
       return new SolidityContract(ABI.ensRegistry, address, true)
     case 'erc721':
       return new SolidityContract(ABI.erc721, address, true)
-    case 'optimismGasOracle':
-      return new SolidityContract(ABI.optimismGasOracle, address, true)
     default:
       return SolidityContract.erc20(address)
   }

package/src/fee-data/avalanchec.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/avalanchec-meta'
 
 export default new FeeData({
   config: {
@@ -16,5 +16,5 @@ export default new FeeData({
     tipGasPrice: '4 nAVAX',
   },
   mainKey: 'gasPrice',
-  currency: assets.avalanchec.currency,
+  currency: asset.currency,
 })

package/src/fee-data/bsc.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/bsc-meta'
 
 export default new FeeData({
   config: {
@@ -12,5 +12,5 @@ export default new FeeData({
     eip1559Enabled: false,
   },
   mainKey: 'gasPrice',
-  currency: assets.bsc.currency,
+  currency: asset.currency,
 })

package/src/fee-data/ethereum.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/ethereum-meta'
 
 export default new FeeData({
   config: {
@@ -17,5 +17,5 @@ export default new FeeData({
     rbfEnabled: true,
   },
   mainKey: 'gasPrice',
-  currency: assets.ethereum.currency,
+  currency: asset.currency,
 })

package/src/fee-data/ethereumarbnova.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/ethereumarbnova-meta'
 
 export default new FeeData({
   config: {
@@ -12,5 +12,5 @@ export default new FeeData({
     eip1559Enabled: false,
   },
   mainKey: 'gasPrice',
-  currency: assets.ethereumarbnova.currency,
+  currency: asset.currency,
 })

package/src/fee-data/ethereumarbone.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/ethereumarbone-meta'
 
 export default new FeeData({
   config: {
@@ -12,5 +12,5 @@ export default new FeeData({
     eip1559Enabled: false,
   },
   mainKey: 'gasPrice',
-  currency: assets.ethereumarbone.currency,
+  currency: asset.currency,
 })

package/src/fee-data/ethereumclassic.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/ethereumclassic-meta'
 
 export default new FeeData({
   config: {
@@ -9,5 +9,5 @@ export default new FeeData({
     eip1559Enabled: false,
   },
   mainKey: 'gasPrice',
-  currency: assets.ethereumclassic.currency,
+  currency: asset.currency,
 })

package/src/fee-data/ethereumgoerli.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/ethereumgoerli-meta'
 
 export default new FeeData({
   config: {
@@ -16,5 +16,5 @@ export default new FeeData({
     eip1559Enabled: true,
   },
   mainKey: 'gasPrice',
-  currency: assets.ethereumgoerli.currency,
+  currency: asset.currency,
 })

package/src/fee-data/fantom.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/fantommainnet-meta'
 
 export default new FeeData({
   config: {
@@ -13,5 +13,5 @@ export default new FeeData({
     eip1559Enabled: false,
   },
   mainKey: 'gasPrice',
-  currency: assets.fantommainnet.currency,
+  currency: asset.currency,
 })

package/src/fee-data/harmony.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/harmonymainnet-meta'
 
 export default new FeeData({
   config: {
@@ -12,5 +12,5 @@ export default new FeeData({
     eip1559Enabled: false,
   },
   mainKey: 'gasPrice',
-  currency: assets.harmonymainnet.currency,
+  currency: asset.currency,
 })

package/src/fee-data/optimism.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/optimism-meta'
 
 export default new FeeData({
   config: {
@@ -12,5 +12,5 @@ export default new FeeData({
     eip1559Enabled: false,
   },
   mainKey: 'gasPrice',
-  currency: assets.optimism.currency,
+  currency: asset.currency,
 })

package/src/fee-data/polygon.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/matic-meta'
 
 export default new FeeData({
   config: {
@@ -15,5 +15,5 @@ export default new FeeData({
     eip1559Enabled: true,
   },
   mainKey: 'gasPrice',
-  currency: assets.matic.currency,
+  currency: asset.currency,
 })

package/src/fee-data/rootstock.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/rootstock-meta'
 
 export default new FeeData({
   config: {
@@ -12,5 +12,5 @@ export default new FeeData({
     eip1559Enabled: false,
   },
   mainKey: 'gasPrice',
-  currency: assets.rootstock.currency,
+  currency: asset.currency,
 })

package/src/unsigned-tx/index.js

@@ -2,4 +2,3 @@ export { default as createUnsignedTx } from './create-unsigned-tx'
 export { default as parseUnsignedTx } from './parse-unsigned-tx'
 export { default as signUnsignedTx } from './sign-unsigned-tx'
 export { default as createAndSignTx } from './create-and-sign-tx'
-export { default as convertUnsignedTx } from './convert-unsigned-tx'

package/src/unsigned-tx/parse-unsigned-tx.js

@@ -36,7 +36,6 @@ export default function parseUnsignedTx(
   }
 
   return {
-    asset,
     to,
     amount,
     fee,

package/src/unsigned-tx/sign-unsigned-tx.js

@@ -1,12 +1,52 @@
 /* @flow */
+import { Transaction, FeeMarketEIP1559Transaction } from '@exodus/ethereumjs-tx'
+import Common from '@exodus/ethereumjs-common'
+
 import type { UnsignedTransaction, SignedTransaction } from '@exodus/models/lib/types'
-import convertUnsignedTx from './convert-unsigned-tx'
+import { CUSTOM_CHAINS } from '../constants'
 
 export default function signUnsignedTx(
   unsignedTx: UnsignedTransaction,
   privateKey: Buffer
 ): SignedTransaction {
-  const tx = convertUnsignedTx(unsignedTx)
+  const {
+    txData: { gasPrice, tipGasPrice: maxPriorityFeePerGas, chainId: chain, ...txData },
+    txMeta: { eip1559Enabled },
+  } = unsignedTx
+
+  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
+  */
+  if (maxPriorityFeePerGas && eip1559Enabled) {
+    tx = FeeMarketEIP1559Transaction.fromTxData(
+      {
+        maxFeePerGas: gasPrice,
+        maxPriorityFeePerGas,
+        type: '0x02', // https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/tx#gas-fee-market-transactions-eip-1559,
+        ...txData,
+      },
+      {
+        common: new Common({
+          chain,
+          hardfork: 'london',
+          customChains: CUSTOM_CHAINS,
+          eips: [1559],
+        }),
+      }
+    )
+  } else {
+    // Legacy tx
+    tx = Transaction.fromTxData(
+      { gasPrice, ...txData },
+      { common: Common.custom({ chainId: chain }) }
+    )
+  }
+
   const signedTx = tx.sign(privateKey)
 
   // serialize and get txId

package/src/utils/index.js

@@ -1,6 +1,5 @@
 import baseX from 'base-x'
 import * as ethUtil from '@exodus/ethereumjs-util'
-import assets from '@exodus/assets'
 import { ETHEREUM_LIKE_ASSETS, ETHEREUM_LIKE_TOKEN_TYPES } from '../constants'
 import { FeeMarketEIP1559Transaction, Transaction } from '@exodus/ethereumjs-tx'
 import { uniq } from 'lodash'
@@ -22,7 +21,10 @@ export const isRootstockToken = (asset) => asset.assetType === 'RSK_ERC20'
 
 // All ethereum-like tokens
 export const isEthereumLikeToken = (asset) => ETHEREUM_LIKE_TOKEN_TYPES.includes(asset.assetType)
-export const isEthereumLikeTokenByName = (assetName) => isEthereumLikeToken(assets[assetName])
+// @deprecated
+export const isEthereumLikeTokenByName = (assetName) => {
+  throw new Error('Please use isEthereumLikeToken() instead')
+}
 export const isToken = isEthereumLikeToken
 
 // All ethereum-like assets (native coins)
@@ -31,7 +33,10 @@ export const isEthereumLikeAssetByName = (assetName) => ETHEREUM_LIKE_ASSETS.inc
 
 // All ethereum-like assets and tokens
 export const isEthereumLike = (asset) => ETHEREUM_LIKE_ASSETS.includes(asset.baseAsset.name)
-export const isEthereumLikeByName = (assetName) => isEthereumLike(assets[assetName])
+// @deprecated
+export const isEthereumLikeByName = (assetName) => {
+  throw new Error('Please use isEthereumLike() instead')
+}
 
 export function buffer2currency({ asset, value }) {
   return asset.currency.baseUnit(base10.encode(value)).toDefault()
@@ -56,9 +61,9 @@ export function normalizeTxId(txId: string): string {
   else return '0x' + txId
 }
 
+// @deprecated
 export function getBaseAsset(asset) {
-  console.log(`calling deprecated function getBaseAsset(${asset.name})`) // Apr. 9th 2021
-  return isEthereumToken(asset) ? assets.ethereum : asset
+  throw new Error('getBaseAsset: this function is no longer supported')
 }
 
 const TRANSACTION_TYPE = 2
@@ -121,9 +126,9 @@ export const getAssetAddresses = (asset) => {
   // Can we unify?
   const addresses = [
     asset.contract?.address, // asset in wallets:
-    asset.contract?.current, // asset in @exodus/assets:
+    asset.contract?.current, // asset in @exodus/assets-base:
     ...(asset.addresses?.previous || []), // asset in wallets:
-    ...(asset.contract?.previous || []), // asset in @exodus/assets:
+    ...(asset.contract?.previous || []), // asset in @exodus/assets-base:
   ]
   return uniq(addresses.filter((a) => a && typeof a === 'string'))
 }

package/src/abi/optimism-gas-oracle.js

@@ -1,298 +0,0 @@
-export default [
-  {
-    inputs: [
-      {
-        internalType: 'address',
-        name: '_owner',
-        type: 'address',
-      },
-    ],
-    stateMutability: 'nonpayable',
-    type: 'constructor',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    name: 'DecimalsUpdated',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    name: 'GasPriceUpdated',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    name: 'L1BaseFeeUpdated',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    name: 'OverheadUpdated',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'previousOwner',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'newOwner',
-        type: 'address',
-      },
-    ],
-    name: 'OwnershipTransferred',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    name: 'ScalarUpdated',
-    type: 'event',
-  },
-  {
-    inputs: [],
-    name: 'decimals',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'gasPrice',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'bytes',
-        name: '_data',
-        type: 'bytes',
-      },
-    ],
-    name: 'getL1Fee',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'bytes',
-        name: '_data',
-        type: 'bytes',
-      },
-    ],
-    name: 'getL1GasUsed',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'l1BaseFee',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'overhead',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'owner',
-    outputs: [
-      {
-        internalType: 'address',
-        name: '',
-        type: 'address',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'renounceOwnership',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'scalar',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: '_decimals',
-        type: 'uint256',
-      },
-    ],
-    name: 'setDecimals',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: '_gasPrice',
-        type: 'uint256',
-      },
-    ],
-    name: 'setGasPrice',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: '_baseFee',
-        type: 'uint256',
-      },
-    ],
-    name: 'setL1BaseFee',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: '_overhead',
-        type: 'uint256',
-      },
-    ],
-    name: 'setOverhead',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: '_scalar',
-        type: 'uint256',
-      },
-    ],
-    name: 'setScalar',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'address',
-        name: 'newOwner',
-        type: 'address',
-      },
-    ],
-    name: 'transferOwnership',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-]

package/src/unsigned-tx/convert-unsigned-tx.js

@@ -1,47 +0,0 @@
-/* @flow */
-import { Transaction, FeeMarketEIP1559Transaction } from '@exodus/ethereumjs-tx'
-import Common from '@exodus/ethereumjs-common'
-
-import type { UnsignedTransaction } from '@exodus/models/lib/types'
-import { CUSTOM_CHAINS } from '../constants'
-
-export default function convertUnsignedTx(unsignedTx: UnsignedTransaction) {
-  const {
-    txData: { gasPrice, tipGasPrice: maxPriorityFeePerGas, chainId: chain, ...txData },
-    txMeta: { eip1559Enabled },
-  } = unsignedTx
-
-  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
-  */
-  if (maxPriorityFeePerGas && eip1559Enabled) {
-    tx = FeeMarketEIP1559Transaction.fromTxData(
-      {
-        maxFeePerGas: gasPrice,
-        maxPriorityFeePerGas,
-        type: '0x02', // https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/tx#gas-fee-market-transactions-eip-1559,
-        ...txData,
-      },
-      {
-        common: new Common({
-          chain,
-          hardfork: 'london',
-          customChains: CUSTOM_CHAINS,
-          eips: [1559],
-        }),
-      }
-    )
-  } else {
-    // Legacy tx
-    tx = Transaction.fromTxData(
-      { gasPrice, ...txData },
-      { common: Common.custom({ chainId: chain }) }
-    )
-  }
-  return tx
-}