From 6b1abe72e81a1352880d08de074df11f23165765 Mon Sep 17 00:00:00 2001 From: Abrom8 <38963270+Abrom8@users.noreply.github.com> Date: Thu, 21 Mar 2024 11:50:38 +0100 Subject: [PATCH 1/4] fix: add wait to txs --- src/@utils/dispenser.ts | 13 +++++++------ src/@utils/nft.ts | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/@utils/dispenser.ts b/src/@utils/dispenser.ts index e4eec505..f963bc85 100644 --- a/src/@utils/dispenser.ts +++ b/src/@utils/dispenser.ts @@ -9,17 +9,18 @@ export async function setMinterToPublisher( ): Promise { const datatokenInstance = new Datatoken(signer) - const response = await datatokenInstance.removeMinter( + const removeMinterTx = await datatokenInstance.removeMinter( datatokenAddress, accountId, accountId ) + await removeMinterTx.wait() - if (!response) { + if (!removeMinterTx) { setError('Updating DDO failed.') LoggerInstance.error('Failed at cancelMinter') } - return response + return removeMinterTx } export async function setMinterToDispenser( @@ -30,14 +31,14 @@ export async function setMinterToDispenser( ): Promise { const datatokenInstance = new Datatoken(signer) - const response = await datatokenInstance.addMinter( + const addMinterTx = await datatokenInstance.addMinter( datatokenAddress, accountId, accountId ) - if (!response) { + if (!addMinterTx) { setError('Updating DDO failed.') LoggerInstance.error('Failed at makeMinter') } - return response + return addMinterTx } diff --git a/src/@utils/nft.ts b/src/@utils/nft.ts index b5f23b0d..f25db52c 100644 --- a/src/@utils/nft.ts +++ b/src/@utils/nft.ts @@ -213,6 +213,7 @@ export async function setNFTMetadataAndTokenURI( accountId, metadataAndTokenURI ) + await setMetadataAndTokenURITx.wait() return setMetadataAndTokenURITx } From 4096845ef7891710a399491c4e9513fd3ae51965 Mon Sep 17 00:00:00 2001 From: Abrom8 <38963270+Abrom8@users.noreply.github.com> Date: Thu, 21 Mar 2024 12:22:08 +0100 Subject: [PATCH 2/4] fix: replace unresponsive subgraph endpoint --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb73c34e..167f06a8 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "type-check": "tsc --noEmit", "postinstall": "husky install && npm run copy:address", "copy:address": "node scripts/copy-addresses.js", - "codegen:apollo": "apollo client:codegen --endpoint=https://v4.subgraph.goerli.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph --target typescript --tsFileExtension=d.ts --outputFlat src/@types/subgraph/", + "codegen:apollo": "apollo client:codegen --endpoint=https://subgraph.v4.genx.minimal-gaia-x.eu/subgraphs/name/oceanprotocol/ocean-subgraph --target typescript --tsFileExtension=d.ts --outputFlat src/@types/subgraph/", "storybook": "cross-env NODE_ENV=test start-storybook -p 6006 --quiet", "storybook:build": "cross-env NODE_ENV=test build-storybook" }, From 02fa4eb5ba8c699be6e8369f8c87dfe64c5b5e4d Mon Sep 17 00:00:00 2001 From: Abrom8 <38963270+Abrom8@users.noreply.github.com> Date: Fri, 22 Mar 2024 16:23:25 +0100 Subject: [PATCH 3/4] feat: call wait after check if tx is defined --- src/@utils/dispenser.ts | 6 +++++- src/components/Asset/Edit/EditComputeDataset.tsx | 1 + src/components/Asset/Edit/EditMetadata.tsx | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/@utils/dispenser.ts b/src/@utils/dispenser.ts index f963bc85..577f6558 100644 --- a/src/@utils/dispenser.ts +++ b/src/@utils/dispenser.ts @@ -14,12 +14,14 @@ export async function setMinterToPublisher( accountId, accountId ) - await removeMinterTx.wait() if (!removeMinterTx) { setError('Updating DDO failed.') LoggerInstance.error('Failed at cancelMinter') } + + await removeMinterTx.wait() + return removeMinterTx } @@ -40,5 +42,7 @@ export async function setMinterToDispenser( setError('Updating DDO failed.') LoggerInstance.error('Failed at makeMinter') } + await addMinterTx.wait() + return addMinterTx } diff --git a/src/components/Asset/Edit/EditComputeDataset.tsx b/src/components/Asset/Edit/EditComputeDataset.tsx index 6ae66290..63debfd5 100644 --- a/src/components/Asset/Edit/EditComputeDataset.tsx +++ b/src/components/Asset/Edit/EditComputeDataset.tsx @@ -109,6 +109,7 @@ export default function EditComputeDataset({ LoggerInstance.error(content.form.error) return } else { + await setMetadataTx.wait() if (asset.accessDetails.type === 'free') { const tx = await setMinterToDispenser( signer, diff --git a/src/components/Asset/Edit/EditMetadata.tsx b/src/components/Asset/Edit/EditMetadata.tsx index d5588cde..22e860fb 100644 --- a/src/components/Asset/Edit/EditMetadata.tsx +++ b/src/components/Asset/Edit/EditMetadata.tsx @@ -230,6 +230,7 @@ export default function Edit({ LoggerInstance.error(content.form.error) return } else { + await setMetadataTx.wait() if (asset.accessDetails.type === 'free') { const tx = await setMinterToDispenser( signer, From 8f5ebdbccbdf68d9625f94e8c841b862a4ec6030 Mon Sep 17 00:00:00 2001 From: Abrom8 <38963270+Abrom8@users.noreply.github.com> Date: Fri, 22 Mar 2024 16:30:34 +0100 Subject: [PATCH 4/4] refactor: remove early wait call --- src/@utils/nft.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/@utils/nft.ts b/src/@utils/nft.ts index f25db52c..b5f23b0d 100644 --- a/src/@utils/nft.ts +++ b/src/@utils/nft.ts @@ -213,7 +213,6 @@ export async function setNFTMetadataAndTokenURI( accountId, metadataAndTokenURI ) - await setMetadataAndTokenURITx.wait() return setMetadataAndTokenURITx }