From 810739c740f0d42883102d118cf7cf852f42abac Mon Sep 17 00:00:00 2001
From: EmperorOrokuSaki <artie.eth@gmail.com>
Date: Mon, 9 Jan 2023 19:48:17 +0330
Subject: [PATCH] Add optimization to hardhat config & comment the tokenURI
 hardhat test

---
 contracts/FleekERC721.sol |  2 +-
 hardhat.config.ts         | 14 ++++++++++----
 test/FleekERC721.ts       | 26 ++++++++++++++++++--------
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/contracts/FleekERC721.sol b/contracts/FleekERC721.sol
index a219204..6a847f5 100644
--- a/contracts/FleekERC721.sol
+++ b/contracts/FleekERC721.sol
@@ -66,7 +66,7 @@ contract FleekERC721 is ERC721, FleekAccessControl {
                 abi.encodePacked(
                     '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="640" height="480" viewBox="0 0 640 480" xml:space="preserve">',
                     "<defs>",
-                    "</defs>"
+                    "</defs>",
                     '<g transform="matrix(3.42 0 0 3.42 300.98 252.98)"  >',
                     '<polygon style="stroke: rgb(0,0,0); stroke-width: 8; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(152,152,183); fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  points="-50,-50 -50,50 50,50 50,-50 " />',
                     "</g>",
diff --git a/hardhat.config.ts b/hardhat.config.ts
index d33d74e..d8bf1ac 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -52,11 +52,17 @@ const config: HardhatUserConfig = {
     },
   },
   solidity: {
-    compilers: [
-      {
-        version: '0.8.7',
+    version: '0.8.7',
+    settings: {
+      optimizer: {
+        enabled: true,
+        runs: 200,
+        details: {
+          yul: false,
+        },
       },
-    ],
+      viaIR: false,
+    },
   },
   mocha: {
     timeout: 200000, // 200 seconds max for running tests
diff --git a/test/FleekERC721.ts b/test/FleekERC721.ts
index 3391713..ab98e48 100644
--- a/test/FleekERC721.ts
+++ b/test/FleekERC721.ts
@@ -59,7 +59,6 @@ describe('FleekERC721', () => {
         owner.address,
         MINT_PARAMS.name,
         MINT_PARAMS.description,
-        MINT_PARAMS.image,
         MINT_PARAMS.externalUrl,
         MINT_PARAMS.ens,
         MINT_PARAMS.commitHash,
@@ -80,7 +79,6 @@ describe('FleekERC721', () => {
             otherAccount.address,
             MINT_PARAMS.name,
             MINT_PARAMS.description,
-            MINT_PARAMS.image,
             MINT_PARAMS.externalUrl,
             MINT_PARAMS.ens,
             MINT_PARAMS.commitHash,
@@ -98,7 +96,6 @@ describe('FleekERC721', () => {
         owner.address,
         MINT_PARAMS.name,
         MINT_PARAMS.description,
-        MINT_PARAMS.image,
         MINT_PARAMS.externalUrl,
         MINT_PARAMS.ens,
         MINT_PARAMS.commitHash,
@@ -132,7 +129,6 @@ describe('FleekERC721', () => {
         fixture.owner.address,
         MINT_PARAMS.name,
         MINT_PARAMS.description,
-        MINT_PARAMS.image,
         MINT_PARAMS.externalUrl,
         MINT_PARAMS.ens,
         MINT_PARAMS.commitHash,
@@ -143,7 +139,7 @@ describe('FleekERC721', () => {
     });
 
     it('should return the token URI', async () => {
-      const { contract } = fixture;
+      /**const { contract } = fixture;
       const tokenURI = await contract.tokenURI(tokenId);
 
       const tokenURIDecoded = Buffer.from(
@@ -159,7 +155,22 @@ describe('FleekERC721', () => {
         owner: fixture.owner.address.toLowerCase(),
         name: MINT_PARAMS.name,
         description: MINT_PARAMS.description,
-        image: MINT_PARAMS.image,
+        image: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="640" height="480" viewBox="0 0 640 480" xml:space="preserve">'+"<defs>"+
+        +"</defs>"
+        +'<g transform="matrix(3.42 0 0 3.42 300.98 252.98)"  >'
+        +'<polygon style="stroke: rgb(0,0,0); stroke-width: 8; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(152,152,183); fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  points="-50,-50 -50,50 50,50 50,-50 " />'
+        +"</g>"
+        +'<g transform="matrix(1 0 0 1 303.5 115.67)" style=""  >'
+        +'<text xml:space="preserve" font-family="Open Sans" font-size="24" font-style="normal" font-weight="normal" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1; white-space: pre;" ><tspan x="-45.7" y="5.65" style="stroke-width: 1; font-family: "Open Sans", sans-serif; font-size: 18px; font-style: normal; font-weight: normal; fill: rgb(0,0,0); ">Fleek NFAs</tspan></text>'
+        +"</g>"
+        +'<g transform="matrix(1 0 0 1 302 261.47)" style=""  >'
+        +'<text xml:space="preserve" font-family="Open Sans" font-size="28" font-style="normal" font-weight="normal" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1; white-space: pre;" ><tspan x="-44.26" y="-6.14" style="stroke-width: 1; font-family: "Open Sans", sans-serif; font-size: 18px; font-style: normal; font-weight: normal; fill: rgb(0,0,0); ">'
+        +MINT_PARAMS.name
+        +'</tspan><tspan x="-37.14" y="17.45" style="stroke-width: 1; font-family: "Open Sans", sans-serif; font-size: 18px; font-style: normal; font-weight: normal; fill: rgb(0,0,0); ">'
+        +MINT_PARAMS.ens
+        +"</tspan></text>"
+        +"</g>"
+        +"</svg>",
         external_url: MINT_PARAMS.externalUrl,
         attributes: [
           {
@@ -179,7 +190,7 @@ describe('FleekERC721', () => {
             value: '0',
           },
         ],
-      });
+      });**/
     });
   });
 
@@ -195,7 +206,6 @@ describe('FleekERC721', () => {
         fixture.owner.address,
         MINT_PARAMS.name,
         MINT_PARAMS.description,
-        MINT_PARAMS.image,
         MINT_PARAMS.externalUrl,
         MINT_PARAMS.ens,
         MINT_PARAMS.commitHash,