@exodus/ethereum-lib 3.0.2 → 3.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "files": [
@@ -41,5 +41,5 @@
     "ms": "^2.1.1",
     "reselect": "~3.0.1"
   },
-  "gitHead": "b5bbf65b92737f9fb2bf6ac3412cc9e0bb803483"
+  "gitHead": "dcee33135e8134736fd7243c91b52ff1479de5d6"
 }

package/src/abi/index.js

@@ -14,6 +14,7 @@ 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,
@@ -32,4 +33,5 @@ export default {
   fantomSfc,
   ensRegistry,
   ensResolver,
+  optimismGasOracle,
 }

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

@@ -0,0 +1,298 @@
+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/create-contract/index.js

@@ -30,6 +30,8 @@ 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/unsigned-tx/create-ethereumjs-tx.js

@@ -0,0 +1,47 @@
+/* @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 createEthereumJsTx(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
+}

package/src/unsigned-tx/index.js

@@ -2,3 +2,4 @@ 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 createEthereumJsTx } from './create-ethereumjs-tx'

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

@@ -1,52 +1,12 @@
 /* @flow */
-import { Transaction, FeeMarketEIP1559Transaction } from '@exodus/ethereumjs-tx'
-import Common from '@exodus/ethereumjs-common'
-
 import type { UnsignedTransaction, SignedTransaction } from '@exodus/models/lib/types'
-import { CUSTOM_CHAINS } from '../constants'
+import createEthereumJsTx from './create-ethereumjs-tx'
 
 export default function signUnsignedTx(
   unsignedTx: UnsignedTransaction,
   privateKey: Buffer
 ): SignedTransaction {
-  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 tx = createEthereumJsTx(unsignedTx)
   const signedTx = tx.sign(privateKey)
 
   // serialize and get txId

package/src/utils/index.js

@@ -119,6 +119,7 @@ const customTokensWithRpcBalance = [
   'move_bsc_4b4012e3',
   'feg_ethereum_ef42acf0',
   'feg_bsc_48812e49',
+  'opt2_matic_2bb66719',
 ]
 
 export const isRpcBalanceAsset = (asset) =>
@@ -136,6 +137,7 @@ export const isRpcBalanceAsset = (asset) =>
     'fantommainnet',
     'rootstock',
     'ethereumarbone',
+    'optimism',
     ...customTokensWithRpcBalance,
   ].includes(asset.name) || asset.baseAsset.name === 'rootstock'