fix Mint test

Kredeum · May 15, 2024 · 8fe5350 · 8fe5350
1 parent 436e45d
commit 8fe5350
Show file tree

Hide file tree

Showing 17 changed files with 154 additions and 51 deletions.
diff --git a/common/src/apis/api-covalent.ts b/common/src/apis/api-covalent.ts
@@ -25,13 +25,13 @@ const _covalentFetch = async (chainId: number, path: string): Promise<unknown> =
       Accept: "application/json"
     }
   };
-  console.info("_covalentFetch <==", urlPath, "\n", config);
+  // console.log("_covalentFetch <==", urlPath, "\n", config);
 
   const answerCov: FetchResponse = await fetchJson(urlPath, config);
 
   if (answerCov.error) console.error("_covalentFetch ERROR", answerCov.error);
 
-  console.info("_covalentFetch ==>", answerCov?.data);
+  // console.log("_covalentFetch ==>", answerCov?.data);
   return answerCov?.data;
 };
 

diff --git a/common/src/viem/ens-get.ts b/common/src/viem/ens-get.ts
@@ -17,7 +17,7 @@ const ens = (() => {
       console.error("ENS lookupAddress not found");
     }
 
-    console.info("getName", address, "=>", name);
+    // console.log("getName", address, "=>", name);
     return name || address || "";
   };
 
@@ -33,7 +33,7 @@ const ens = (() => {
       console.error("ENS lookupAddress not found");
     }
 
-    console.info("getAvatar", address, "=>", avatar);
+    // console.log("getAvatar", address, "=>", avatar);
     return avatar || "";
   };
 

diff --git a/common/turbo.json b/common/turbo.json
@@ -1,9 +1,18 @@
 {
-  "extends": ["//"],
+  "extends": [
+    "//"
+  ],
   "pipeline": {
     "check": {
-      "dependsOn": ["format", "@kredeum/config#build", "@kredeum/contracts#build"],
-      "inputs": ["src/**", "../contracts/addresses.json"]
+      "dependsOn": [
+        "format",
+        "@kredeum/config#build",
+        "@kredeum/contracts#build"
+      ],
+      "inputs": [
+        "src/**/*.ts",
+        "../contracts/addresses.json"
+      ]
     }
   }
-}
+}
diff --git a/config/src/testnets.handlebars.json b/config/src/testnets.handlebars.json
@@ -4,8 +4,9 @@
     "chainName": "sepolia",
     "rpcUrls": [
       "https://rpc.ankr.com/eth_sepolia/{{ANKR_API_KEY}}",
-      "https://sepolia.infura.io/v3/{{INFURA_API_KEY}}",
-      "https://rpc.sepolia.org"
+      "https://rpc.sepolia.org",
+      "https://ethereum-sepolia-rpc.publicnode.com",
+      "https://sepolia.infura.io/v3/{{INFURA_API_KEY}}"
     ],
     "nativeCurrency": {
       "name": "Ether",

diff --git a/gulp/turbo.json b/gulp/turbo.json
@@ -3,7 +3,7 @@
   "pipeline": {
     "build": {
       "inputs": ["src/**", "gulpfile.js", "package.json"],
-      "outputs": ["web/dapp/favicon.ico", "web/dapp/**/*"]
+      "outputs": ["web/dapp/favicon.ico", "web/dapp/**"]
     }
   }
 }
diff --git a/providers/turbo.json b/providers/turbo.json
@@ -3,7 +3,7 @@
   "pipeline": {
     "check": {
       "dependsOn": ["format"],
-      "inputs": ["src/**"]
+      "inputs": ["src/**/*.ts"]
     }
   }
 }
diff --git a/skale/turbo.json b/skale/turbo.json
@@ -3,7 +3,7 @@
   "pipeline": {
     "check": {
       "dependsOn": ["format"],
-      "inputs": ["src/**"]
+      "inputs": ["src/**/*.ts"]
     }
   }
 }
diff --git a/svelte/src/components/Collection/CollectionSelect.svelte b/svelte/src/components/Collection/CollectionSelect.svelte
@@ -64,7 +64,7 @@
   // const logDefault = () => console.log(`handleChange ${i} ${mintable} ~ collectionDefault`, $collectionDefault);
 
   // Current Collection is already defined, or is defined in url, or is default collection
