@exodus/ethereum-lib 3.3.39 → 3.3.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "3.3.39",
+  "version": "3.3.40",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "files": [
@@ -20,7 +20,6 @@
     "@exodus/avalanchec-meta": "^1.0.4",
     "@exodus/basemainnet-meta": "^1.0.3",
     "@exodus/basic-utils": "^0.7.0",
-    "@exodus/bip32": "^1.1.2",
     "@exodus/bsc-meta": "^1.1.0",
     "@exodus/cronos-meta": "^1.0.4",
     "@exodus/ethereum-meta": "^1.1.0",
@@ -33,7 +32,7 @@
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fantommainnet-meta": "^1.0.5",
     "@exodus/harmonymainnet-meta": "^1.0.0",
-    "@exodus/key-utils": "^2.0.0",
+    "@exodus/key-utils": "^3.1.0",
     "@exodus/matic-meta": "^1.1.1",
     "@exodus/models": "^8.10.4",
     "@exodus/optimism-meta": "^1.2.6",
@@ -44,5 +43,5 @@
     "ms": "^2.1.1",
     "reselect": "~3.0.1"
   },
-  "gitHead": "636b47ee5c92dedec19d5b6d6d37e126506bb95a"
+  "gitHead": "f70a8210fbdda74fdd23542faf4f8f124c3a6b4f"
 }

package/src/abi/eth-staking-pool.js

