1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00

merge ordering logic PR and use fixed version till we merge the publish form updates

This commit is contained in:
Bogdan Fazakas 2022-07-22 06:48:58 +03:00
commit c1534f402b
2 changed files with 27 additions and 27 deletions

View File

@ -316,30 +316,6 @@ export default function Compute({
'Data set is not orderable in combination with selected algorithm.'
)
setComputeStatusText(
getComputeFeedback(
asset.accessDetails.baseToken?.symbol,
asset.accessDetails.datatoken?.symbol,
asset.metadata.type
)[
asset.accessDetails?.type === 'fixed'
? 2
: asset.accessDetails?.type === 'dynamic'
? 1
: 3
]
)
const datasetOrderTx = await handleComputeOrder(
web3,
asset,
datasetOrderPriceAndFees,
accountId,
hasDatatoken,
initializedProviderResponse.datasets[0],
computeEnv.consumerAddress
)
if (!datasetOrderTx) throw new Error('Failed to order dataset.')
setComputeStatusText(
getComputeFeedback(
selectedAlgorithmAsset.accessDetails.baseToken?.symbol,
@ -365,6 +341,30 @@ export default function Compute({
)
if (!algorithmOrderTx) throw new Error('Failed to order algorithm.')
setComputeStatusText(
getComputeFeedback(
asset.accessDetails.baseToken?.symbol,
asset.accessDetails.datatoken?.symbol,
asset.metadata.type
)[
asset.accessDetails?.type === 'fixed'
? 2
: asset.accessDetails?.type === 'dynamic'
? 1
: 3
]
)
const datasetOrderTx = await handleComputeOrder(
web3,
asset,
datasetOrderPriceAndFees,
accountId,
hasDatatoken,
initializedProviderResponse.datasets[0],
computeEnv.consumerAddress
)
if (!datasetOrderTx) throw new Error('Failed to order dataset.')
LoggerInstance.log('[compute] Starting compute job.')
const computeAsset: ComputeAsset = {
documentId: asset.id,

View File

@ -102,14 +102,14 @@ export interface MetadataAlgorithmContainer {
export const algorithmContainerPresets: MetadataAlgorithmContainer[] = [
{
image: 'node',
tag: 'latest',
tag: '18.6.0', // TODO: Put this back to latest once merging the PR that fetches the container digest from docker hub via dockerhub-proxy
entrypoint: 'node $ALGO',
checksum:
'sha256:c60726646352202d95de70d9e8393c15f382f8c6074afc5748b7e570ccd5995f' // TODO: how to get? Most likely needs to be fetched from DockerHub.
'sha256:c60726646352202d95de70d9e8393c15f382f8c6074afc5748b7e570ccd5995f'
},
{
image: 'python',
tag: 'latest',
tag: '3.10.5', // TODO: Put this back to latest once merging the PR that fetches the container digest from docker hub via dockerhub-proxy
entrypoint: 'python $ALGO',
checksum:
'sha256:607635763e54907fd75397fedfeb83890e62a0f9b54a1d99d27d748c5d269be4'