-  $: $collectionDefault && account && handleChangeAddress();
+  $: $collectionDefault && handleChangeAddress();
   const handleChangeAddress = (): void => {
     // console.log("handleChangeAddress ~ $collectionDefault:", $collectionDefault);
     if (isAddressNotZero(address)) return;
@@ -73,6 +73,7 @@
 
   // STATE CHANGER : SET default Collection
   const _setCollection = (collection: string, mintable_ = mintable): void => {
+    // console.log("<CollectionSelect _setCollection", collection);
     if (!isAddressNotZero(collection)) return;
     address = collection;
     collectionDefaultSetOne(chainId, collection, mintable_, account);

diff --git a/svelte/src/components/Main/Dapp.svelte b/svelte/src/components/Main/Dapp.svelte
@@ -80,7 +80,7 @@
 
     account = $metamaskSignerAddress;
 
-    console.info("<Dapp handleSigner acount:", account, $metamaskSignerAddress);
+    console.info("<Dapp handleSigner", account);
   };
 
   // SET URL HASH on chainId, address or account change
@@ -109,7 +109,7 @@
     if (_refHash.account !== undefined) account = _refHash.account;
     if (_refHash.action !== undefined) action = _refHash.action;
     if (action === "view-all") all = true;
-    console.info("<Dapp onMount account:", account, _refHash.account, all);
+    console.info("<Dapp onMount", account, all);
 
     // SET network
     await setNetwork();

diff --git a/svelte/src/components/Nft/NftMint.svelte b/svelte/src/components/Nft/NftMint.svelte
@@ -67,6 +67,8 @@
   //
 
   export const mint = async (): Promise<void> => {
+    // console.log("<NftMint", chainId, address);
+
     if (!src) return _mintingError(`<NftMint ERROR : no image`);
 
     if (!(chainId && isAddressNotZero(address)))

diff --git a/svelte/src/components/Nft/NftMintPopup.svelte b/svelte/src/components/Nft/NftMintPopup.svelte
@@ -16,7 +16,8 @@
     nftUrl,
     displayEther,
     treasuryFee,
-    getDappUrl
+    getDappUrl,
+    isAddress
   } from "@kredeum/common/src/common/config";
   import { getSupportedImage, getMediaSelection } from "../../helpers/mediaTypes";
   import { defaultAudioCoverImg } from "../../helpers/defaultCoverImage";
@@ -122,14 +123,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
@@ -445,7 +444,14 @@
           <NftProperties bind:properties />
 
           <div class="txtright">
-            <button class="btn btn-default btn-sell" on:click|preventDefault={mint} id="mintNft">Mint NFT</button>
+            <button
+              class="btn btn-default btn-sell"
+              on:click|preventDefault={mint}
+              disabled={!isAddress(address)}
+              id="mintNft"
+            >
+              Mint NFT
+            </button>
           </div>
         {:else if S0_START < minting && minting <= S5_MINTED}
           <div class="media media-photo">

diff --git a/svelte/src/helpers/metamask.ts b/svelte/src/helpers/metamask.ts
@@ -44,7 +44,7 @@ const _handleAccounts = (accounts: Array<string>): void => {
 const metamaskConnect = async (): Promise<void> => {
   if (!_ethereumProvider) return;
 
-  console.info("metamaskConnect");
+  // console.log("metamaskConnect");
 
   try {
     await _ethereumProvider.request!({ method: "eth_requestAccounts" });

diff --git a/svelte/turbo.json b/svelte/turbo.json
@@ -1,18 +1,41 @@
 {
-  "extends": ["//"],
+  "extends": [
+    "//"
+  ],
   "pipeline": {
     "check": {
-      "dependsOn": ["format", "@kredeum/common#check"],
-      "inputs": ["src/**"]
+      "dependsOn": [
+        "format",
+        "@kredeum/common#check"
+      ],
+      "inputs": [
+        "src/**/*.ts",
+        "src/**/*.svelte"
+      ]
     },
     "dev": {
-      "dependsOn": ["@kredeum/config#build", "@kredeum/gulp#build"],
-      "inputs": ["src/**", "../contracts/addresses.json"]
+      "dependsOn": [
+        "@kredeum/config#build",
+        "@kredeum/gulp#build"
+      ],
+      "inputs": [
+        "src/**/*.ts",
+        "src/**/*.svelte",
+        "../contracts/addresses.json"
+      ]
     },
     "build": {
-      "dependsOn": ["check", "@kredeum/gulp#build"],
-      "inputs": ["src/**"],
-      "outputs": ["web/dapp/assets/js/*"]
+      "dependsOn": [
+        "check",
+        "@kredeum/gulp#build"
+      ],
+      "inputs": [
+        "src/**/*.ts",
+        "src/**/*.svelte"
+      ],
+      "outputs": [
+        "web/dapp/assets/js/*"
+      ]
     }
   }
-}
+}
diff --git a/sveltekit/playwright.config.ts b/sveltekit/playwright.config.ts
@@ -15,6 +15,7 @@ const config: PlaywrightTestConfig = {
       use: { ...devices["Desktop Chrome"] }
     }
   ],
+  timeout: 60000,
   testDir: "tests",
   testMatch: /(.+\.)?(test|spec)\.[jt]s/
 };

diff --git a/sveltekit/tests/mint.spec.ts b/sveltekit/tests/mint.spec.ts
@@ -16,8 +16,10 @@ test.only("mint one NFT", async ({ page }) => {
   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();
 });
diff --git a/sveltekit/turbo.json b/sveltekit/turbo.json
@@ -1,18 +1,54 @@
 {
-  "extends": ["//"],
+  "extends": [
+    "//"
+  ],
   "pipeline": {
     "check": {
-      "dependsOn": ["format", "@kredeum/svelte#check"],
-      "inputs": ["src/**"]
+      "dependsOn": [
+        "format",
+        "@kredeum/svelte#check"
+      ],
+      "inputs": [
+        "src/**/*.ts",
+        "src/**/*.svelte"
+      ]
     },
     "dev": {
-      "dependsOn": ["@kredeum/config#build", "@kredeum/gulp#build"],
-      "inputs": ["src/**", "../contracts/addresses.json"]
+      "dependsOn": [
+        "@kredeum/config#build",
+        "@kredeum/gulp#build",
+        "@kredeum/skale#build"
+      ],
+      "inputs": [
+        "src/**/*.ts",
+        "src/**/*.svelte",
+        "../contracts/addresses.json"
+      ]
     },
     "build": {
-      "dependsOn": ["check", "@kredeum/gulp#build", "@kredeum/skale#build"],
-      "inputs": ["src/**"],
-      "outputs": ["web/dapp/index.html", "web/dapp/_app/**.*"]
+      "dependsOn": [
+        "check",
+        "@kredeum/config#build",
+        "@kredeum/gulp#build",
+        "@kredeum/skale#build"
+      ],
+      "inputs": [
+        "src/**/*.ts",
+        "src/**/*.svelte",
+        "../contracts/addresses.json"
+      ],
+      "outputs": [
+        "web/dapp/index.html",
+        "web/dapp/_app/**"
+      ]
+    },
+    "test": {
+      "dependsOn": [
+        "build"
+      ],
+      "inputs": [
+        "tests/**/*.ts"
+      ]
     }
   }
-}
+}
diff --git a/wordpress/turbo.json b/wordpress/turbo.json
@@ -4,21 +4,43 @@
   ],
   "pipeline": {
     "plusinstall": {
-      "outputs": ["vendor/**"],
+      "outputs": [
+        "vendor/**"
+      ],
       "outputMode": "new-only"
     },
     "format": {
-      "dependsOn": ["plusinstall"],
-      "inputs": ["plugins/kredeum-nfts/**/*"]
+      "dependsOn": [
+        "plusinstall"
+      ],
+      "inputs": [
+        "plugins/kredeum-nfts/**"
+      ]
     },
     "check": {
-      "dependsOn": ["format"],
-      "inputs": ["plugins/kredeum-nfts/**/*"]
+      "dependsOn": [
+        "format"
+      ],
+      "inputs": [
+        "plugins/kredeum-nfts/**"
+      ]
     },
     "build": {
-      "dependsOn": ["check", "@kredeum/svelte#build"],
-      "inputs": ["plugins/kredeum-nfts/**/*", "readme.handlebars.txt", "kredeum-nfts.handlebars.php", "!plugins/kredeum-nfts/readme.txt", "!plugins/kredeum-nfts/kredeum-nfts.php"],
-      "outputs": ["plugins/kredeum-nfts/readme.txt", "plugins/kredeum-nfts/kredeum-nfts.php"]
+      "dependsOn": [
+        "check",
+        "@kredeum/svelte#build"
+      ],
+      "inputs": [
+        "plugins/kredeum-nfts/**",
+        "readme.handlebars.txt",
+        "kredeum-nfts.handlebars.php",
+        "!plugins/kredeum-nfts/readme.txt",
+        "!plugins/kredeum-nfts/kredeum-nfts.php"
+      ],
+      "outputs": [
+        "plugins/kredeum-nfts/readme.txt",
+        "plugins/kredeum-nfts/kredeum-nfts.php"
+      ]
     }
   }
 }