mirror of
https://github.com/oceanprotocol/market.git
synced 2024-12-02 05:57:29 +01:00
refactor setting price and fees for assets
This commit is contained in:
parent
1b744760ce
commit
6d544cc0ba
@ -9,7 +9,8 @@ import {
|
|||||||
Datatoken,
|
Datatoken,
|
||||||
ProviderInstance,
|
ProviderInstance,
|
||||||
ComputeAsset,
|
ComputeAsset,
|
||||||
ZERO_ADDRESS
|
ZERO_ADDRESS,
|
||||||
|
ComputeEnvironment
|
||||||
} from '@oceanprotocol/lib'
|
} from '@oceanprotocol/lib'
|
||||||
import { toast } from 'react-toastify'
|
import { toast } from 'react-toastify'
|
||||||
import Price from '@shared/Price'
|
import Price from '@shared/Price'
|
||||||
@ -83,6 +84,8 @@ export default function Compute({
|
|||||||
const [isConsumablePrice, setIsConsumablePrice] = useState(true)
|
const [isConsumablePrice, setIsConsumablePrice] = useState(true)
|
||||||
const [isAlgoConsumablePrice, setIsAlgoConsumablePrice] = useState(true)
|
const [isAlgoConsumablePrice, setIsAlgoConsumablePrice] = useState(true)
|
||||||
const [computeStatusText, setComputeStatusText] = useState('')
|
const [computeStatusText, setComputeStatusText] = useState('')
|
||||||
|
const [computeEnv, setComputeEnv] = useState<ComputeEnvironment>()
|
||||||
|
const [computeValidUntil, setComputeValidUntil] = useState<number>()
|
||||||
const [datasetOrderPriceAndFees, setDatasetOrderPriceAndFees] =
|
const [datasetOrderPriceAndFees, setDatasetOrderPriceAndFees] =
|
||||||
useState<OrderPriceAndFees>()
|
useState<OrderPriceAndFees>()
|
||||||
const [isRequestingDataseOrderPrice, setIsRequestingDataseOrderPrice] =
|
const [isRequestingDataseOrderPrice, setIsRequestingDataseOrderPrice] =
|
||||||
@ -110,28 +113,76 @@ export default function Compute({
|
|||||||
return hasAlgoDt
|
return hasAlgoDt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function initPriceAndFees() {
|
||||||
|
const computeEnv = await getComputeEnviroment(asset)
|
||||||
|
setComputeEnv(computeEnv)
|
||||||
|
const validUntil = getValidUntilTime(
|
||||||
|
computeEnv?.maxJobDuration,
|
||||||
|
asset.services[0].timeout,
|
||||||
|
selectedAlgorithmAsset.services[0].timeout
|
||||||
|
)
|
||||||
|
setComputeValidUntil(validUntil)
|
||||||
|
if (
|
||||||
|
asset?.accessDetails?.addressOrId !== ZERO_ADDRESS ||
|
||||||
|
asset?.accessDetails?.type !== 'free'
|
||||||
|
) {
|
||||||
|
setIsRequestingDataseOrderPrice(true)
|
||||||
|
setComputeStatusText(
|
||||||
|
getComputeFeedback(
|
||||||
|
asset.accessDetails.baseToken?.symbol,
|
||||||
|
asset.accessDetails.datatoken?.symbol,
|
||||||
|
asset.metadata.type
|
||||||
|
)[0]
|
||||||
|
)
|
||||||
|
const datasetPriceAndFees = await getOrderPriceAndFees(
|
||||||
|
asset,
|
||||||
|
accountId,
|
||||||
|
computeEnv?.id,
|
||||||
|
validUntil
|
||||||
|
)
|
||||||
|
if (!datasetPriceAndFees) {
|
||||||
|
setError('Error setting dataset price and fees!')
|
||||||
|
toast.error('Error setting dataset price and fees!')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setDatasetOrderPriceAndFees(datasetPriceAndFees)
|
||||||
|
setIsRequestingDataseOrderPrice(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
selectedAlgorithmAsset?.accessDetails?.addressOrId !== ZERO_ADDRESS ||
|
||||||
|
selectedAlgorithmAsset?.accessDetails?.type !== 'free'
|
||||||
|
) {
|
||||||
|
setIsRequestingAlgoOrderPrice(true)
|
||||||
|
setComputeStatusText(
|
||||||
|
getComputeFeedback(
|
||||||
|
selectedAlgorithmAsset?.accessDetails?.baseToken?.symbol,
|
||||||
|
selectedAlgorithmAsset?.accessDetails?.datatoken?.symbol,
|
||||||
|
selectedAlgorithmAsset?.metadata?.type
|
||||||
|
)[0]
|
||||||
|
)
|
||||||
|
const algorithmOrderPriceAndFees = await getOrderPriceAndFees(
|
||||||
|
selectedAlgorithmAsset,
|
||||||
|
ZERO_ADDRESS,
|
||||||
|
computeEnv?.id,
|
||||||
|
validUntil
|
||||||
|
)
|
||||||
|
if (!algorithmOrderPriceAndFees) {
|
||||||
|
setError('Error setting algorithm price and fees!')
|
||||||
|
toast.error('Error setting algorithm price and fees!')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setAlgoOrderPriceAndFees(algorithmOrderPriceAndFees)
|
||||||
|
setIsRequestingAlgoOrderPrice(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!asset?.accessDetails || !accountId) return
|
if (!asset?.accessDetails || !accountId) return
|
||||||
|
|
||||||
setIsConsumablePrice(asset?.accessDetails?.isPurchasable)
|
setIsConsumablePrice(asset?.accessDetails?.isPurchasable)
|
||||||
setIsOwned(asset?.accessDetails?.isOwned)
|
setIsOwned(asset?.accessDetails?.isOwned)
|
||||||
setValidOrderTx(asset?.accessDetails?.validOrderTx)
|
setValidOrderTx(asset?.accessDetails?.validOrderTx)
|
||||||
|
|
||||||
async function initDatasetPriceAndFees() {
|
|
||||||
if (
|
|
||||||
asset?.accessDetails?.addressOrId === ZERO_ADDRESS ||
|
|
||||||
asset?.accessDetails?.type === 'free'
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
setIsRequestingDataseOrderPrice(true)
|
|
||||||
setComputeStatusText('Calculating price including fees.')
|
|
||||||
const orderPriceAndFees = await getOrderPriceAndFees(asset, accountId)
|
|
||||||
setDatasetOrderPriceAndFees(orderPriceAndFees)
|
|
||||||
setIsRequestingDataseOrderPrice(false)
|
|
||||||
}
|
|
||||||
|
|
||||||
initDatasetPriceAndFees()
|
|
||||||
}, [asset?.accessDetails])
|
}, [asset?.accessDetails])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@ -143,26 +194,9 @@ export default function Compute({
|
|||||||
selectedAlgorithmAsset?.accessDetails?.validOrderTx
|
selectedAlgorithmAsset?.accessDetails?.validOrderTx
|
||||||
)
|
)
|
||||||
|
|
||||||
async function initAlgoPriceAndFees() {
|
|
||||||
if (
|
|
||||||
selectedAlgorithmAsset?.accessDetails?.addressOrId === ZERO_ADDRESS ||
|
|
||||||
selectedAlgorithmAsset?.accessDetails?.type === 'free'
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
setIsRequestingAlgoOrderPrice(true)
|
|
||||||
setComputeStatusText('Calculating price including fees.')
|
|
||||||
const orderPriceAndFees = await getOrderPriceAndFees(
|
|
||||||
selectedAlgorithmAsset,
|
|
||||||
accountId
|
|
||||||
)
|
|
||||||
setAlgoOrderPriceAndFees(orderPriceAndFees)
|
|
||||||
setIsRequestingAlgoOrderPrice(false)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function initSelectedAlgo() {
|
async function initSelectedAlgo() {
|
||||||
const hasAlgoDt = await checkAssetDTBalance(selectedAlgorithmAsset)
|
await checkAssetDTBalance(selectedAlgorithmAsset)
|
||||||
!hasAlgoDt && (await initAlgoPriceAndFees())
|
await initPriceAndFees()
|
||||||
}
|
}
|
||||||
|
|
||||||
initSelectedAlgo()
|
initSelectedAlgo()
|
||||||
@ -215,32 +249,6 @@ export default function Compute({
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const computeEnv = await getComputeEnviroment(asset)
|
|
||||||
const validUntil = getValidUntilTime(
|
|
||||||
computeEnv?.maxJobDuration,
|
|
||||||
asset.services[0].timeout,
|
|
||||||
selectedAlgorithmAsset.services[0].timeout
|
|
||||||
)
|
|
||||||
|
|
||||||
setComputeStatusText(
|
|
||||||
getComputeFeedback(
|
|
||||||
asset.accessDetails.baseToken?.symbol,
|
|
||||||
asset.accessDetails.datatoken?.symbol,
|
|
||||||
asset.metadata.type
|
|
||||||
)[0]
|
|
||||||
)
|
|
||||||
const datasetPriceAndFees = await getOrderPriceAndFees(
|
|
||||||
asset,
|
|
||||||
accountId,
|
|
||||||
computeEnv?.id,
|
|
||||||
validUntil
|
|
||||||
)
|
|
||||||
if (!datasetPriceAndFees) {
|
|
||||||
setError('Error setting dataset price and fees!')
|
|
||||||
toast.error('Error setting dataset price and fees!')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
let datasetOrderTx
|
let datasetOrderTx
|
||||||
if (isOwned) {
|
if (isOwned) {
|
||||||
datasetOrderTx = validOrderTx
|
datasetOrderTx = validOrderTx
|
||||||
@ -266,7 +274,10 @@ export default function Compute({
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
LoggerInstance.log('dataset orderPriceAndFees: ', datasetPriceAndFees)
|
LoggerInstance.log(
|
||||||
|
'dataset orderPriceAndFees: ',
|
||||||
|
datasetOrderPriceAndFees
|
||||||
|
)
|
||||||
setComputeStatusText(
|
setComputeStatusText(
|
||||||
getComputeFeedback(
|
getComputeFeedback(
|
||||||
asset.accessDetails.baseToken?.symbol,
|
asset.accessDetails.baseToken?.symbol,
|
||||||
@ -277,10 +288,10 @@ export default function Compute({
|
|||||||
const orderTx = await order(
|
const orderTx = await order(
|
||||||
web3,
|
web3,
|
||||||
asset,
|
asset,
|
||||||
datasetPriceAndFees,
|
datasetOrderPriceAndFees,
|
||||||
accountId,
|
accountId,
|
||||||
computeEnv?.id,
|
computeEnv?.id,
|
||||||
validUntil,
|
computeValidUntil,
|
||||||
computeEnv?.consumerAddress
|
computeEnv?.consumerAddress
|
||||||
)
|
)
|
||||||
if (!orderTx) {
|
if (!orderTx) {
|
||||||
@ -301,26 +312,6 @@ export default function Compute({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setComputeStatusText(
|
|
||||||
getComputeFeedback(
|
|
||||||
selectedAlgorithmAsset.accessDetails.baseToken?.symbol,
|
|
||||||
selectedAlgorithmAsset.accessDetails.datatoken?.symbol,
|
|
||||||
selectedAlgorithmAsset.metadata.type
|
|
||||||
)[0]
|
|
||||||
)
|
|
||||||
const algorithmOrderPriceAndFees = await getOrderPriceAndFees(
|
|
||||||
selectedAlgorithmAsset,
|
|
||||||
ZERO_ADDRESS,
|
|
||||||
computeEnv?.id,
|
|
||||||
validUntil
|
|
||||||
)
|
|
||||||
|
|
||||||
if (!algorithmOrderPriceAndFees) {
|
|
||||||
setError('Error setting algorithm price and fees!')
|
|
||||||
toast.error('Error setting algorithm price and fees!')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
let algorithmOrderTx
|
let algorithmOrderTx
|
||||||
if (isAlgorithmOwned) {
|
if (isAlgorithmOwned) {
|
||||||
algorithmOrderTx = validAlgorithmOrderTx
|
algorithmOrderTx = validAlgorithmOrderTx
|
||||||
@ -362,10 +353,10 @@ export default function Compute({
|
|||||||
const orderTx = await order(
|
const orderTx = await order(
|
||||||
web3,
|
web3,
|
||||||
selectedAlgorithmAsset,
|
selectedAlgorithmAsset,
|
||||||
algorithmOrderPriceAndFees,
|
algoOrderPriceAndFees,
|
||||||
accountId,
|
accountId,
|
||||||
computeEnv?.id,
|
computeEnv?.id,
|
||||||
validUntil,
|
computeValidUntil,
|
||||||
computeEnv?.consumerAddress
|
computeEnv?.consumerAddress
|
||||||
)
|
)
|
||||||
if (!orderTx) {
|
if (!orderTx) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user