From fbb7b3144c7d35c9b647a3709c1cc32e0feeff25 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 11:10:09 +0100
Subject: [PATCH 01/20] Sidebar buttons

---
 src/renderer/components/Sidebar.tsx | 30 +++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 9b41c89..424863c 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -1,10 +1,12 @@
-import { Box, Button, Sidebar as GrommetSidebar, Image, Nav } from 'grommet';
+import { Box, Button, Sidebar as GrommetSidebar, Image, Nav, Text } from 'grommet';
 import { Home, Money, Tools } from 'grommet-icons';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useLocation } from 'react-router-dom';
 import logo from './logo.png';
 
 function Sidebar() {
   const navigate = useNavigate();
+  const location = useLocation();
+  const { pathname } = location;
 
   return (
     <GrommetSidebar
@@ -23,24 +25,36 @@ function Sidebar() {
       <Nav gap="medium" align="start">
         <Button
           onClick={() => navigate('/')}
-          plain
+          primary={pathname === '/'}
           label="Dashboard"
           icon={<Home size="medium" />}
-          hoverIndicator="#F2F6FF"
+          hoverIndicator={pathname === '/' ? '' : '#F2F6FF'}
+          pad={{ vertical: 'small', horizontal: 'medium' }}
+          color={pathname === '/' ? 'brand' : 'white'}
+          fill="horizontal"
+          justify="start"
         />
         <Button
           onClick={() => navigate('/train')}
-          plain
+          primary={pathname === '/train'}
           label="Train"
           icon={<Tools size="medium" />}
-          hoverIndicator="#F2F6FF"
+          hoverIndicator={pathname === '/train' ? '' : '#F2F6FF'}
+          pad={{ vertical: 'small', horizontal: 'medium' }}
+          color={pathname === '/train' ? 'brand' : 'white'}
+          fill="horizontal"
+          justify="start"
         />
         <Button
           onClick={() => navigate('/faucet')}
-          plain
+          primary={pathname === '/faucet'}
           label="Faucet"
           icon={<Money size="medium" />}
-          hoverIndicator="#F2F6FF"
+          hoverIndicator={pathname === '/faucet' ? '' : '#F2F6FF'}
+          pad={{ vertical: 'small', horizontal: 'medium' }}
+          color={pathname === '/faucet' ? 'brand' : 'white'}
+          fill="horizontal"
+          justify="start"
         />
       </Nav>
     </GrommetSidebar>

From 24fc9f9f73f5f8ac47e0088896f246b68c7aac2f Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 11:10:42 +0100
Subject: [PATCH 02/20] Version

---
 package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0458a43..37331ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "client-interface",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.0.3",
+      "version": "0.0.4",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

From b44d953b0834c676cab36044c3cd27b4b920ff2d Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 11:33:02 +0100
Subject: [PATCH 03/20] Step items

---
 src/renderer/components/Task.tsx | 48 +++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/renderer/components/Task.tsx b/src/renderer/components/Task.tsx
index 68abbbc..d3c67c2 100644
--- a/src/renderer/components/Task.tsx
+++ b/src/renderer/components/Task.tsx
@@ -23,6 +23,11 @@ import {
   Share,
   UserFemale,
   Document,
+  Money,
+  Clipboard,
+  Folder,
+  Database,
+  StatusGood
 } from 'grommet-icons';
 import { useContext, useEffect, useState } from 'react';
 import { LogViewer } from '@patternfly/react-log-viewer';
@@ -44,24 +49,43 @@ interface TaskProps {
 type STEP = 'DETAIL' | 'LOCAL_DATA' | 'STAKE' | 'MONITOR' | 'REPORT';
 
 // eslint-disable-next-line react/require-default-props
-function StepItem({ text, disabled }: { text: string; disabled?: boolean }) {
+function StepItem({ text, disabled, isCurrent }: { text: string; disabled?: boolean; isCurrent: boolean }) {
   return (
     <Box
       pad="xsmall"
-      background={disabled ? '#F8FAFB' : '#6C94EC'}
+      background={isCurrent ? '#6C94EC' : '#F8FAFB'}
       round
       direction="row"
       align="center"
       gap="xsmall"
     >
-      <Checkmark size="small" color={disabled ? '#757575' : 'white'} />
-      <Text size="small" color={disabled ? '#757575' : 'white'}>
+      {
+        !disabled
+        ?
+          <StatusGood color={isCurrent ? 'white' : '#757575'} />
+        :
+          getIcon(text)
+      }
+      <Text color={isCurrent ? 'white' : '#757575'}>
         {text}
       </Text>
     </Box>
   );
 }
 
+function getIcon(type: string) {
+  switch (type) {
+    case 'Report':
+      return <Clipboard />;
+    case 'Locate local data':
+      return <Folder />;
+    case 'Monitor':
+      return <Database />;
+    default:
+      return <Money />;
+  }
+}
+
 function Task({ task, goBack }: TaskProps) {
   const navigate = useNavigate();
   const { address } = useAccount();
@@ -697,14 +721,22 @@ function Task({ task, goBack }: TaskProps) {
           </Box>
         </Box>
         <Box background="white" round="small" pad="medium" gap="medium">
-          <Box direction="row" align="center">
-            <StepItem text="Check model detail" />
+          <Box direction="row" align="center" gap="medium">
+            <StepItem 
+              text="Check model detail" 
+              isCurrent={step === 'DETAIL'} 
+            />
             <FormNext />
-            <StepItem text="Locate local data" disabled={step === 'DETAIL'} />
+            <StepItem 
+              text="Locate local data" 
+              disabled={step === 'DETAIL'} 
+              isCurrent={step === 'LOCAL_DATA'} 
+            />
             <FormNext />
             <StepItem
               text="Stake"
               disabled={step === 'DETAIL' || step === 'LOCAL_DATA'}
+              isCurrent={step === 'STAKE'}
             />
             <FormNext />
             <StepItem
@@ -712,6 +744,7 @@ function Task({ task, goBack }: TaskProps) {
               disabled={
                 step === 'DETAIL' || step === 'LOCAL_DATA' || step === 'STAKE'
               }
+              isCurrent={step === 'MONITOR'}
             />
             <FormNext />
             <StepItem
@@ -722,6 +755,7 @@ function Task({ task, goBack }: TaskProps) {
                 step === 'MONITOR' ||
                 step === 'STAKE'
               }
+              isCurrent={step === 'REPORT'}
             />
           </Box>
           {currentStep()}

From 7581f09dd2a6e0f5ae877ec3d05bde2311247215 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 12:57:20 +0100
Subject: [PATCH 04/20] Added schema example in create task

---
 src/renderer/components/CreateTask.tsx | 32 +++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/CreateTask.tsx b/src/renderer/components/CreateTask.tsx
index 0295c0b..e2513f4 100644
--- a/src/renderer/components/CreateTask.tsx
+++ b/src/renderer/components/CreateTask.tsx
@@ -91,7 +91,37 @@ function DataDefinitionForm({
         validateOn="blur"
       >
         <Box height="medium">
-          <TextArea id="schema" name="schema" fill />
+          <TextArea
+            id="schema"
+            name="schema"
+            fill
+            placeholder='{
+  "type": "array",
+  "items": {
+    "type": "object",
+    "properties": {
+      "instruction": {
+        "type": "string"
+      },
+      "context": {
+        "type": "string"
+      },
+      "response": {
+        "type": "string"
+      },
+      "category": {
+        "type": "string"
+      }
+    },
+    "required": [
+      "instruction",
+      "context",
+      "response",
+      "category"
+    ]
+  }
+}'
+          />
         </Box>
       </FormField>
       <FormField

From 8e5b6f66a3898eb82e7a252be8c8499ae77f0d85 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 14:39:41 +0100
Subject: [PATCH 05/20] Fixed file deleteon error

---
 src/renderer/components/CreateTask.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/CreateTask.tsx b/src/renderer/components/CreateTask.tsx
index e2513f4..283743c 100644
--- a/src/renderer/components/CreateTask.tsx
+++ b/src/renderer/components/CreateTask.tsx
@@ -58,7 +58,7 @@ function DataDefinitionForm({
   setErrors(value: any): void;
 }) {
   const handleChange = async (nextValue: any) => {
-    if (nextValue.sampleData) {
+    if (nextValue.sampleData[0]) {
       const fileReader = new FileReader();
       fileReader.readAsText(nextValue.sampleData[0], 'UTF-8');
       fileReader.onload = (e) => {

From 8526b81744323fe7a4afa4cc350426b76ff25d77 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 15:53:33 +0100
Subject: [PATCH 06/20] Data schema preview

---
 src/renderer/components/Task.tsx | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/renderer/components/Task.tsx b/src/renderer/components/Task.tsx
index d3c67c2..4958aea 100644
--- a/src/renderer/components/Task.tsx
+++ b/src/renderer/components/Task.tsx
@@ -40,6 +40,11 @@ import { useNavigate } from 'react-router-dom';
 import { formatUnits } from 'viem';
 import { useTaskData } from 'renderer/hooks/useTaskData';
 import { TaskType } from './types';
+import { create as ipfsHttpClient } from 'ipfs-http-client';
+import ReactJson from 'react-json-view';
+
+
+const ipfsClient = ipfsHttpClient({ url: 'https://ipfs.flock.io/api/v0' });
 
 interface TaskProps {
   task: TaskType;
@@ -99,6 +104,8 @@ function Task({ task, goBack }: TaskProps) {
   const [showCompletedModal, setShowCompletedModal] = useState<boolean>(false);
   const [showPrevParticipants, setShowPrevParticipants] = useState<number>(0);
   const [numberOfParticipants, setNumberOfParticipants] = useState<number>(0);
+  const [taskSchema, setTaskSchema] = useState<string>('');
+
 
   const isRunning = runningTasks?.includes(task.address);
 
@@ -162,6 +169,20 @@ function Task({ task, goBack }: TaskProps) {
     await writeAsyncApprove?.({ args: [task.address, stake * 10 ** 18] });
   };
 
+  const loadTaskSchema = async () => {
+    try {
+      const chunks = [];
+      for await (const chunk of ipfsClient.cat(task.schema)) {
+        chunks.push(chunk);
+      }
+      const content = Buffer.concat(chunks);
+      const contentString = JSON.parse(content.toString());
+      setTaskSchema(contentString);
+    } catch (error) {
+      console.error('Error fetching data from IPFS:', error);
+    }
+  };
+
   useEffect(() => {
     if (isSuccessApprove) {
       writeStake?.({ args: [stake * 10 ** 18] });
@@ -174,6 +195,12 @@ function Task({ task, goBack }: TaskProps) {
     }
   }, [isSuccessStake]);
 
+  useEffect(() => {
+    if (task.schema) {
+      loadTaskSchema();
+    }
+  }, [task.schema])
+
   const nextStep = () => {
     switch (step) {
       case 'LOCAL_DATA':
@@ -211,6 +238,9 @@ function Task({ task, goBack }: TaskProps) {
                 Link your local data for training, if you want to join training
               </Text>
             </Box>
+            <Box>
+              <ReactJson src={JSON.parse(taskSchema)} theme="monokai" />
+            </Box>
             <FileInput
               name="file"
               multiple={false}

From e2e4a9b5c5d51ca3fc789bf8bda7251d7a1f72a9 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 19:45:15 +0100
Subject: [PATCH 07/20] Fix remove file error

---
 src/renderer/components/Task.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/Task.tsx b/src/renderer/components/Task.tsx
index 4958aea..d4fdfe4 100644
--- a/src/renderer/components/Task.tsx
+++ b/src/renderer/components/Task.tsx
@@ -795,7 +795,7 @@ function Task({ task, goBack }: TaskProps) {
                 label={step === 'MONITOR' && !isRunning ? 'Restart' : 'Next'}
                 primary
                 disabled={
-                  (step === 'LOCAL_DATA' && !file.path) ||
+                  (step === 'LOCAL_DATA' && !file?.path) ||
                   isRunning ||
                   (step === 'STAKE' &&
                     Number(dataStakedBalance) < stake * 10 ** 18)

From 693bc0ab622c86657584674a3916dab1888cc90e Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 21:01:08 +0100
Subject: [PATCH 08/20] Disabled textarea resizing

---
 src/renderer/components/CreateTask.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/components/CreateTask.tsx b/src/renderer/components/CreateTask.tsx
index 283743c..697e67b 100644
--- a/src/renderer/components/CreateTask.tsx
+++ b/src/renderer/components/CreateTask.tsx
@@ -95,6 +95,7 @@ function DataDefinitionForm({
             id="schema"
             name="schema"
             fill
+            resize={false}
             placeholder='{
   "type": "array",
   "items": {

From b8d1c9553e94cf8462f1b23ce1c692acee0e0704 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 21:06:02 +0100
Subject: [PATCH 09/20] Cosmetic changes

---
 src/renderer/components/Task.tsx | 43 +++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/renderer/components/Task.tsx b/src/renderer/components/Task.tsx
index d4fdfe4..c24eee9 100644
--- a/src/renderer/components/Task.tsx
+++ b/src/renderer/components/Task.tsx
@@ -39,10 +39,8 @@ import { WalletContext } from 'renderer/context/walletContext';
 import { useNavigate } from 'react-router-dom';
 import { formatUnits } from 'viem';
 import { useTaskData } from 'renderer/hooks/useTaskData';
-import { TaskType } from './types';
 import { create as ipfsHttpClient } from 'ipfs-http-client';
-import ReactJson from 'react-json-view';
-
+import { TaskType } from './types';
 
 const ipfsClient = ipfsHttpClient({ url: 'https://ipfs.flock.io/api/v0' });
 
@@ -53,8 +51,29 @@ interface TaskProps {
 
 type STEP = 'DETAIL' | 'LOCAL_DATA' | 'STAKE' | 'MONITOR' | 'REPORT';
 
+function getIcon(type: string) {
+  switch (type) {
+    case 'Report':
+      return <Clipboard />;
+    case 'Locate local data':
+      return <Folder />;
+    case 'Monitor':
+      return <Database />;
+    default:
+      return <Money />;
+  }
+}
+
 // eslint-disable-next-line react/require-default-props
-function StepItem({ text, disabled, isCurrent }: { text: string; disabled?: boolean; isCurrent: boolean }) {
+function StepItem({
+  text,
+  disabled,
+  isCurrent,
+}: {
+  text: string;
+  disabled?: boolean;
+  isCurrent: boolean;
+}) {
   return (
     <Box
       pad="xsmall"
@@ -64,16 +83,12 @@ function StepItem({ text, disabled, isCurrent }: { text: string; disabled?: bool
       align="center"
       gap="xsmall"
     >
-      {
-        !disabled
-        ?
-          <StatusGood color={isCurrent ? 'white' : '#757575'} />
-        :
-          getIcon(text)
-      }
-      <Text color={isCurrent ? 'white' : '#757575'}>
-        {text}
-      </Text>
+      {!disabled ? (
+        <StatusGood color={isCurrent ? 'white' : '#757575'} />
+      ) : (
+        getIcon(text)
+      )}
+      <Text color={isCurrent ? 'white' : '#757575'}>{text}</Text>
     </Box>
   );
 }

From ebeba48b01632607de47bf03e323764bd818a75c Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 21:06:16 +0100
Subject: [PATCH 10/20] New parsing

---
 src/renderer/components/Task.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/Task.tsx b/src/renderer/components/Task.tsx
index c24eee9..6ade764 100644
--- a/src/renderer/components/Task.tsx
+++ b/src/renderer/components/Task.tsx
@@ -191,7 +191,11 @@ function Task({ task, goBack }: TaskProps) {
         chunks.push(chunk);
       }
       const content = Buffer.concat(chunks);
-      const contentString = JSON.parse(content.toString());
+      const contentString = JSON.stringify(
+        JSON.parse(JSON.parse(content.toString() as string)),
+        null,
+        2
+      );
       setTaskSchema(contentString);
     } catch (error) {
       console.error('Error fetching data from IPFS:', error);

From 2f4608259a2c8e6c5542bf94bff5aece32b0365e Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 21:06:35 +0100
Subject: [PATCH 11/20] Cosmetic change

---
 src/renderer/components/Task.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/Task.tsx b/src/renderer/components/Task.tsx
index 6ade764..aeb791d 100644
--- a/src/renderer/components/Task.tsx
+++ b/src/renderer/components/Task.tsx
@@ -218,7 +218,7 @@ function Task({ task, goBack }: TaskProps) {
     if (task.schema) {
       loadTaskSchema();
     }
-  }, [task.schema])
+  }, [task.schema]);
 
   const nextStep = () => {
     switch (step) {

From cf09cd2e43cd11a56347429243b38cf42600cd42 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 21:07:08 +0100
Subject: [PATCH 12/20] Changed schema display to Text Area

---
 src/renderer/components/Task.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/Task.tsx b/src/renderer/components/Task.tsx
index aeb791d..508f856 100644
--- a/src/renderer/components/Task.tsx
+++ b/src/renderer/components/Task.tsx
@@ -248,17 +248,17 @@ function Task({ task, goBack }: TaskProps) {
     switch (step) {
       case 'LOCAL_DATA':
         return (
-          <Box gap="medium">
+          <Box gap="xsmall">
             <Box>
               <Heading level="3" margin="0">
                 Locate local data
               </Heading>
               <Text size="small">
-                Link your local data for training, if you want to join training
+                Link your local data for training, if you want to join training. View the example data schema below.
               </Text>
             </Box>
-            <Box>
-              <ReactJson src={JSON.parse(taskSchema)} theme="monokai" />
+            <Box overflow="auto" height="medium" margin={{ top: 'small' }}>
+              <TextArea value={taskSchema} fill resize={false} />
             </Box>
             <FileInput
               name="file"

From 21a699bc7a9839c6d83b5b7c0e0fd44be9e4be0f Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 21:09:18 +0100
Subject: [PATCH 13/20] Minor changes

---
 src/renderer/components/Task.tsx | 37 +++++++++++---------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/renderer/components/Task.tsx b/src/renderer/components/Task.tsx
index 508f856..b61861b 100644
--- a/src/renderer/components/Task.tsx
+++ b/src/renderer/components/Task.tsx
@@ -13,6 +13,7 @@ import {
   Stack,
   DataTable,
   DataChart,
+  TextArea,
 } from 'grommet';
 import {
   Alert,
@@ -32,7 +33,7 @@ import {
 import { useContext, useEffect, useState } from 'react';
 import { LogViewer } from '@patternfly/react-log-viewer';
 import { RunnerContext } from 'renderer/context/runnerContext';
-import { useAccount, useContractWrite, useWaitForTransaction, useContractRead } from 'wagmi';
+import { useAccount, useContractWrite, useWaitForTransaction } from 'wagmi';
 import { FLOCK_TASK_ABI } from 'renderer/contracts/flockTask';
 import { FLOCK_ABI, FLOCK_ADDRESS } from 'renderer/contracts/flock';
 import { WalletContext } from 'renderer/context/walletContext';
@@ -93,19 +94,6 @@ function StepItem({
   );
 }
 
-function getIcon(type: string) {
-  switch (type) {
-    case 'Report':
-      return <Clipboard />;
-    case 'Locate local data':
-      return <Folder />;
-    case 'Monitor':
-      return <Database />;
-    default:
-      return <Money />;
-  }
-}
-
 function Task({ task, goBack }: TaskProps) {
   const navigate = useNavigate();
   const { address } = useAccount();
@@ -121,7 +109,6 @@ function Task({ task, goBack }: TaskProps) {
   const [numberOfParticipants, setNumberOfParticipants] = useState<number>(0);
   const [taskSchema, setTaskSchema] = useState<string>('');
 
-
   const isRunning = runningTasks?.includes(task.address);
 
   const {
@@ -769,17 +756,19 @@ function Task({ task, goBack }: TaskProps) {
             </Box>
           </Box>
         </Box>
-        <Box background="white" round="small" pad="medium" gap="medium">
+        <Box
+          background="white"
+          round="small"
+          pad={{ horizontal: 'medium', vertical: 'small' }}
+          gap="small"
+        >
           <Box direction="row" align="center" gap="medium">
-            <StepItem 
-              text="Check model detail" 
-              isCurrent={step === 'DETAIL'} 
-            />
+            <StepItem text="Check model detail" isCurrent={step === 'DETAIL'} />
             <FormNext />
-            <StepItem 
-              text="Locate local data" 
-              disabled={step === 'DETAIL'} 
-              isCurrent={step === 'LOCAL_DATA'} 
+            <StepItem
+              text="Locate local data"
+              disabled={step === 'DETAIL'}
+              isCurrent={step === 'LOCAL_DATA'}
             />
             <FormNext />
             <StepItem

From 200c3f1958208265315016c5e171ffaa172a89fe Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Fri, 25 Aug 2023 21:09:38 +0100
Subject: [PATCH 14/20] Main bin

---
 build/bin/main.bin | Bin 18071817 -> 18071815 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/build/bin/main.bin b/build/bin/main.bin
index 6563a8cdd62856507b0d8436de33c58d7d6aa9d3..d6d97c41c31835bef2b6f0e4f07aba12b8341a40 100755
GIT binary patch
delta 934
zcmW;ARa6vU07T)lu)xx=*xlXT-QC@Rirp=Uqbs6fcL!@Hih*LcVt049V(a~V`0klA
z5#b3o2f}2Li(F-uo809gn>^(uZ~4eqe)3m<0%cc_k|?Q?DY;T8rBW%i(kQLcDZMf%
zqcSP8vM8&vDZ6qgr*bK`@+hzJDZdJ+pbDw5im0fHskln0q)Mr@%BZZ$sk|zvqAIDf
zs;H`}sk&;YrfR9S>Zq>jslFPhp&F^Nny9IoskvIHrCO=A+NiDCsl7U=qdKXxx~OYR
zaI_pw1*03fqX$CJ6TQ$Ieb5*E&>sUZ5Q8unLogJ>FdQQ=5~DC0V-Sk4Sf|E@ggWfj
zaEya69uwfeL_}Z`A~6|LFcndlhUu7rnV5yyn1i{Phxu55g;<2eSc0WkhUHj+l~{$<
zh=vnuuommE9viR`o3I&Muoc^|9WmH}oruLQ?8YAKMI82FKjLu!2XP38aRf(k499T-
zCvgg=aRz5`4hcAq3%H0&xQr{fifg!z8@P#ExQ#owi+i|_2Y84_c#J1_if4F^7kG(R
zc#SuBi+6aB5BP{r_>3?3ibQ<Fcl^Ll{K9Yi!QV)`)e;307ZX>L|DT&#?j{~4HWN=1
dFB5MQ9}`~_KNEkG0FyuyyCvRk4YDN0{R3C6N0tBp

delta 938
zcmW;FRa6vU6h+}RFu>3Q*xlXT-QC@Rirp=UM@K}(?vAk=#XzxJvAerlv1R{0e0$w>
zUaliN-WGu{S>z&DS>+~odB`SDdC6No@|B<bWmkX#6{I9es$@#86iTU7O06_Xt8_}Q
z49ciX%B(EPs%*-x9LlL&%B?)gt9;6@0xGCNDy$+Zs$wdx5-O=uDy=dqt8yx@3aY3|
zs;nxis%omP8mg&Us;xSzt9q)h25P8AYOE$|s%C1g7HX+hYOOYEt9ELy4(g~*>Z~s6
z8XfGE#n<6fFuI{TdLRTn(F?uN2Yt~G{V@OoF$jY(1Vb?l!!ZIQF$$wG2B8RxacXQx
zC_nAiaEya69uwfeL_}Z`A~6|LFcndlhUu7rnV5yyn1i{Phxu55g;<2eSc0WkhUHj+
zl~{$<aAFPCVjb3F12$q4He(C6VjH$&2coePyAXrj*n_>;hgj^#0mR`T4&gA4;3$sa
zI8NXsPT@4p;4IGJJmPTy7jX%faRpa#4cBo4H*pKMaR+yC5BKo^5Ag_(@dQut4A1cb
zFYyYm@dj`44)5^+AMpvF@daP;4GH*;ANYx1_>DjKi+_=Jt0f91E+(!f|2H>txtn;H
h*i1Z4yiB}Jd`x^z{7n2!>?Q#wftEPCHOP_>n+T`tMsffE


From 35e47ae04a213d935d7c98f5de9ff77b3a736bf8 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Mon, 28 Aug 2023 11:20:13 +0100
Subject: [PATCH 15/20] Moved schema getter to the hook

---
 src/renderer/components/Task.tsx  | 43 ++++++-------------------------
 src/renderer/hooks/useTaskData.ts | 32 ++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/src/renderer/components/Task.tsx b/src/renderer/components/Task.tsx
index b61861b..81430e3 100644
--- a/src/renderer/components/Task.tsx
+++ b/src/renderer/components/Task.tsx
@@ -28,7 +28,7 @@ import {
   Clipboard,
   Folder,
   Database,
-  StatusGood
+  StatusGood,
 } from 'grommet-icons';
 import { useContext, useEffect, useState } from 'react';
 import { LogViewer } from '@patternfly/react-log-viewer';
@@ -40,11 +40,8 @@ import { WalletContext } from 'renderer/context/walletContext';
 import { useNavigate } from 'react-router-dom';
 import { formatUnits } from 'viem';
 import { useTaskData } from 'renderer/hooks/useTaskData';
-import { create as ipfsHttpClient } from 'ipfs-http-client';
 import { TaskType } from './types';
 
-const ipfsClient = ipfsHttpClient({ url: 'https://ipfs.flock.io/api/v0' });
-
 interface TaskProps {
   task: TaskType;
   goBack: () => void;
@@ -107,7 +104,6 @@ function Task({ task, goBack }: TaskProps) {
   const [showCompletedModal, setShowCompletedModal] = useState<boolean>(false);
   const [showPrevParticipants, setShowPrevParticipants] = useState<number>(0);
   const [numberOfParticipants, setNumberOfParticipants] = useState<number>(0);
-  const [taskSchema, setTaskSchema] = useState<string>('');
 
   const isRunning = runningTasks?.includes(task.address);
 
@@ -120,6 +116,7 @@ function Task({ task, goBack }: TaskProps) {
     dataCurrentAccuracy,
     accuracies,
     currentNumberOfParticipants,
+    taskSchema,
   } = useTaskData({
     task,
     participantAddress: address,
@@ -171,24 +168,6 @@ function Task({ task, goBack }: TaskProps) {
     await writeAsyncApprove?.({ args: [task.address, stake * 10 ** 18] });
   };
 
-  const loadTaskSchema = async () => {
-    try {
-      const chunks = [];
-      for await (const chunk of ipfsClient.cat(task.schema)) {
-        chunks.push(chunk);
-      }
-      const content = Buffer.concat(chunks);
-      const contentString = JSON.stringify(
-        JSON.parse(JSON.parse(content.toString() as string)),
-        null,
-        2
-      );
-      setTaskSchema(contentString);
-    } catch (error) {
-      console.error('Error fetching data from IPFS:', error);
-    }
-  };
-
   useEffect(() => {
     if (isSuccessApprove) {
       writeStake?.({ args: [stake * 10 ** 18] });
@@ -201,12 +180,6 @@ function Task({ task, goBack }: TaskProps) {
     }
   }, [isSuccessStake]);
 
-  useEffect(() => {
-    if (task.schema) {
-      loadTaskSchema();
-    }
-  }, [task.schema]);
-
   const nextStep = () => {
     switch (step) {
       case 'LOCAL_DATA':
@@ -241,7 +214,8 @@ function Task({ task, goBack }: TaskProps) {
                 Locate local data
               </Heading>
               <Text size="small">
-                Link your local data for training, if you want to join training. View the example data schema below.
+                Link your local data for training, if you want to join training.
+                View the example data schema below.
               </Text>
             </Box>
             <Box overflow="auto" height="medium" margin={{ top: 'small' }}>
@@ -428,7 +402,9 @@ function Task({ task, goBack }: TaskProps) {
             <Heading level="3">Training Complete!</Heading>
             <Box align="start">
               <Text size="medium">FLock Reward: {totalRewardedAmount}</Text>
-              <Text size="medium">Final Accuracy: {Number(dataCurrentAccuracy)} </Text>
+              <Text size="medium">
+                Final Accuracy: {Number(dataCurrentAccuracy)}{' '}
+              </Text>
             </Box>
           </Box>
         </Layer>
@@ -563,10 +539,7 @@ function Task({ task, goBack }: TaskProps) {
                       <Stack anchor="right">
                         {Array.from(
                           {
-                            length: Math.min(
-                              Number(numberOfParticipants),
-                              7
-                            ),
+                            length: Math.min(Number(numberOfParticipants), 7),
                           },
                           (_, i) => (
                             <Box key={i} direction="row">
diff --git a/src/renderer/hooks/useTaskData.ts b/src/renderer/hooks/useTaskData.ts
index 5043888..7ebec3d 100644
--- a/src/renderer/hooks/useTaskData.ts
+++ b/src/renderer/hooks/useTaskData.ts
@@ -4,6 +4,9 @@ import { FLOCK_TASK_ABI } from 'renderer/contracts/flockTask';
 import { useContractRead } from 'wagmi';
 import { readContract } from '@wagmi/core';
 import { formatUnits } from 'ethers';
+import { create as ipfsHttpClient } from 'ipfs-http-client';
+
+const ipfsClient = ipfsHttpClient({ url: 'https://ipfs.flock.io/api/v0' });
 
 export const useTaskData = ({
   task,
@@ -28,6 +31,8 @@ export const useTaskData = ({
     { round: number; accuracy: number }[]
   >([]);
 
+  const [taskSchema, setTaskSchema] = useState<string>('');
+
   const { data: dataCurrentRound } = useContractRead({
     address: task.address as `0x${string}`,
     abi: FLOCK_TASK_ABI,
@@ -65,6 +70,26 @@ export const useTaskData = ({
     watch: true,
   }) as { data: number };
 
+  const loadTaskSchema = async () => {
+    try {
+      const chunks = [];
+      // eslint-disable-next-line no-restricted-syntax
+      for await (const chunk of ipfsClient.cat(task.schema)) {
+        chunks.push(chunk);
+      }
+
+      const content = Buffer.concat(chunks);
+      const contentString = JSON.stringify(
+        JSON.parse(JSON.parse(content.toString() as string)),
+        null,
+        2
+      );
+      setTaskSchema(contentString);
+    } catch (error) {
+      console.error('Error fetching data from IPFS:', error);
+    }
+  };
+
   const isTrainingCompleted =
     dataHasRoundFinished && Number(dataCurrentRound) === task.rounds - 1; // Training client starts from 0
 
@@ -140,12 +165,16 @@ export const useTaskData = ({
     loadAccuracies();
   }, [dataCurrentRound]);
 
+  useEffect(() => {
+    loadTaskSchema();
+  }, [task.schema]);
+
   const finalDataForReport = [];
 
   for (let index = 0; index < participantRewardedAmounts.length; index++) {
     const element = participantRewardedAmounts[index];
     let tokenChangePercentage = '0%'; // Default value for the first element and when previous "token" is zero
-    let currentToken = element;
+    const currentToken = element;
     let prevToken = 0n;
     index > 0
       ? (prevToken = participantRewardedAmounts[index - 1])
@@ -180,6 +209,7 @@ export const useTaskData = ({
     dataCurrentAccuracy,
     accuracies,
     currentNumberOfParticipants,
+    taskSchema,
   };
 };
 

From 7dfb077e04d2604217edeb2b6961144d6715c400 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Mon, 28 Aug 2023 11:42:01 +0100
Subject: [PATCH 16/20] Fix for same keys warning

---
 src/renderer/components/Tasks.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/Tasks.tsx b/src/renderer/components/Tasks.tsx
index c40d830..5251323 100644
--- a/src/renderer/components/Tasks.tsx
+++ b/src/renderer/components/Tasks.tsx
@@ -160,7 +160,7 @@ function Tasks() {
                   header: 'Number of Participants',
                 },
                 {
-                  property: '',
+                  property: 'shortage',
                   header: 'Short of',
                   render: (datum) => (
                     <Text>
@@ -177,7 +177,7 @@ function Tasks() {
                   ),
                 },
                 {
-                  property: '',
+                  property: 'actions',
                   header: 'Actions',
                   render: (datum) => (
                     <Button

From 5f74511331f1e738681308af616ec1e777fbb449 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Tue, 29 Aug 2023 17:16:14 +0100
Subject: [PATCH 17/20] Added pinata

---
 package-lock.json | 299 ++++++++++++++++++++++++++++++++++++++++++++--
 package.json      |   3 +-
 2 files changed, 293 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 37331ff..7916a23 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@patternfly/react-log-viewer": "^4.87.100",
+        "@pinata/sdk": "^2.1.0",
         "@rehooks/local-storage": "^2.4.4",
         "@web3auth/modal": "^6.1.4",
         "@web3auth/openlogin-adapter": "^6.1.4",
@@ -4033,6 +4034,30 @@
       "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.94.6.tgz",
       "integrity": "sha512-tm7C6nat+uKMr1hrapis7hS3rN9cr41tpcCKhx6cod6FLU8KwF2Yt5KUxakhIOCEcE/M/EhXhAw/qejp8w0r7Q=="
     },
+    "node_modules/@pinata/sdk": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@pinata/sdk/-/sdk-2.1.0.tgz",
+      "integrity": "sha512-hkS0tcKtsjf9xhsEBs2Nbey5s+Db7x5rlOH9TaWHBXkJ7IwwOs2xnEDigNaxAHKjYAwcw+m2hzpO5QgOfeF7Zw==",
+      "dependencies": {
+        "axios": "^0.21.1",
+        "form-data": "^2.3.3",
+        "is-ipfs": "^0.6.0",
+        "path": "^0.12.7"
+      }
+    },
+    "node_modules/@pinata/sdk/node_modules/form-data": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -8021,6 +8046,11 @@
         "get-intrinsic": "^1.1.3"
       }
     },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
+    },
     "node_modules/asn1.js": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
@@ -8111,8 +8141,7 @@
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/at-least-node": {
       "version": "1.0.0",
@@ -8169,6 +8198,14 @@
         "node": ">=4"
       }
     },
+    "node_modules/axios": {
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "dependencies": {
+        "follow-redirects": "^1.14.0"
+      }
+    },
     "node_modules/axobject-query": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
@@ -8765,7 +8802,6 @@
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -9210,6 +9246,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/cids": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/cids/-/cids-0.7.5.tgz",
+      "integrity": "sha512-zT7mPeghoWAu+ppn8+BS1tQ5qGmbMfB4AregnQjA/qHY3GC1m1ptI9GkWNlgeu38r7CuRdXB47uY2XgAYt6QVA==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "class-is": "^1.1.0",
+        "multibase": "~0.6.0",
+        "multicodec": "^1.0.0",
+        "multihashes": "~0.4.15"
+      },
+      "engines": {
+        "node": ">=4.0.0",
+        "npm": ">=3.0.0"
+      }
+    },
     "node_modules/cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -9226,6 +9279,11 @@
       "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==",
       "dev": true
     },
+    "node_modules/class-is": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/class-is/-/class-is-1.1.0.tgz",
+      "integrity": "sha512-rhjH9AG1fvabIDoGRVH587413LPjTZgmDF9fOFCbFJQV4yuocX1mHxxvXI4g3cGwbVY9wAYIoKlg1N79frJKQw=="
+    },
     "node_modules/classnames": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
@@ -9416,7 +9474,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -10590,7 +10647,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -10681,6 +10737,15 @@
         "detect-port": "bin/detect-port.js"
       }
     },
+    "node_modules/dezalgo": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+      "dependencies": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
     "node_modules/diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -13200,7 +13265,6 @@
       "version": "1.15.2",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
       "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -13266,6 +13330,19 @@
         "node": ">= 6"
       }
     },
+    "node_modules/formidable": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz",
+      "integrity": "sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==",
+      "dependencies": {
+        "dezalgo": "^1.0.4",
+        "hexoid": "^1.0.0",
+        "once": "^1.4.0"
+      },
+      "funding": {
+        "url": "https://ko-fi.com/tunnckoCore/commissions"
+      }
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -13811,6 +13888,14 @@
         "he": "bin/he"
       }
     },
+    "node_modules/hexoid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
+      "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/hey-listen": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/hey-listen/-/hey-listen-1.0.8.tgz",
@@ -14460,6 +14545,14 @@
       "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
       "dev": true
     },
+    "node_modules/ip-regex": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
+      "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/ipaddr.js": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
@@ -14999,6 +15092,30 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-ip": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz",
+      "integrity": "sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==",
+      "dependencies": {
+        "ip-regex": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-ipfs": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/is-ipfs/-/is-ipfs-0.6.3.tgz",
+      "integrity": "sha512-HyRot1dvLcxImtDqPxAaY1miO6WsiP/z7Yxpg2qpaLWv5UdhAPtLvHJ4kMLM0w8GSl8AFsVF23PHe1LzuWrUlQ==",
+      "dependencies": {
+        "bs58": "^4.0.1",
+        "cids": "~0.7.0",
+        "mafmt": "^7.0.0",
+        "multiaddr": "^7.2.1",
+        "multibase": "~0.6.0",
+        "multihashes": "~0.4.13"
+      }
+    },
     "node_modules/is-lambda": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
@@ -17112,6 +17229,14 @@
         "lz-string": "bin/bin.js"
       }
     },
+    "node_modules/mafmt": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/mafmt/-/mafmt-7.1.0.tgz",
+      "integrity": "sha512-vpeo9S+hepT3k2h5iFxzEHvvR0GPBx9uKaErmnRzYNcaKb03DgOArjEMlgG4a9LcuZZ89a3I8xbeto487n26eA==",
+      "dependencies": {
+        "multiaddr": "^7.3.0"
+      }
+    },
     "node_modules/make-dir": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
@@ -17361,7 +17486,6 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -17370,7 +17494,6 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -17724,6 +17847,104 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
+    "node_modules/multiaddr": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/multiaddr/-/multiaddr-7.5.0.tgz",
+      "integrity": "sha512-GvhHsIGDULh06jyb6ev+VfREH9evJCFIRnh3jUt9iEZ6XDbyoisZRFEI9bMvK/AiR6y66y6P+eoBw9mBYMhMvw==",
+      "deprecated": "This module is deprecated, please upgrade to @multiformats/multiaddr",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "cids": "~0.8.0",
+        "class-is": "^1.1.0",
+        "is-ip": "^3.1.0",
+        "multibase": "^0.7.0",
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/multiaddr/node_modules/cids": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/cids/-/cids-0.8.3.tgz",
+      "integrity": "sha512-yoXTbV3llpm+EBGWKeL9xKtksPE/s6DPoDSY4fn8I8TEW1zehWXPSB0pwAXVDlLaOlrw+sNynj995uD9abmPhA==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dependencies": {
+        "buffer": "^5.6.0",
+        "class-is": "^1.1.0",
+        "multibase": "^1.0.0",
+        "multicodec": "^1.0.1",
+        "multihashes": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0",
+        "npm": ">=3.0.0"
+      }
+    },
+    "node_modules/multiaddr/node_modules/cids/node_modules/multibase": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
+      "integrity": "sha512-KcCxpBVY8fdVKu4dJMAahq4F/2Z/9xqEjIiR7PiMe7LRGeorFn2NLmicN6nLBCqQvft6MG2Lc9X5P0IdyvnxEw==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.5.0"
+      },
+      "engines": {
+        "node": ">=10.0.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/multiaddr/node_modules/multibase": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz",
+      "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.5.0"
+      }
+    },
+    "node_modules/multiaddr/node_modules/multihashes": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-1.0.1.tgz",
+      "integrity": "sha512-S27Tepg4i8atNiFaU5ZOm3+gl3KQlUanLs/jWcBxQHFttgq+5x1OgbQmf2d8axJ/48zYGBd/wT9d723USMFduw==",
+      "dependencies": {
+        "buffer": "^5.6.0",
+        "multibase": "^1.0.1",
+        "varint": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/multiaddr/node_modules/multihashes/node_modules/multibase": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
+      "integrity": "sha512-KcCxpBVY8fdVKu4dJMAahq4F/2Z/9xqEjIiR7PiMe7LRGeorFn2NLmicN6nLBCqQvft6MG2Lc9X5P0IdyvnxEw==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.5.0"
+      },
+      "engines": {
+        "node": ">=10.0.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/multiaddr/node_modules/varint": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.2.tgz",
+      "integrity": "sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow=="
+    },
+    "node_modules/multibase": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.6.1.tgz",
+      "integrity": "sha512-pFfAwyTjbbQgNc3G7D48JkJxWtoJoBMaR4xQUOuB8RnCgRqaYmWNFeJTTvrJ2w51bjLq2zTby6Rqj9TQ9elSUw==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.5.0"
+      }
+    },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
       "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
@@ -17737,11 +17958,51 @@
         "multicast-dns": "cli.js"
       }
     },
+    "node_modules/multicodec": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-1.0.4.tgz",
+      "integrity": "sha512-NDd7FeS3QamVtbgfvu5h7fd1IlbaC4EQ0/pgU4zqE2vdHCmBGsUa0TiM8/TdSeG6BMPC92OOCf8F1ocE/Wkrrg==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dependencies": {
+        "buffer": "^5.6.0",
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/multicodec/node_modules/varint": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.2.tgz",
+      "integrity": "sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow=="
+    },
     "node_modules/multiformats": {
       "version": "9.9.0",
       "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-9.9.0.tgz",
       "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="
     },
+    "node_modules/multihashes": {
+      "version": "0.4.21",
+      "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.21.tgz",
+      "integrity": "sha512-uVSvmeCWf36pU2nB4/1kzYZjsXD9vofZKpgudqkceYY5g2aZZXJ5r9lxuzoRLl1OAp28XljXsEJ/X/85ZsKmKw==",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "multibase": "^0.7.0",
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/multihashes/node_modules/multibase": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz",
+      "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.5.0"
+      }
+    },
+    "node_modules/multihashes/node_modules/varint": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.2.tgz",
+      "integrity": "sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow=="
+    },
     "node_modules/nanoid": {
       "version": "3.3.6",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
@@ -18574,6 +18835,15 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
+      "dependencies": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      }
+    },
     "node_modules/path-browserify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
@@ -18650,6 +18920,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/path/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+    },
+    "node_modules/path/node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
     "node_modules/pbkdf2": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
diff --git a/package.json b/package.json
index 3f621b2..c20819d 100644
--- a/package.json
+++ b/package.json
@@ -98,6 +98,7 @@
   },
   "dependencies": {
     "@patternfly/react-log-viewer": "^4.87.100",
+    "@pinata/sdk": "^2.1.0",
     "@rehooks/local-storage": "^2.4.4",
     "@web3auth/modal": "^6.1.4",
     "@web3auth/openlogin-adapter": "^6.1.4",
@@ -107,8 +108,8 @@
     "electron-log": "^4.4.8",
     "electron-root-path": "^1.1.0",
     "electron-updater": "^5.3.0",
-    "genson-js": "^0.0.8",
     "ethers": "^6.6.7",
+    "genson-js": "^0.0.8",
     "grommet": "^2.32.2",
     "grommet-icons": "^4.11.0",
     "ipfs-http-client": "^60.0.1",

From 049b91645f6813f3dc15b1da1adbae0527fa9e04 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Tue, 29 Aug 2023 17:16:43 +0100
Subject: [PATCH 18/20] Added method to load task schema from pinata

---
 src/renderer/hooks/useTaskData.ts | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/renderer/hooks/useTaskData.ts b/src/renderer/hooks/useTaskData.ts
index 7ebec3d..80479b5 100644
--- a/src/renderer/hooks/useTaskData.ts
+++ b/src/renderer/hooks/useTaskData.ts
@@ -71,22 +71,20 @@ export const useTaskData = ({
   }) as { data: number };
 
   const loadTaskSchema = async () => {
+    const url = `https://flockio.mypinata.cloud/ipfs/${task.schema}`;
+
     try {
-      const chunks = [];
-      // eslint-disable-next-line no-restricted-syntax
-      for await (const chunk of ipfsClient.cat(task.schema)) {
-        chunks.push(chunk);
-      }
-
-      const content = Buffer.concat(chunks);
-      const contentString = JSON.stringify(
-        JSON.parse(JSON.parse(content.toString() as string)),
-        null,
-        2
-      );
+      const response = await fetch(url, {
+        method: 'GET',
+      });
+
+      const data = await response.json();
+      const contentString = JSON.stringify(data, null, 2);
       setTaskSchema(contentString);
     } catch (error) {
-      console.error('Error fetching data from IPFS:', error);
+      console.error('Error fetching data from Pinata:', error);
+      setTaskSchema('Error fetching data from Pinata');
+      throw error;
     }
   };
 

From 05a92d32c2c83b8c5268a05a6d477aa69b9d9958 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Tue, 29 Aug 2023 17:16:57 +0100
Subject: [PATCH 19/20] Added invoke method

---
 src/main/preload.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/preload.ts b/src/main/preload.ts
index 602c311..ae267b1 100644
--- a/src/main/preload.ts
+++ b/src/main/preload.ts
@@ -21,6 +21,9 @@ const electronHandler = {
     once(channel: Channels, func: (...args: unknown[]) => void) {
       ipcRenderer.once(channel, (_event, ...args) => func(...args));
     },
+    uploadToIPFS(channel: Channels, ...args: unknown[]): Promise<string[]> {
+      return ipcRenderer.invoke(channel, ...args);
+    },
   },
 };
 

From b3768347153a75431c099c55a7a7c226296837f9 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Tue, 29 Aug 2023 17:19:07 +0100
Subject: [PATCH 20/20] Added pinata upload to IPFS

---
 src/main/main.ts                       | 126 ++++++++++++++++---------
 src/renderer/components/CreateTask.tsx |  37 +++++---
 2 files changed, 105 insertions(+), 58 deletions(-)

diff --git a/src/main/main.ts b/src/main/main.ts
index fb14e9e..fb7953d 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -14,10 +14,17 @@ import { autoUpdater } from 'electron-updater';
 import log from 'electron-log';
 import { ChildProcessWithoutNullStreams, spawn } from 'child_process';
 import kill from 'tree-kill';
+import Pinata from '@pinata/sdk';
+import fs from 'fs';
 import MenuBuilder from './menu';
 import { resolveHtmlPath } from './util';
 import { execPath } from './binaries';
 
+const pinata = new Pinata(
+  '9db9fffc88c7e281b5b2',
+  '5c761fe42f8267832f70a1f00430d9f3d9006fc9624e5bce43a44b7edd79f624'
+);
+
 class AppUpdater {
   constructor() {
     log.transports.file.level = 'info';
@@ -29,57 +36,86 @@ class AppUpdater {
 let mainWindow: BrowserWindow | null = null;
 let main: ChildProcessWithoutNullStreams;
 
-ipcMain.on('ipc', async (event, arg) => {
-  console.log(`arg: ${arg}`);
-  if (arg[0] === 'join') {
-    main = spawn(
-      execPath,
-      [
-        '--flock-token-address',
-        '0x95c5746A0E7c73b6Af16048d4e79dA294b8b7116',
-        '--task-address',
-        arg[1],
-        '--ipfs',
-        '/dns/ipfs.flock.io/tcp/80/http',
-        '--rpc',
-        'https://polygon-mumbai.g.alchemy.com/v2/2CfDEXaIoLouWbPS1Tw4v9tX5bkKruSa',
-        '--port',
-        '6222',
-        '--private-key',
-        arg[2],
-        '--dataset',
-        arg[3],
-      ],
-      {}
+ipcMain.handle('ipc', async (event, arg) => {
+  if (arg[0] === 'uploadToIPFS') {
+    const { IpfsHash: schemaHash } = await pinata.pinJSONToIPFS(
+      JSON.parse(arg[1])
     );
 
-    main.stdout.on('data', (data) => {
-      console.log(`stdout: ${data}`);
-      event.reply('ipc', [arg[1], data.toString()]);
-    });
+    const fileName = arg[2].split('\\').pop();
+    const fileStream = fs.createReadStream(arg[2]);
+
+    const options = {
+      pinataMetadata: {
+        // @ts-ignore
+        name: fileName,
+      },
+    };
+    const { IpfsHash: fileHash } = await pinata.pinFileToIPFS(
+      fileStream,
+      options
+    );
+    return [schemaHash, fileHash];
+  }
+  return [];
+});
 
-    main.stderr.on('data', (data) => {
-      console.error(`stderr: ${data}`);
-      if (
-        data.toString().includes('insufficient funds for gas * price + value')
-      ) {
+ipcMain.on('ipc', async (event, arg) => {
+  console.log(`arg: ${arg}`);
+  switch (arg[0]) {
+    case 'join':
+      main = spawn(
+        execPath,
+        [
+          '--flock-token-address',
+          '0x95c5746A0E7c73b6Af16048d4e79dA294b8b7116',
+          '--task-address',
+          arg[1],
+          '--ipfs',
+          '/dns/ipfs.flock.io/tcp/80/http',
+          '--rpc',
+          'https://polygon-mumbai.g.alchemy.com/v2/2CfDEXaIoLouWbPS1Tw4v9tX5bkKruSa',
+          '--port',
+          '6222',
+          '--private-key',
+          arg[2],
+          '--dataset',
+          arg[3],
+        ],
+        {}
+      );
+
+      main.stdout.on('data', (data) => {
+        console.log(`stdout: ${data}`);
+        event.reply('ipc', [arg[1], data.toString()]);
+      });
+
+      main.stderr.on('data', (data) => {
+        console.error(`stderr: ${data}`);
+        if (
+          data.toString().includes('insufficient funds for gas * price + value')
+        ) {
+          event.reply('ipc', [
+            arg[1],
+            'insufficient funds for gas * price + value',
+          ]);
+        }
+      });
+
+      main.on('close', (code) => {
+        console.log(`child process exited with code ${code}`);
         event.reply('ipc', [
           arg[1],
-          'insufficient funds for gas * price + value',
+          `client exited with code ${code} (0 is success)`,
         ]);
-      }
-    });
-
-    main.on('close', (code) => {
-      console.log(`child process exited with code ${code}`);
-      event.reply('ipc', [
-        arg[1],
-        `client exited with code ${code} (0 is success)`,
-      ]);
-    });
-  } else if (arg[0] === 'leave') {
-    // @ts-ignore
-    kill(main.pid);
+      });
+      break;
+    case 'leave':
+      // @ts-ignore
+      kill(main.pid);
+      break;
+    default:
+      break;
   }
 });
 
diff --git a/src/renderer/components/CreateTask.tsx b/src/renderer/components/CreateTask.tsx
index 697e67b..ac3815d 100644
--- a/src/renderer/components/CreateTask.tsx
+++ b/src/renderer/components/CreateTask.tsx
@@ -432,21 +432,32 @@ export function CreateTask({
 
   const handleCreate = async () => {
     setIsProcessing(true);
-    const { path: schemaPath } = await ipfsClient.add(
-      JSON.stringify(value.schema, null, 4)
-    );
-
-    const { path: sampleDataPath } = await ipfsClient.add(value.sampleData[0]);
+    const res = await window.electron.ipcRenderer
+      .uploadToIPFS('ipc', [
+        'uploadToIPFS',
+        value.schema,
+        value.sampleData[0].path.toString(),
+      ])
+      .then((result: string[]) => {
+        return result;
+      })
+      .catch((e: any) => {
+        console.error(e);
+      });
 
-    value.sampleData = sampleDataPath;
-    value.schema = schemaPath;
+    value.schema = res ? res[0] : '';
+    value.sampleData = res ? res[1] : '';
 
-    await writeAsyncApprove?.({
-      args: [
-        FLOCK_TASK_MANAGER_ADDRESS as `0x${string}`,
-        value.rewardPool * 10 ** 18,
-      ],
-    });
+    if (res) {
+      await writeAsyncApprove?.({
+        args: [
+          FLOCK_TASK_MANAGER_ADDRESS as `0x${string}`,
+          value.rewardPool * 10 ** 18,
+        ],
+      });
+    } else {
+      setIsProcessing(false);
+    }
   };
 
   useEffect(() => {