Merge pull request #11 from rsksmart/addingFungible

feat : adding full fungible creation, and fixing error on not showing correct errors on responses error

app/api/etch-rune/route.ts

@@ -14,16 +14,7 @@ import {
 export async function POST(request: NextRequest) {
   const data = await request.json()
   try {
-    const {
-      action,
-      name,
-      symbol,
-      premine,
-      amount,
-      cap,
-      divisibility,
-      tapLeafScript,
-    } = data
+    const { action, name, symbol, premine, amount, cap, tapLeafScript } = data
     const deserializedTapLeafScript = tapLeafScript?.map((item: any) => ({
       controlBlock: Buffer.from(item.controlBlock, 'base64'),
       leafVersion: item.leafVersion,
@@ -61,18 +52,14 @@ export async function POST(request: NextRequest) {
           amount,
           cap,
           symbol,
-          divisibility,
           premine,
         })
         return NextResponse.json({ revealTxHash })
       default:
         return NextResponse.json({ error: 'Invalid action' }, { status: 400 })
     }
   } catch (error) {
-    return NextResponse.json(
-      { error: 'Internal Server Error' },
-      { status: 500 }
-    )
+    return NextResponse.json({ error: error }, { status: 500 })
   }
 }
 export async function GET(request: NextRequest) {
@@ -114,9 +101,6 @@ export async function GET(request: NextRequest) {
         return NextResponse.json({ error: 'Invalid action' }, { status: 400 })
     }
   } catch (error) {
-    return NextResponse.json(
-      { error: 'Internal Server Error' },
-      { status: 500 }
-    )
+    return NextResponse.json({ error: error }, { status: 500 })
   }
 }

app/api/transfer-rune/route.ts

@@ -28,10 +28,8 @@ export async function POST(request: NextRequest) {
         return NextResponse.json({ error: 'Invalid action' }, { status: 400 })
     }
   } catch (error) {
-    return NextResponse.json(
-      { error: 'Internal Server Error' },
-      { status: 500 }
-    )
+    console.log('Error on request is :', error)
+    return NextResponse.json({ error: error }, { status: 500 })
   }
 }
 export async function GET(request: NextRequest) {
@@ -63,9 +61,7 @@ export async function GET(request: NextRequest) {
         return NextResponse.json({ error: 'Invalid action' }, { status: 400 })
     }
   } catch (error) {
-    return NextResponse.json(
-      { error: 'Internal Server Error' },
-      { status: 500 }
-    )
+    console.log('Error on request is :', error)
+    return NextResponse.json({ error: error }, { status: 500 })
   }
 }

app/utils/apiRequests.tsx

@@ -1,10 +1,13 @@
+import { toast } from 'react-toastify'
+
 export const getRequest = async (url: string) => {
   try {
     const response = await fetch(url)
     const json = await response.json()
     return json
   } catch (error) {
-    return { error: 'Internal Server Error' }
+    toast.error(`Error on request: ${error}`)
+    return { error: error }
   }
 }
 export const postRequest = async (url: string, data: any) => {
@@ -19,6 +22,7 @@ export const postRequest = async (url: string, data: any) => {
     const json = await response.json()
     return json
   } catch (error) {
-    return { error: 'Internal Server Error' }
+    toast.error(`Error on request: ${error}`)
+    return { error: error }
   }
 }

app/utils/hooks/useRuneERC1155.tsx

@@ -11,10 +11,10 @@ export interface UseRuneERC1155Props {
   name: string
   symbol: string
   receiver: string
+  isNft?: boolean
   premine?: number
   amount?: number
   cap?: number
-  divisibility?: number
 }
 export interface FreezeTxData {
   runeName: string
@@ -71,6 +71,30 @@ export const useRuneERC1155 = () => {
     }
   }
 
