@exodus/ethereum-lib 2.26.8 → 2.26.10-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.26.8",
+  "version": "2.26.10-alpha.0",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "files": [
@@ -29,5 +29,5 @@
     "ms": "^2.1.1",
     "reselect": "~3.0.1"
   },
-  "gitHead": "a3b1098e021639b7ce042fe43035fab00c4c3a07"
+  "gitHead": "5cd2d22a1e9dadecd3bfc9d7a603d2c517e64e77"
 }

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/constants.js

@@ -1,6 +1,6 @@
 import { mapValues } from '@exodus/basic-utils'
 
-export const CHAIN_DATA = {
+const CHAIN_DATA = {
   ethereum: {
     chainId: 1,
     serverUrl: 'https://geth.a.exodus.io/wallet/v1/',

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/encode.js

@@ -1,12 +1,20 @@
 import * as etherUtil from '@exodus/ethereumjs-util'
+import { CHAIN_IDS } from './constants'
 
-export function validate(address) {
+export function validate(address, { baseAssetName } = {}) {
   if (typeof address !== 'string') return false
 
   // https://github.com/ethereumjs/ethereumjs-util/issues/54
   if (address.slice(0, 2) !== '0x' || address.length !== 42) return false
 
   if (!hasChecksum(address)) return true
+  if (baseAssetName && CHAIN_IDS[baseAssetName]) {
+    const checksumWithChainIdResult = etherUtil.isValidChecksumAddress(
+      address,
+      CHAIN_IDS[baseAssetName]
+    )
+    if (checksumWithChainIdResult) return true
+  }
   return etherUtil.isValidChecksumAddress(address)
 }
 
@@ -19,8 +27,12 @@ export function encodePrivate(privKey) {
   return '0x' + privKey.toString('hex')
 }
 
-export function encodePublic(compressedPubKey) {
+export function encodePublic(compressedPubKey, { baseAssetName } = {}) {
   const hash160bits = etherUtil.publicToAddress(compressedPubKey, true)
+
+  if (baseAssetName && CHAIN_IDS[baseAssetName]) {
+    return etherUtil.toChecksumAddress('0x' + hash160bits.toString('hex'), CHAIN_IDS[baseAssetName])
+  }
   return etherUtil.toChecksumAddress('0x' + hash160bits.toString('hex'))
 }
 
@@ -31,6 +43,12 @@ export function isValidPrivate(privateKey) {
   return true
 }
 
-export function encodePublicFromPrivate(privateKey) {
+export function encodePublicFromPrivate(privateKey, { baseAssetName } = {}) {
+  if (baseAssetName && CHAIN_IDS[baseAssetName]) {
+    return etherUtil.toChecksumAddress(
+      etherUtil.privateToAddress(privateKey).toString('hex'),
+      CHAIN_IDS[baseAssetName]
+    )
+  }
   return etherUtil.toChecksumAddress(etherUtil.privateToAddress(privateKey).toString('hex'))
 }

package/src/fee-data/index.js

@@ -9,3 +9,4 @@ export { default as avalanchec } from './avalanchec'
 export { default as fantommainnet } from './fantom'
 export { default as harmonymainnet } from './harmony'
 export { default as rootstock } from './rootstock'
+export { default as optimism } from './optimism'

package/src/unsigned-tx/convert-unsigned-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 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
+}

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 convertUnsignedTx } from './convert-unsigned-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 convertUnsignedTx from './convert-unsigned-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 = convertUnsignedTx(unsignedTx)
   const signedTx = tx.sign(privateKey)
 
   // serialize and get txId