From 6cb87ee5c682b90d54a443e8c3cb47ad518fe663 Mon Sep 17 00:00:00 2001 From: "zapaz.eth" Date: Tue, 14 May 2024 18:17:14 +0200 Subject: [PATCH] wip --- common/src/nft/nft-mint.ts | 7 +++- svelte/src/components/Nft/NftMintPopup.svelte | 10 ++--- svelte/turbo.json | 38 ++++++++++++++----- sveltekit/tests/mint.spec.ts | 3 ++ sveltekit/turbo.json | 6 +-- 5 files changed, 45 insertions(+), 19 deletions(-) diff --git a/common/src/nft/nft-mint.ts b/common/src/nft/nft-mint.ts index 2b959b293..4b5f776e8 100644 --- a/common/src/nft/nft-mint.ts +++ b/common/src/nft/nft-mint.ts @@ -72,13 +72,16 @@ const nftMint = async ( minter: string, price: BigNumberish = 0 ): Promise => { - // console.log("nftMint", chainId, address, tokenURI, minter); + console.log("nftMint1", chainId, address, tokenURI, minter, price); if (!(chainId && address && address != ADDRESS_ZERO && tokenURI && minter)) return; const { contract, collection, signer } = await collectionGetContract(chainId, address, true); + console.log("nftMint2", contract, collection, signer); if (!(contract && signer === minter)) return; + console.log("nftMint3"); + let txResp: TransactionResponse | undefined; if (collectionIsOpenMarketable(collection)) { @@ -96,6 +99,7 @@ const nftMint = async ( overrides ); } else if (collectionSupports(collection).get("IOpenNFTsV4")) { + console.log("nftMint4 V4"); txResp = await (contract as OpenNFTsV4)["mint(string)"](tokenURI); } else if (collectionSupports(collection).get("IOpenNFTsV3")) { // console.log("IOpenNFTsV3"); @@ -118,6 +122,7 @@ const nftMint = async ( // txResp = await (contract as IOpenBound).mint(cid); // } explorerTxLog(chainId, txResp); + console.log("nftMint5"); return txResp; }; diff --git a/svelte/src/components/Nft/NftMintPopup.svelte b/svelte/src/components/Nft/NftMintPopup.svelte index c91987256..88e758911 100644 --- a/svelte/src/components/Nft/NftMintPopup.svelte +++ b/svelte/src/components/Nft/NftMintPopup.svelte @@ -122,14 +122,12 @@ }; let collection: CollectionType; - $: chainId && address && signer && handleDefaultAutomarketValues(); + $: chainId && address && handleDefaultAutomarketValues(); const handleDefaultAutomarketValues = async () => { - if (!(chainId && address)) return; - - // console.log("handleDefaultAutomarketValues", address); + console.log("handleDefaultAutomarketValues", chainId, address); collection = await collectionGet(chainId, address); inputPrice = collectionPrice(collection); - // console.log("handleDefaultAutomarketValues", String(inputPrice)); + console.log("handleDefaultAutomarketValues", String(inputPrice)); }; // const pdfToCoverImg = async () => { // TODO PDFJS @@ -240,7 +238,7 @@ }); -{#if src} +{#if src && chainId && address} { await page.locator('input[name="file"]').click(); await page.locator('input[name="file"]').setInputFiles("./tests/assets/klogo.png"); + // await page.pause(); + await page.locator("#mintNft").click(); await page.screenshot({ path: "./test-results/screenshot.png" }); // await page.pause(); await metamask.confirmTransaction(); + // await page.pause(); }); diff --git a/sveltekit/turbo.json b/sveltekit/turbo.json index 09ff8612c..d4bf16ba6 100644 --- a/sveltekit/turbo.json +++ b/sveltekit/turbo.json @@ -6,12 +6,12 @@ "inputs": ["src/**"] }, "dev": { - "dependsOn": ["@kredeum/config#build", "@kredeum/gulp#build"], + "dependsOn": ["@kredeum/config#build", "@kredeum/gulp#build", "@kredeum/skale#build"], "inputs": ["src/**", "../contracts/addresses.json"] }, "build": { - "dependsOn": ["check", "@kredeum/gulp#build", "@kredeum/skale#build"], - "inputs": ["src/**"], + "dependsOn": ["check", "@kredeum/config#build", "@kredeum/gulp#build", "@kredeum/skale#build"], + "inputs": ["src/**", "../contracts/addresses.json"], "outputs": ["web/dapp/index.html", "web/dapp/_app/**.*"] } }