@@ -2,6 +2,7 @@
 // https://github.com/everstake/wallet-sdk/blob/037b081755ece3c9a5be162748cec5ea1125acdf/ethereum.js#L3-L7
 
 export default [
+  { inputs: [], stateMutability: 'nonpayable', type: 'constructor' },
   {
     inputs: [{ internalType: 'string', name: 'field', type: 'string' }],
     name: 'InvalidAmount',
@@ -42,6 +43,15 @@ export default [
     name: 'Initialized',
     type: 'event',
   },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: 'address', name: 'previousOwner', type: 'address' },
+      { indexed: true, internalType: 'address', name: 'newOwner', type: 'address' },
+    ],
+    name: 'OwnershipTransferStarted',
+    type: 'event',
+  },
   {
     anonymous: false,
     inputs: [
@@ -63,6 +73,21 @@ export default [
     name: 'PauseWithdraw',
     type: 'event',
   },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: false, internalType: 'bytes', name: 'oldPendingValidatorPubKey', type: 'bytes' },
+      { indexed: false, internalType: 'bytes', name: 'newPendingValidatorPubKey', type: 'bytes' },
+    ],
+    name: 'PendingValidatorReplaced',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [{ indexed: false, internalType: 'uint256', name: '', type: 'uint256' }],
+    name: 'Restake',
+    type: 'event',
+  },
   {
     anonymous: false,
     inputs: [{ indexed: false, internalType: 'uint256', name: 'value', type: 'uint256' }],
@@ -78,7 +103,7 @@ export default [
   {
     anonymous: false,
     inputs: [
-      { indexed: false, internalType: 'address', name: 'staker', type: 'address' },
+      { indexed: true, internalType: 'address', name: 'staker', type: 'address' },
       { indexed: false, internalType: 'uint256', name: 'value', type: 'uint256' },
     ],
     name: 'StakeActivated',
@@ -87,7 +112,7 @@ export default [
   {
     anonymous: false,
     inputs: [
-      { indexed: false, internalType: 'address', name: 'staker', type: 'address' },
+      { indexed: true, internalType: 'address', name: 'staker', type: 'address' },
       { indexed: false, internalType: 'uint256', name: 'value', type: 'uint256' },
       { indexed: false, internalType: 'uint64', name: 'source', type: 'uint64' },
     ],
@@ -112,13 +137,19 @@ export default [
   {
     anonymous: false,
     inputs: [
-      { indexed: false, internalType: 'address', name: 'staker', type: 'address' },
+      { indexed: true, internalType: 'address', name: 'staker', type: 'address' },
       { indexed: false, internalType: 'uint256', name: 'value', type: 'uint256' },
       { indexed: false, internalType: 'uint64', name: 'source', type: 'uint64' },
     ],
     name: 'Unstake',
     type: 'event',
   },
+  {
+    anonymous: false,
+    inputs: [{ indexed: false, internalType: 'bytes', name: 'validator', type: 'bytes' }],
+    name: 'ValidatorMarkedAsExited',
+    type: 'event',
+  },
   {
     inputs: [],
     name: 'BEACON_AMOUNT',
@@ -126,6 +157,13 @@ export default [
     stateMutability: 'view',
     type: 'function',
   },
+  {
+    inputs: [],
+    name: 'acceptOwnership',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
   {
     inputs: [],
     name: 'governor',
@@ -140,6 +178,13 @@ export default [
     stateMutability: 'view',
     type: 'function',
   },
+  {
+    inputs: [],
+    name: 'pendingOwner',
+    outputs: [{ internalType: 'address', name: '', type: 'address' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
   {
     inputs: [],
     name: 'renounceOwnership',
@@ -198,11 +243,11 @@ export default [
   {
     inputs: [
       { internalType: 'uint256', name: 'value', type: 'uint256' },
-      { internalType: 'bool', name: 'isAllowedInterchange', type: 'bool' },
+      { internalType: 'uint16', name: 'allowedInterchangeNum', type: 'uint16' },
       { internalType: 'uint64', name: 'source', type: 'uint64' },
     ],
     name: 'unstake',
-    outputs: [],
+    outputs: [{ internalType: 'uint256', name: 'unstakeFromPendingValue', type: 'uint256' }],
     stateMutability: 'nonpayable',
     type: 'function',
   },
@@ -295,6 +340,20 @@ export default [
     stateMutability: 'nonpayable',
     type: 'function',
   },
+  {
+    inputs: [{ internalType: 'uint256', name: 'index', type: 'uint256' }],
+    name: 'markValidatorAsExited',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'reorderPending',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
   {
     inputs: [{ internalType: 'bool', name: 'pause', type: 'bool' }],
     name: 'pauseStaking',

package/src/key-identifier.js

@@ -1,36 +1,42 @@
 import assert from 'minimalistic-assert'
-import { assertKeyIdentifierParameters } from '@exodus/key-utils'
-import { unhardenDerivationIndex } from '@exodus/bip32/lib/derivation-path'
+import { createGetKeyIdentifier, unhardenDerivationIndex } from '@exodus/key-utils'
 
-function createGetKeyIdentifier({ bip44, allowMetaMaskCompat = false }) {
-  return (partialParams) => {
-    const params = {
-      purpose: 44,
-      chainIndex: 0,
-      accountIndex: 0,
-      addressIndex: 0,
-      ...partialParams,
-    }
-    assertKeyIdentifierParameters(params)
+const createEthereumGetKeyIdentifier = ({
+  bip44,
+  assetName,
+  keyType = 'secp256k1',
+  allowMetaMaskCompat = false,
+} = {}) => (partialParams = {}) => {
+  const params = {
+    purpose: 44,
+    chainIndex: 0,
+    accountIndex: 0,
+    addressIndex: 0,
+    ...partialParams,
+  }
 
-    const { accountIndex, compatibilityMode, addressIndex } = params
-    const unhardenedBip44 = unhardenDerivationIndex(bip44)
-    const isMetaMask = allowMetaMaskCompat && compatibilityMode === 'metamask'
-
-    if (isMetaMask) {
-      assert(addressIndex === 0, 'MetaMask compatibility does not support setting an addressIndex')
-    }
-    // MetaMasks bumps addressIndex instead of accountIndex
-    const pathMetaMask = `m/44'/${unhardenedBip44}'/0'/0/${accountIndex}`
-    const pathExodus = `m/44'/${unhardenedBip44}'/${accountIndex}'/0/${addressIndex}`
-    const derivationPath = isMetaMask ? pathMetaMask : pathExodus
+  const { accountIndex, compatibilityMode, addressIndex } = params
+  const unhardenedBip44 = unhardenDerivationIndex(bip44)
+  const isMetaMask = allowMetaMaskCompat && compatibilityMode === 'metamask'
 
+  if (isMetaMask) {
+    assert(addressIndex === 0, 'MetaMask compatibility does not support setting an addressIndex')
     return {
+      assetName,
       derivationAlgorithm: 'BIP32',
-      derivationPath,
-      keyType: 'secp256k1',
+      derivationPath: `m/44'/${unhardenedBip44}'/0'/0/${accountIndex}`,
+      keyType,
     }
   }
+
+  return createGetKeyIdentifier({
+    bip44,
+    assetName,
+    keyType,
+    validationRules: {
+      allowMultipleAddresses: true,
+    },
+  })(params)
 }
 
-export default createGetKeyIdentifier
+export default createEthereumGetKeyIdentifier

package/src/utils/index.js

@@ -114,38 +114,38 @@ export const isApproveTx = (tx) => tx?.data?.data?.startsWith(APPROVE_METHOD_ID)
 export const isFeePaymentTx = (tx) => tx?.data?.data?.startsWith(FEE_PAYMENT_PREFIX)
 
 const customTokensWithRpcBalance = [
-  'saitama_ethereum_5547ffb6',
-  'shiryoinu_ethereum_ff507c93',
-  'volt_bsc_bea66b91',
-  'volt_ethereum_9e0778ce',
-  'elephant_bsc_e879afb1',
-  'posi_bsc_9a2aa8c5',
   'ampl_ethereum_48428467',
-  'mark_ethereum_0d0c07dd',
+  'babydoge_bsc_ee74eb55',
+  'drb_bsc_8971f1e2',
+  'elephant_bsc_e879afb1',
+  'feg_bsc_48812e49',
+  'feg_ethereum_ef42acf0',
   'floki_bsc_c4112b36',
   'floki_ethereum_4a3891a6',
-  'drb_bsc_8971f1e2',
+  'mark_ethereum_0d0c07dd',
   'move_bsc_4b4012e3',
-  'feg_ethereum_ef42acf0',
-  'feg_bsc_48812e49',
   'opt2_matic_2bb66719',
-  'babydoge_bsc_ee74eb55',
+  'posi_bsc_9a2aa8c5',
+  'saitama_ethereum_5547ffb6',
+  'shiryoinu_ethereum_ff507c93',
+  'volt_bsc_bea66b91',
+  'volt_ethereum_9e0778ce',
+  'wavax_avalanchec_635505b3',
+  'wbnb_bsc_7329a389',
+  'wftm_fantommainnet_7edc4949',
+  'wmatic_matic_424fae45',
 ]
 
 export const isRpcBalanceAsset = (asset) =>
   [
     'bsc',
+    'ethereumarbone',
+    'fantommainnet',
     'matic',
+    'optimism',
     'ousd_ethereum_48fcf72d',
     'steth',
     'weth',
-    'wmatic_matic_424fae45',
-    'wbnb_bsc_7329a389',
-    'wavax_avalanchec_635505b3',
-    'wftm_fantommainnet_7edc4949',
-    'fantommainnet',
-    'ethereumarbone',
-    'optimism',
     ...customTokensWithRpcBalance,
   ].includes(asset.name) || ETHEREUM_LIKE_NO_HISTORY_ASSET_NAMES.includes(asset.baseAsset.name)