@trustless-work/blocks 1.0.0 → 1.0.2

package/templates/escrows/single-release/resolve-dispute/shared/useResolveDispute.ts

@@ -12,6 +12,8 @@ import {
 } from "@/components/tw-blocks/handle-errors/handle";
 import { useWalletContext } from "@/components/tw-blocks/wallet-kit/WalletProvider";
 
+type DistributionInput = { address: string; amount: string | number };
+
 export function useResolveDispute() {
   const { resolveDispute } = useEscrowsMutations();
   const { selectedEscrow, updateEscrow } = useEscrowContext();
@@ -20,38 +22,98 @@ export function useResolveDispute() {
   const form = useForm<ResolveDisputeValues>({
     resolver: zodResolver(resolveDisputeSchema),
     defaultValues: {
-      approverFunds: 0,
-      receiverFunds: 0,
+      distributions: [
+        { address: "", amount: "" },
+        { address: "", amount: "" },
+      ],
     },
     mode: "onChange",
   });
 
+  const distributions = form.watch("distributions") as DistributionInput[];
+
   const [isSubmitting, setIsSubmitting] = React.useState(false);
 
+  const allowedAmount = React.useMemo(() => {
+    return Number(selectedEscrow?.amount || 0);
+  }, [selectedEscrow]);
+
+  const distributedSum = React.useMemo(() => {
+    return (distributions || []).reduce((acc, d) => {
+      const n = Number(d?.amount ?? 0);
+      return acc + (isNaN(n) ? 0 : n);
+    }, 0);
+  }, [distributions]);
+
+  const isExactMatch = React.useMemo(() => {
+    return Number(allowedAmount) === Number(distributedSum);
+  }, [allowedAmount, distributedSum]);
+
+  const difference = React.useMemo(() => {
+    return Math.abs(Number(allowedAmount) - Number(distributedSum));
+  }, [allowedAmount, distributedSum]);
+
+  const handleDistributionAddressChange = (index: number, value: string) => {
+    const updated = [...distributions];
+    updated[index] = { ...updated[index], address: value };
+    form.setValue("distributions", updated);
+  };
+
+  const handleDistributionAmountChange = (
+    index: number,
+    e: React.ChangeEvent<HTMLInputElement>
+  ) => {
+    let rawValue = e.target.value;
+    rawValue = rawValue.replace(/[^0-9.]/g, "");
+    if (rawValue.split(".").length > 2) {
+      rawValue = rawValue.slice(0, -1);
+    }
+    if (rawValue.includes(".")) {
+      const parts = rawValue.split(".");
+      if (parts[1] && parts[1].length > 2) {
+        rawValue = parts[0] + "." + parts[1].slice(0, 2);
+      }
+    }
+    const updated = [...distributions];
+    updated[index] = { ...updated[index], amount: rawValue };
+    form.setValue("distributions", updated);
+  };
+
+  const handleAddDistribution = () => {
+    const updated = [...distributions, { address: "", amount: "" }];
+    form.setValue("distributions", updated);
+  };
+
+  const handleRemoveDistribution = (index: number) => {
+    if (distributions.length <= 2) return;
+    const updated = distributions.filter((_, i) => i !== index);
+    form.setValue("distributions", updated);
+  };
+
+  const isAnyDistributionEmpty = React.useMemo(() => {
+    if (!distributions.length) return true;
+    const last = distributions[distributions.length - 1];
+    return (last.address || "").trim() === "" || (last.amount ?? "") === "";
+  }, [distributions]);
+
   const handleSubmit = form.handleSubmit(async (payload) => {
     try {
       setIsSubmitting(true);
 
-      /**
-       * Create the final payload for the resolve dispute mutation
-       *
-       * @param payload - The payload from the form
-       * @returns The final payload for the resolve dispute mutation
-       */
+      if (!isExactMatch) {
+        toast.error("The total distributions must equal the escrow amount");
+        return;
+      }
+
       const finalPayload: SingleReleaseResolveDisputePayload = {
         contractId: selectedEscrow?.contractId || "",
         disputeResolver: walletAddress || "",
-        approverFunds: Number(payload.approverFunds),
-        receiverFunds: Number(payload.receiverFunds),
+        distributions: payload.distributions.map((d) => ({
+          address: d.address,
+          amount: Number(d.amount || 0),
+        })) as [{ address: string; amount: number }],
       };
 
-      /**
-       * Call the resolve dispute mutation
-       *
-       * @param payload - The final payload for the resolve dispute mutation
-       * @param type - The type of the escrow
-       * @param address - The address of the escrow
-       */
       await resolveDispute.mutateAsync({
         payload: finalPayload,
         type: "single-release",
@@ -60,6 +122,11 @@ export function useResolveDispute() {
 
       toast.success("Dispute resolved successfully");
 
+      const sumDistributed = payload.distributions.reduce((acc, d) => {
+        const n = Number(d.amount || 0);
+        return acc + (isNaN(n) ? 0 : n);
+      }, 0);
+
       updateEscrow({
         ...selectedEscrow,
         flags: {
@@ -67,10 +134,7 @@ export function useResolveDispute() {
           disputed: false,
           resolved: true,
         },
-        balance:
-          (selectedEscrow?.balance || 0) -
-            (Number(payload.approverFunds) + Number(payload.receiverFunds)) ||
-          0,
+        balance: (selectedEscrow?.balance || 0) - sumDistributed || 0,
       });
     } catch (error) {
       toast.error(handleError(error as ErrorResponse).message);
@@ -80,5 +144,19 @@ export function useResolveDispute() {
     }
   });
 
-  return { form, handleSubmit, isSubmitting };
+  return {
+    form,
+    handleSubmit,
+    isSubmitting,
+    distributions,
+    handleAddDistribution,
+    handleRemoveDistribution,
+    handleDistributionAddressChange,
+    handleDistributionAmountChange,
+    isAnyDistributionEmpty,
+    allowedAmount,
+    distributedSum,
+    isExactMatch,
+    difference,
+  };
 }

package/templates/escrows/single-release/update-escrow/shared/schema.ts

@@ -8,7 +8,6 @@ export const useUpdateEscrowSchema = () => {
         address: z.string().min(1, {
           message: "Trustline address is required.",
         }),
-        decimals: z.number().default(10000000),
       }),
       roles: z.object({
         approver: z

package/templates/escrows/single-release/update-escrow/shared/useUpdateEscrow.ts

@@ -44,7 +44,6 @@ export function useUpdateEscrow() {
         : "",
       trustline: {
         address: selectedEscrow?.trustline?.address || "",
-        decimals: 10000000,
       },
       roles: {
         approver: selectedEscrow?.roles?.approver || "",
@@ -82,7 +81,6 @@ export function useUpdateEscrow() {
         : "",
       trustline: {
         address: selectedEscrow?.trustline?.address || "",
-        decimals: 10000000,
       },
       roles: {
         approver: selectedEscrow?.roles?.approver || "",
@@ -171,7 +169,6 @@ export function useUpdateEscrow() {
             : undefined,
           trustline: {
             address: payload.trustline.address,
-            decimals: 10000000,
           },
           roles: payload.roles,
           milestones: payload.milestones,
@@ -202,7 +199,6 @@ export function useUpdateEscrow() {
             (selectedEscrow.trustline?.address as string) ||
             "",
           address: finalPayload.escrow.trustline.address,
-          decimals: finalPayload.escrow.trustline.decimals,
         },
       };
 

package/templates/tanstack/useEscrowsMutations.ts

@@ -23,6 +23,8 @@ import {
   SingleReleaseReleaseFundsPayload,
   MultiReleaseResolveDisputePayload,
   SingleReleaseResolveDisputePayload,
+  WithdrawRemainingFundsPayload,
+  useWithdrawRemainingFunds,
 } from "@trustless-work/escrow";
 import { signTransaction } from "../wallet-kit/wallet-kit";
 
@@ -49,6 +51,7 @@ export const useEscrowsMutations = () => {
   const { startDispute } = useStartDispute();
   const { releaseFunds } = useReleaseFunds();
   const { resolveDispute } = useResolveDispute();
+  const { withdrawRemainingFunds } = useWithdrawRemainingFunds();
 
   /**
    * Deploy Escrow
@@ -434,6 +437,55 @@ export const useEscrowsMutations = () => {
     },
   });
 
+  /**
+   * Withdraw Remaining Funds
+   */
+  const withdrawRemainingFundsMutation = useMutation({
+    mutationFn: async ({
+      payload,
+      type,
+      address,
+    }: {
+      payload: WithdrawRemainingFundsPayload;
+      type: EscrowType;
+      address: string;
+    }) => {
+      const { unsignedTransaction } = await withdrawRemainingFunds(
+        payload,
+        type
+      );
+
+      if (!unsignedTransaction) {
+        throw new Error(
+          "Unsigned transaction is missing from withdrawRemainingFunds response."
+        );
+      }
+
+      const signedTxXdr = await signTransaction({
+        unsignedTransaction,
+        address,
+      });
+
+      if (!signedTxXdr) {
+        throw new Error("Signed transaction is missing.");
+      }
+
+      const response = await sendTransaction(signedTxXdr);
+
+      if (response.status !== "SUCCESS") {
+        throw new Error("Transaction failed to send");
+      }
+
+      return response;
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["escrows"] });
+    },
+    onError: (error) => {
+      console.error(error);
+    },
+  });
+
   return {
     deployEscrow: deployEscrowMutation,
     updateEscrow: updateEscrowMutation,
@@ -443,5 +495,6 @@ export const useEscrowsMutations = () => {
     startDispute: startDisputeMutation,
     releaseFunds: releaseFundsMutation,
     resolveDispute: resolveDisputeMutation,
+    withdrawRemainingFunds: withdrawRemainingFundsMutation,
   };
 };

package/templates/tanstack/useGetMultipleEscrowBalances.ts

@@ -0,0 +1,41 @@
+import { useQuery } from "@tanstack/react-query";
+import {
+  GetEscrowBalancesResponse,
+  GetBalanceParams,
+} from "@trustless-work/escrow/types";
+import { useGetMultipleEscrowBalances } from "@trustless-work/escrow/hooks";
+
+/**
+ * Use the query to get the escrows balances
+ *
+ * @param params - The parameters for the query
+ * @returns The query result
+ */
+export const useGetMultipleEscrowBalancesQuery = ({
+  addresses,
+  enabled = true,
+}: GetBalanceParams & { enabled?: boolean }) => {
+  const { getMultipleBalances } = useGetMultipleEscrowBalances();
+
+  // Get the escrows by signer
+  return useQuery({
+    queryKey: ["escrows", addresses],
+    queryFn: async (): Promise<GetEscrowBalancesResponse[]> => {
+      /**
+       * Call the query to get the escrows from the Trustless Work Indexer
+       *
+       * @param params - The parameters for the query
+       * @returns The query result
+       */
+      const balances = await getMultipleBalances({ addresses });
+
+      if (!balances) {
+        throw new Error("Escrows not found");
+      }
+
+      return balances;
+    },
+    enabled: enabled,
+    staleTime: 1000 * 60 * 5, // 5 min
+  });
+};

package/templates/wallet-kit/trustlines.ts

@@ -10,26 +10,22 @@ export const trustlines = [
   {
     name: "USDC",
     address: "CBIELTK6YBZJU5UP2WWQEUCYKLPU6AUNZ2BQ4WWFEIE3USCIHMXQDAMA",
-    decimals: 10000000,
     network: "testnet",
   },
   {
     name: "EURC",
     address: "GB3Q6QDZYTHWT7E5PVS3W7FUT5GVAFC5KSZFFLPU25GO7VTC3NM2ZTVO",
-    decimals: 10000000,
     network: "testnet",
   },
   // MAINNET
   {
     name: "USDC",
     address: "CCW67TSZV3SSS2HXMBQ5JFGCKJNXKZM7UQUWUZPUTHXSTZLEO7SJMI75",
-    decimals: 10000000,
     network: "mainnet",
   },
   {
     name: "EURC",
     address: "GB3Q6QDZYTHWT7E5PVS3W7FUT5GVAFC5KSZFFLPU25GO7VTC3NM2ZTVO",
-    decimals: 10000000,
     network: "mainnet",
   },
 ];