fix: circular dependencies in layer-2

bloomwalletio · Aug 29, 2023 · 05fa188 · 05fa188
1 parent d480811
commit 05fa188
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/...r-2/utils/getLayer2MetadataForTransfer.ts → ...2/actions/getLayer2MetadataForTransfer.ts b/...r-2/utils/getLayer2MetadataForTransfer.ts → ...2/actions/getLayer2MetadataForTransfer.ts
@@ -1,6 +1,6 @@
 import type { SendFlowParameters, TokenSendFlowParameters } from '@core/wallet/types'
 import BigInteger from 'big-integer'
-import { estimateGasForLayer1ToLayer2Transaction } from '../actions/estimateGasForLayer1ToLayer2Transaction'
+import { estimateGasForLayer1ToLayer2Transaction } from './estimateGasForLayer1ToLayer2Transaction'
 import { SpecialStream } from '../classes'
 import { ACCOUNTS_CONTRACT, EXTERNALLY_OWNED_ACCOUNT, GAS_LIMIT_MULTIPLIER, TRANSFER_ALLOWANCE } from '../constants'
 import { encodeAddress, encodeAssetAllowance, encodeSmartContractParameters } from '../helpers'

diff --git a/packages/shared/src/lib/core/layer-2/actions/index.ts b/packages/shared/src/lib/core/layer-2/actions/index.ts
@@ -3,4 +3,5 @@ export * from './fetchSelectedAccountLayer2Balance'
 export * from './generateAndStoreEvmAddressForAccount'
 export * from './getGasFeesForLayer1ToLayer2Transaction'
 export * from './getGasPriceInWei'
+export * from './getLayer2MetadataForTransfer'
 export * from './pollLayer2Tokens'
diff --git a/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionData.ts b/packages/shared/src/lib/core/layer-2/utils/buildEvmTransactionData.ts
@@ -1,6 +1,6 @@
-import { getEvmTransactionValueFromAmount } from '@core/layer-2'
 import { Converter } from '@core/utils'
 import Web3 from 'web3'
+import { getEvmTransactionValueFromAmount } from './getEvmTransactionValueFromAmount'
 import { GAS_LIMIT_MULTIPLIER } from '../constants'
 import { EvmTransactionData } from '../types'
 

diff --git a/packages/shared/src/lib/core/layer-2/utils/index.ts b/packages/shared/src/lib/core/layer-2/utils/index.ts
@@ -14,7 +14,6 @@ export * from './getErc20TokenMetadata'
 export * from './getErc20TransferSmartContractData'
 export * from './getEvmTransactionValueFromAmount'
 export * from './getIscpTransferSmartContractData'
-export * from './getLayer2MetadataForTransfer'
 export * from './getLayer2NetworkFromAddress'
 export * from './getSmartContractHexName'
 export * from './parseLayer2Metadata'

diff --git a/packages/shared/src/lib/core/wallet/utils/getOutputParameters.ts b/packages/shared/src/lib/core/wallet/utils/getOutputParameters.ts
@@ -1,5 +1,4 @@
-import { getLayer2MetadataForTransfer } from '@core/layer-2'
-import { getGasFeesForLayer1ToLayer2Transaction } from '@core/layer-2/actions'
+import { getGasFeesForLayer1ToLayer2Transaction, getLayer2MetadataForTransfer } from '@core/layer-2/actions'
 import { ChainConfiguration, ChainType, getActiveNetworkId, getChainConfiguration, isEvmChain } from '@core/network'
 import { getCoinType } from '@core/profile/actions'
 import { Converter, convertDateToUnixTimestamp } from '@core/utils'