+  const mintFungible = async (runeData: UseRuneERC1155Props) => {
+    try {
+      const { uri, name, symbol, receiver, premine, amount, cap } = runeData
+      console.log('runeData in mint fungible is', runeData)
+
+      if (!cap || !premine || !amount) {
+        toast.error('Some values are undefined or null')
+        return
+      }
+      const txResponse = await contract.mintFungible(
+        `${uri} TODO: retrieve and save metadata`,
+        name,
+        symbol,
+        ethers.parseUnits(cap.toString(), 18),
+        ethers.parseUnits(premine.toString(), 18),
+        ethers.parseUnits(amount.toString(), 18),
+        receiver
+      )
+      return txResponse
+    } catch (error: any) {
+      toast.error('Error on minting token')
+    }
+  }
+
   const freezeNonFungible = async (runeName: string) => {
     try {
       setTxFreezeStatus('processing')
@@ -125,6 +149,7 @@ export const useRuneERC1155 = () => {
 
   return {
     mintNonFungible,
+    mintFungible,
     getUserRunes,
     freezeNonFungible,
     runes,

app/utils/schemas/index.ts

@@ -12,12 +12,9 @@ export const formSchema = z.object({
   symbol: z
     .string()
     .length(1, { message: 'Symbol must be a single character.' }),
-  premine: z.number(),
+  premine: z.number().min(0, { message: 'Premine is required.' }),
   amount: z.number().min(0, { message: 'Amount is required.' }),
   cap: z.number().min(0, { message: 'Cap is required.' }),
-  divisibility: z
-    .number()
-    .max(38, { message: 'Divisibility cannot be higher than 38.' }),
   receiver: z
     .string()
     .length(42, { message: 'Address cannot exceed 42 characters.' }),

app/utils/types/index.ts

@@ -4,7 +4,6 @@ export interface FormData {
   premine?: number
   amount?: number
   cap?: number
-  divisibility?: number
   address?: string
 }
 export interface FormDataRuneToBTC {
@@ -16,4 +15,6 @@ export interface FormDataRuneToBTC {
 export interface EtchTabProps {
   setRuneProps: Function
   setCommitTxHash: Function
+  isNft: boolean
+  setIsNft: Function
 }

components/tabs/EtchTab.tsx

@@ -29,6 +29,8 @@ import { useAuth } from '@/app/context/AuthContext'
 export default function EtchTab({
   setRuneProps,
   setCommitTxHash,
+  isNft,
+  setIsNft,
 }: EtchTabProps): JSX.Element {
   const [loading, setLoading] = useState(false)
   const form = useForm<UseRuneERC1155Props>({
@@ -39,18 +41,19 @@ export default function EtchTab({
       premine: 1,
       amount: 1,
       cap: 0,
-      divisibility: 0,
       receiver: '',
     },
   })
   const { address: walletAddress } = useAuth()
 
-  const [isNft, setIsNft] = useState<boolean>(true)
-
   const onSubmit = (data: UseRuneERC1155Props) => {
-    setRuneProps(data)
-    localStorage.setItem('runeData', JSON.stringify({ runeProps: data }))
-    handleEtch(data)
+    const runesPropsData = { ...data, isNft }
+    setRuneProps(runesPropsData)
+    localStorage.setItem(
+      'runeData',
+      JSON.stringify({ runeProps: runesPropsData })
+    )
+    handleEtch(runesPropsData)
   }
 
   useEffect(() => {
@@ -122,13 +125,12 @@ export default function EtchTab({
                   <div className="flex gap-2">
                     <label className="flex relative items-center cursor-pointer">
                       <input
-                        disabled
                         checked={isNft}
                         type="checkbox"
                         className="sr-only"
                         onChange={(e) => setIsNft(Boolean(e.target.checked))}
                       />
-                      <span className="w-11 h-6 bg-card rounded-full border border-input toggle-bg cursor-not-allowed"></span>
+                      <span className="w-11 h-6 bg-card rounded-full border border-input toggle-bg"></span>
                     </label>
                   </div>
                 </FormControl>
@@ -149,7 +151,7 @@ export default function EtchTab({
                 <InputField
                   form={form}
                   name="premine"
-                  tooltip="Premined runes to the rune etcher."
+                  tooltip="Amount of runes minted to the rune creator."
                   placeholder="Enter premine amount"
                   type="number"
                   disabled={isNft}
@@ -159,34 +161,26 @@ export default function EtchTab({
                 <InputField
                   form={form}
                   name="amount"
-                  tooltip="The amount of runes each mint produces."
+                  tooltip="The amount of runes for each mint transaction."
                   placeholder="Enter token amount"
                   type="number"
                   disabled={isNft}
                 />
                 <InputField
                   form={form}
                   name="cap"
-                  tooltip="Total amount of mints."
+                  tooltip="Total amount of mints, without counting premine."
                   placeholder="Enter token cap"
                   type="number"
                   disabled={isNft}
                 />
-                <InputField
-                  form={form}
-                  name="divisibility"
-                  tooltip="The number of subunits in a super unit of runes."
-                  placeholder="Enter token divisibility"
-                  type="number"
-                  disabled={isNft}
-                />
               </div>
               <InputField
                 form={form}
                 name="receiver"
                 tooltip="Enter the Rootstock address where runes will be minted into ERC20s"
                 placeholder="RSK address"
-                disabled={isNft}
+                disabled={true}
               />
               <CardFooter className="px-0 relative z-0 justify-end">
                 <Button

components/tabs/EtchingProgress.tsx

@@ -59,23 +59,32 @@ export default function EtchingProgress({
 
   const [updateStatusInterval, setUpdateStatusInterval] =
     useState<NodeJS.Timeout | null>(null)
-  const { mintNonFungible, isTxConfirmed } = useRuneERC1155()
+  const { mintNonFungible, isTxConfirmed, mintFungible } = useRuneERC1155()
 
-  const { uri, name, symbol, receiver } = runeProps
+  const { uri, name, symbol, receiver, isNft, amount, premine, cap } = runeProps
 
   const executeMinting = useCallback(async () => {
     try {
       if (!name || !symbol || !receiver) return
 
       const newRuneProps: UseRuneERC1155Props = {
-        uri,
+        uri: uri ?? 'TempURI',
         receiver,
         name,
         symbol,
+        premine,
+        amount,
+        cap,
+      }
+      if (isNft) {
+        const { hash } = await mintNonFungible(newRuneProps)
+        localStorage.setItem('mintTxHash', hash)
+        setMintTxHash(hash)
+      } else {
+        const { hash } = await mintFungible(newRuneProps)
+        localStorage.setItem('mintTxHash', hash)
+        setMintTxHash(hash)
       }
-      const { hash } = await mintNonFungible(newRuneProps)
-      localStorage.setItem('mintTxHash', hash)
-      setMintTxHash(hash)
     } catch (error) {
       toast.error('Error minting the rune')
     }
@@ -149,6 +158,7 @@ export default function EtchingProgress({
             commitTxHash: data.commitTxHash,
             scriptP2trAddress: data.scriptP2trAddress,
             tapLeafScript: data.tapLeafScript,
+            isNft: data.isNft,
             revealTxHash: revealTxHash,
           })
         )

components/tabs/index.tsx

@@ -13,14 +13,14 @@ export default function TabsSection() {
     premine: 0,
     amount: 0,
     cap: 0,
-    divisibility: 0,
     receiver: '',
   } as UseRuneERC1155Props)
   const [commitTxHash, setCommitTxHash] = useState<string | null>(null)
   const [revealTxHash, setRevealTxHash] = useState<string | null>(null)
   const [mintTxHash, setMintTxHash] = useState<string | null>(null)
   const [etchedFinished, setEtchedFinished] = useState(false)
   const [mintFinished, setMintFinished] = useState(false)
+  const [isNft, setIsNft] = useState<boolean>(true)
 
   useEffect(() => {
     const mintTxHash = localStorage.getItem('mintTxHash')
@@ -49,6 +49,8 @@ export default function TabsSection() {
           <EtchTab
             setRuneProps={setRunePropsState}
             setCommitTxHash={setCommitTxHash}
+            isNft={isNft}
+            setIsNft={setIsNft}
           />
         ) : (
           <EtchingProgress

components/ui/InputField.tsx

@@ -53,6 +53,11 @@ function InputField({
               type={type}
               id={name}
               disabled={disabled}
+              onChange={(e) =>
+                field.onChange(
+                  type === 'number' ? e.target.valueAsNumber : e.target.value
+                )
+              }
             />
           </FormControl>
           <FormMessage>{form.formState.errors[name]?.message}</FormMessage>

contracts/RuneToken.sol

@@ -47,6 +47,7 @@ contract RuneToken is ERC1155, Ownable {
      * @param maxSupply Maximum supply of the token
      * @param initialSupply Initial supply of the token
      * @param defaultMintAmount Default amount to mint each time
+     * @param receiver Address to receive the minted tokens
      */
     function mintFungible(
         string memory tokenURI,