diff --git a/api/web3-loans.js b/api/web3-loans.js index ed93d9b..3fdd732 100644 --- a/api/web3-loans.js +++ b/api/web3-loans.js @@ -1,5 +1,6 @@ import Big from 'minterjs-util/src/big.js'; -import {fromErcDecimals, getProviderByChain} from 'minter-js-web3-sdk/src/web3.js'; +import {fromErcDecimals} from 'minter-js-web3-sdk/src/web3-abi.js'; +import {getProviderByChain} from 'minter-js-web3-sdk/src/web3.js'; import {LOANS_BSC_CONTRACT_ADDRESS_LIST} from '~/assets/variables.js'; import loansABI from '~/assets/abi/loans.json'; diff --git a/api/web3-old.js b/api/web3-old.js index 78a77bf..dce4945 100644 --- a/api/web3-old.js +++ b/api/web3-old.js @@ -1,6 +1,7 @@ import {HUB_CHAIN_BY_ID, HUB_DEPOSIT_TX_PURPOSE} from '~/assets/variables.js'; import Utils from 'web3-utils'; -import {fromErcDecimals, getProviderByChain, web3Abi} from 'minter-js-web3-sdk/src/web3.js'; +import {fromErcDecimals} from 'minter-js-web3-sdk/src/web3-abi.js'; +import {getProviderByChain, web3Abi} from 'minter-js-web3-sdk/src/web3.js'; import {getExternalCoinList, getTokenDecimals} from '~/api/web3.js'; /** diff --git a/components/ActionSendWeb3.vue b/components/ActionSendWeb3.vue index afe14d9..7051a83 100644 --- a/components/ActionSendWeb3.vue +++ b/components/ActionSendWeb3.vue @@ -6,7 +6,7 @@ import maxLength from 'vuelidate/src/validators/maxLength'; import minValue from 'vuelidate/src/validators/minValue.js'; import maxValue from 'vuelidate/src/validators/maxValue.js'; import Big from 'minterjs-util/src/big.js'; -import {buildTransferTx, toErcDecimals} from 'minter-js-web3-sdk/src/web3.js'; +import {buildTransferTx, toErcDecimals} from 'minter-js-web3-sdk/src/web3-abi.js'; import {pretty} from '~/assets/utils.js'; import {HUB_NETWORK_SLUG, HUB_CHAIN_DATA} from '~/assets/variables.js'; import useHubOracle from '~/composables/use-hub-oracle.js'; diff --git a/components/HubBuyForm.vue b/components/HubBuyForm.vue index 242cb09..bfedd0a 100644 --- a/components/HubBuyForm.vue +++ b/components/HubBuyForm.vue @@ -8,7 +8,8 @@ import minLength from 'vuelidate/src/validators/minLength.js'; import withParams from 'vuelidate/src/withParams.js'; import autosize from 'v-autosize'; import {TX_TYPE} from 'minterjs-util/src/tx-types.js'; -import {AbiMethodEncoder, toErcDecimals, getHubDestinationAddressBytes, getHubDestinationChainBytes, buildWethUnwrap} from 'minter-js-web3-sdk/src/web3.js'; +import {AbiMethodEncoder, toErcDecimals, buildWethUnwrap} from 'minter-js-web3-sdk/src/web3-abi.js'; +import {getHubDestinationAddressBytes, getHubDestinationChainBytes} from 'minter-js-web3-sdk/src/web3.js'; import {isValidAmount} from '~/assets/utils/validators.js'; import Big from 'minterjs-util/src/big.js'; import initRampPurchase, {fiatRampPurchaseNetwork} from '~/assets/fiat-ramp.js'; diff --git a/components/LoansBorrowForm.vue b/components/LoansBorrowForm.vue index ba28bb0..6ae2fe4 100644 --- a/components/LoansBorrowForm.vue +++ b/components/LoansBorrowForm.vue @@ -6,7 +6,8 @@ import maxLength from 'vuelidate/src/validators/maxLength'; import minValue from 'vuelidate/src/validators/minValue.js'; import maxValue from 'vuelidate/src/validators/maxValue.js'; import Big from 'minterjs-util/src/big.js'; -import {toErcDecimals, AbiMethodEncoder, addApproveTx, buildDepositWithApproveTxList} from 'minter-js-web3-sdk/src/web3.js'; +import {toErcDecimals, AbiMethodEncoder} from 'minter-js-web3-sdk/src/web3-abi.js'; +import {addApproveTx, buildDepositWithApproveTxList} from 'minter-js-web3-sdk/src/web3.js'; import {LOAN_MIN_AMOUNT, LOAN_MAX_AMOUNT, LEND_COIN, getCollateralPrice, getAvailableAmountToBorrow, COLLATERAL_RATE} from '~/api/web3-loans.js'; import {pretty} from '~/assets/utils.js'; import {HUB_NETWORK_SLUG, HUB_CHAIN_DATA, NATIVE_COIN_ADDRESS, LOANS_BSC_CONTRACT_ADDRESS_LIST} from '~/assets/variables.js'; diff --git a/components/LoansLendForm.vue b/components/LoansLendForm.vue index 9c6f770..2625b0d 100644 --- a/components/LoansLendForm.vue +++ b/components/LoansLendForm.vue @@ -6,7 +6,8 @@ import maxLength from 'vuelidate/src/validators/maxLength'; import minValue from 'vuelidate/src/validators/minValue.js'; import maxValue from 'vuelidate/src/validators/maxValue.js'; import Big from 'minterjs-util/src/big.js'; -import {toErcDecimals, AbiMethodEncoder, addApproveTx} from 'minter-js-web3-sdk/src/web3.js'; +import {toErcDecimals, AbiMethodEncoder} from 'minter-js-web3-sdk/src/web3-abi.js'; +import {addApproveTx} from 'minter-js-web3-sdk/src/web3.js'; import {pretty} from '~/assets/utils.js'; import {HUB_NETWORK_SLUG, HUB_CHAIN_DATA, LOANS_BSC_CONTRACT_ADDRESS_LIST} from '~/assets/variables.js'; import loansABI from '~/assets/abi/loans.json'; diff --git a/components/LoansLendWithdrawForm.vue b/components/LoansLendWithdrawForm.vue index d6be1da..de06fd8 100644 --- a/components/LoansLendWithdrawForm.vue +++ b/components/LoansLendWithdrawForm.vue @@ -6,7 +6,8 @@ import maxLength from 'vuelidate/src/validators/maxLength'; import minValue from 'vuelidate/src/validators/minValue.js'; import maxValue from 'vuelidate/src/validators/maxValue.js'; import Big from 'minterjs-util/src/big.js'; -import {AbiMethodEncoder, buildDepositWithApproveTxList} from 'minter-js-web3-sdk/src/web3.js'; +import {AbiMethodEncoder} from 'minter-js-web3-sdk/src/web3-abi.js'; +import {buildDepositWithApproveTxList} from 'minter-js-web3-sdk/src/web3.js'; import {LEND_COIN, getLend} from '~/api/web3-loans.js'; import {pretty} from '~/assets/utils.js'; import {HUB_NETWORK_SLUG, HUB_CHAIN_DATA, NATIVE_COIN_ADDRESS, LOANS_BSC_CONTRACT_ADDRESS_LIST} from '~/assets/variables.js'; diff --git a/components/LoansLiquidateForm.vue b/components/LoansLiquidateForm.vue index 196b15e..ac85dbf 100644 --- a/components/LoansLiquidateForm.vue +++ b/components/LoansLiquidateForm.vue @@ -6,7 +6,8 @@ import maxLength from 'vuelidate/src/validators/maxLength'; import minValue from 'vuelidate/src/validators/minValue.js'; import maxValue from 'vuelidate/src/validators/maxValue.js'; import Big from 'minterjs-util/src/big.js'; -import {AbiMethodEncoder, buildDepositWithApproveTxList} from 'minter-js-web3-sdk/src/web3.js'; +import {AbiMethodEncoder} from 'minter-js-web3-sdk/src/web3.js'; +import {buildDepositWithApproveTxList} from 'minter-js-web3-sdk/src/web3.js'; import {LEND_COIN, getLoan} from '~/api/web3-loans.js'; import {pretty} from '~/assets/utils.js'; import {HUB_NETWORK_SLUG, HUB_CHAIN_DATA, NATIVE_COIN_ADDRESS, LOANS_BSC_CONTRACT_ADDRESS_LIST} from '~/assets/variables.js'; diff --git a/components/LoansManage.vue b/components/LoansManage.vue index 91a0c93..2d7a366 100644 --- a/components/LoansManage.vue +++ b/components/LoansManage.vue @@ -1,6 +1,6 @@