@exodus/ethereum-lib 4.8.1 → 4.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "4.8.1",
+  "version": "4.9.0",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "files": [
@@ -60,5 +60,5 @@
     "@exodus/bnbmainnet-meta": "^1.0.0",
     "@exodus/elliptic": "^6.5.4-precomputed"
   },
-  "gitHead": "220c00b21c6bf4d250aea7a40d37ceebb1716979"
+  "gitHead": "9322a03c6b00b6dc765356309b3e8f1e1f27df41"
 }

package/src/account-state/index.js

@@ -1,10 +1,9 @@
 import { AccountState } from '@exodus/models'
 
 import { parseLegacyBalances } from './parse-legacy-balances'
-import getAssetStakingData from './staking-data'
 
 // `assets` are only needed for chains that may need legacy parsing and staking support
-export default function createEthereumLikeAccountState({ asset, assets = {} }) {
+export default function createEthereumLikeAccountState({ asset, extraData = {}, assets = {} }) {
   return class EthereumLikeAccountState extends AccountState {
     static defaults = {
       startblock: 0, // deprecated. It seems not used anymore. Remove when it's safe
@@ -12,7 +11,7 @@ export default function createEthereumLikeAccountState({ asset, assets = {} }) {
       balance: asset.currency.ZERO,
       tokenBalances: {},
       index: 0,
-      ...getAssetStakingData({ assetName: asset.name, assets }),
+      ...extraData,
     }
 
     // legacy -- this should have no effect on Ethereum-like assets that do not have legacy account state

package/src/account-state/staking-data.js

@@ -1,56 +1,13 @@
-const ethStakeAccountState = ({ currency }) => ({
-  isDelegating: false,
-  isUndelegateInProgress: false,
-  canClaimUndelegatedBalance: false,
-  minDelegateAmount: currency.defaultUnit(0.1),
-  delegatedBalance: currency.ZERO,
-  rewardsBalance: currency.ZERO,
-  unclaimedUndelegatedBalance: currency.ZERO,
-  totalRewardsReceived: currency.ZERO,
-  lastStakingTxProcessed: '',
-})
-
-const assetStakingData = {
-  polygon: ({ currency }) => ({
+export const ethStakeAccountState = ({ currency }) => {
+  return {
     isDelegating: false,
-    // Unstaking takes ~3-4 days, after that, user needs to
-    // claim the unstaked amount (initial staked amount)
     isUndelegateInProgress: false,
     canClaimUndelegatedBalance: false,
-    minRewardsToWithdraw: currency.defaultUnit(1),
-    minDelegateAmount: currency.defaultUnit(1),
-    unclaimedUndelegatedBalance: currency.ZERO,
+    minDelegateAmount: currency.defaultUnit(0.1),
     delegatedBalance: currency.ZERO,
     rewardsBalance: currency.ZERO,
-    withdrawable: currency.ZERO,
-    unbondNonce: '0',
-  }),
-  ethereum: ethStakeAccountState,
-  ethereumgoerli: ethStakeAccountState,
-  ethereumholesky: ethStakeAccountState,
-}
-
-const getAssetStakingData = ({ assetName, assets }) => {
-  const stakingAssetsForAsset = {
-    ethereum: ['ethereum', 'polygon'],
-    ethereumgoerli: ['ethereumgoerli'],
-    ethereumholesky: ['ethereumholesky'],
+    unclaimedUndelegatedBalance: currency.ZERO,
+    totalRewardsReceived: currency.ZERO,
+    lastStakingTxProcessed: '',
   }
-
-  const stakingAssetsNames = stakingAssetsForAsset[assetName]
-
-  if (!stakingAssetsNames) return {}
-
-  const stakingData = stakingAssetsNames.reduce((allStakingData, stakeAssetName) => {
-    const { currency } = assets[stakeAssetName]
-    const assetStakeData = assetStakingData[stakeAssetName]({
-      currency,
-    })
-    allStakingData[stakeAssetName] = assetStakeData
-    return allStakingData
-  }, {})
-
-  return { staking: stakingData }
 }
-
-export default getAssetStakingData

package/src/index.js

@@ -12,3 +12,4 @@ export { default as createEthereumLikeAccountState } from './account-state'
 export { default as createContract } from './create-contract'
 export * as feeData from './fee-data'
 export { default as ABI } from './abi'
+export { ethStakeAccountState } from './account-state/staking-data'

package/src/sign-message.js

@@ -81,6 +81,7 @@ export async function signMessageWithSigner({ message, signer }) {
     data: msgHash,
     ecOptions: { canonical: true },
     enc: 'raw',
+    signatureType: 'ecdsa',
   })
 
   return hex0xStringToBuffer(

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

@@ -13,8 +13,8 @@ export async function signUnsignedTxWithSigner(unsignedTx, signer) {
   const ethSigner = async (data) => {
     // temporarily support both function and object
     const sig = await (typeof signer === 'function'
-      ? signer({ data, ecOptions: { canonical: true }, enc: 'raw' })
-      : signer.sign({ data, ecOptions: { canonical: true }, enc: 'raw' }))
+      ? signer({ data, ecOptions: { canonical: true }, enc: 'raw', signatureType: 'ecdsa' })
+      : signer.sign({ data, ecOptions: { canonical: true }, enc: 'raw', signatureType: 'ecdsa' }))
     const signature = new Uint8Array(64)
     signature.set(sig.r.toArrayLike(Uint8Array, 'be', 32), 0)
     signature.set(sig.s.toArrayLike(Uint8Array, 'be', 32), 32)