diff --git a/src/components/Publish/index.tsx b/src/components/Publish/index.tsx
index 53cdcdb3e..7035128ba 100644
--- a/src/components/Publish/index.tsx
+++ b/src/components/Publish/index.tsx
@@ -11,7 +11,7 @@ import Actions from './Actions'
import Debug from './Debug'
import Navigation from './Navigation'
import { Steps } from './Steps'
-import { FormPublishData, PublishFeedback } from './_types'
+import { FormPublishData } from './_types'
import { useUserPreferences } from '@context/UserPreferences'
import useNftFactory from '@hooks/contracts/useNftFactory'
import { ProviderInstance, LoggerInstance, DDO } from '@oceanprotocol/lib'
@@ -35,34 +35,34 @@ export default function PublishPage({
const nftFactory = useNftFactory()
const newAbortController = useAbortController()
- const [feedback, setFeedback] = useState
(
- initialPublishFeedback
- )
+ // This `feedback` state is auto-synced into Formik context under `values.feedback`
+ // for use in other components. Syncing defined in ./Steps.tsx child component.
+ const [feedback, setFeedback] = useState(initialPublishFeedback)
+
+ // Collecting output of each publish step, enabling retry of failed steps
+ const [erc721Address, setErc721Address] = useState()
+ const [datatokenAddress, setDatatokenAddress] = useState()
+ const [ddo, setDdo] = useState()
+ const [ddoEncrypted, setDdoEncrypted] = useState()
const [did, setDid] = useState()
- async function handleSubmit(values: FormPublishData) {
- let _erc721Address: string,
- _datatokenAddress: string,
- _ddo: DDO,
- _encryptedDdo: string
+ // --------------------------------------------------
+ // 1. Create NFT & datatokens & create pricing schema
+ // --------------------------------------------------
+ async function create(values: FormPublishData): Promise<{
+ erc721Address: string
+ datatokenAddress: string
+ }> {
+ setFeedback((prevState) => ({
+ ...prevState,
+ '1': {
+ ...prevState['1'],
+ status: 'active',
+ errorMessage: null
+ }
+ }))
- // reset all feedback state
- setFeedback(initialPublishFeedback)
-
- // --------------------------------------------------
- // 1. Create NFT & datatokens & create pricing schema
- // --------------------------------------------------
try {
- setFeedback((prevState) => ({
- ...prevState,
- '1': {
- ...prevState['1'],
- status: 'active',
- txCount: values.pricing.type === 'dynamic' ? 2 : 1,
- description: prevState['1'].description
- }
- }))
-
const config = getOceanConfig(chainId)
LoggerInstance.log('[publish] using config: ', config)
@@ -76,8 +76,7 @@ export default function PublishPage({
)
const isSuccess = Boolean(erc721Address && datatokenAddress && txHash)
- _erc721Address = erc721Address
- _datatokenAddress = datatokenAddress
+ if (!isSuccess) throw new Error('No Token created. Please try again.')
LoggerInstance.log('[publish] createTokensAndPricing tx', txHash)
LoggerInstance.log('[publish] erc721Address', erc721Address)
@@ -87,14 +86,16 @@ export default function PublishPage({
...prevState,
'1': {
...prevState['1'],
- status: isSuccess ? 'success' : 'error',
+ status: 'success',
txHash
}
}))
+
+ return { erc721Address, datatokenAddress }
} catch (error) {
LoggerInstance.error('[publish] error', error.message)
if (error.message.length > 65) {
- error.message = 'No Token created.'
+ error.message = 'No Token created. Please try again.'
}
setFeedback((prevState) => ({
@@ -102,58 +103,65 @@ export default function PublishPage({
'1': {
...prevState['1'],
status: 'error',
- errorMessage: error.message,
- description:
- values.pricing.type === 'dynamic'
- ? prevState['1'].description.replace(
- 'a single transaction',
- 'a single transaction, after an initial approve transaction'
- )
- : prevState['1'].description
+ errorMessage: error.message
}
}))
}
+ }
+
+ // --------------------------------------------------
+ // 2. Construct and encrypt DDO
+ // --------------------------------------------------
+ async function encrypt(
+ values: FormPublishData,
+ erc721Address: string,
+ datatokenAddress: string
+ ): Promise<{ ddo: DDO; ddoEncrypted: string }> {
+ setFeedback((prevState) => ({
+ ...prevState,
+ '2': {
+ ...prevState['2'],
+ status: 'active',
+ errorMessage: null
+ }
+ }))
- // --------------------------------------------------
- // 2. Construct and encrypt DDO
- // --------------------------------------------------
try {
- setFeedback((prevState) => ({
- ...prevState,
- '2': {
- ...prevState['2'],
- status: 'active'
- }
- }))
-
- if (!_datatokenAddress || !_erc721Address)
- throw new Error('No NFT or Datatoken received.')
+ if (!datatokenAddress || !erc721Address)
+ throw new Error('No NFT or Datatoken received. Please try again.')
const ddo = await transformPublishFormToDdo(
values,
- _datatokenAddress,
- _erc721Address
+ datatokenAddress,
+ erc721Address
)
- _ddo = ddo
+ if (!ddo) throw new Error('No DDO received. Please try again.')
+
+ setDdo(ddo)
LoggerInstance.log('[publish] Got new DDO', ddo)
- const encryptedResponse = await ProviderInstance.encrypt(
+ const ddoEncrypted = await ProviderInstance.encrypt(
ddo,
values.services[0].providerUrl.url,
newAbortController()
)
- const encryptedDdo = encryptedResponse
- _encryptedDdo = encryptedDdo
- LoggerInstance.log('[publish] Got encrypted DDO', encryptedDdo)
+
+ if (!ddoEncrypted)
+ throw new Error('No encrypted DDO received. Please try again.')
+
+ setDdoEncrypted(ddoEncrypted)
+ LoggerInstance.log('[publish] Got encrypted DDO', ddoEncrypted)
setFeedback((prevState) => ({
...prevState,
'2': {
...prevState['2'],
- status: encryptedDdo ? 'success' : 'error'
+ status: 'success'
}
}))
+
+ return { ddo, ddoEncrypted }
} catch (error) {
LoggerInstance.error('[publish] error', error.message)
setFeedback((prevState) => ({
@@ -165,43 +173,53 @@ export default function PublishPage({
}
}))
}
+ }
+
+ // --------------------------------------------------
+ // 3. Write DDO into NFT metadata
+ // --------------------------------------------------
+ async function publish(
+ values: FormPublishData,
+ ddo: DDO,
+ ddoEncrypted: string
+ ): Promise<{ did: string }> {
+ setFeedback((prevState) => ({
+ ...prevState,
+ '3': {
+ ...prevState['3'],
+ status: 'active',
+ errorMessage: null
+ }
+ }))
- // --------------------------------------------------
- // 3. Write DDO into NFT metadata
- // --------------------------------------------------
try {
- setFeedback((prevState) => ({
- ...prevState,
- '3': {
- ...prevState['3'],
- status: 'active'
- }
- }))
-
- if (!_ddo || !_encryptedDdo) throw new Error('No DDO received.')
+ if (!ddo || !ddoEncrypted)
+ throw new Error('No DDO received. Please try again.')
const res = await setNFTMetadataAndTokenURI(
- _ddo,
+ ddo,
accountId,
web3,
values.metadata.nft,
newAbortController()
)
+ if (!res?.transactionHash)
+ throw new Error(
+ 'Metadata could not be written into the NFT. Please try again.'
+ )
LoggerInstance.log('[publish] setMetadata result', res)
- const txHash = res.transactionHash
-
setFeedback((prevState) => ({
...prevState,
'3': {
...prevState['3'],
status: res ? 'success' : 'error',
- txHash
+ txHash: res?.transactionHash
}
}))
- setDid(_ddo.id)
+ return { did: ddo.id }
} catch (error) {
LoggerInstance.error('[publish] error', error.message)
setFeedback((prevState) => ({
@@ -215,6 +233,44 @@ export default function PublishPage({
}
}
+ // --------------------------------------------------
+ // Orchestrate publishing
+ // --------------------------------------------------
+ async function handleSubmit(values: FormPublishData) {
+ // Syncing variables with state, enabling retry of failed steps
+ let _erc721Address = erc721Address
+ let _datatokenAddress = datatokenAddress
+ let _ddo = ddo
+ let _ddoEncrypted = ddoEncrypted
+ let _did = did
+
+ if (!_erc721Address || !_datatokenAddress) {
+ const { erc721Address, datatokenAddress } = await create(values)
+ _erc721Address = erc721Address
+ _datatokenAddress = datatokenAddress
+ setErc721Address(erc721Address)
+ setDatatokenAddress(datatokenAddress)
+ }
+
+ if (!_ddo || !_ddoEncrypted) {
+ const { ddo, ddoEncrypted } = await encrypt(
+ values,
+ _erc721Address,
+ _datatokenAddress
+ )
+ _ddo = ddo
+ _ddoEncrypted = ddoEncrypted
+ setDdo(ddo)
+ setDdoEncrypted(ddoEncrypted)
+ }
+
+ if (!_did) {
+ const { did } = await publish(values, _ddo, _ddoEncrypted)
+ _did = did
+ setDid(did)
+ }
+ }
+
return isInPurgatory && purgatoryData ? null : (
- {({ values }) => {
- return (
- <>
- }
- description={content.description}
- />
-
- {debug && }
-
- )
- }}
+ {({ values }) => (
+ <>
+ }
+ description={content.description}
+ />
+
+ {debug && }
+
+ )}
)
}