♻️ app: flatten simulate-proposal api and batch contract reads

Author: cruzdanilo

.changeset/bold-ram-dig.md

@@ -0,0 +1,5 @@
+---
+"@exactly/mobile": patch
+---
+
+♻️ flatten simulate-proposal api and batch contract reads

cspell.json

@@ -103,6 +103,7 @@
     "mload",
     "modelcontextprotocol",
     "moti",
+    "multicall",
     "mysten",
     "natspec",
     "nfmelendez",

src/components/pay/Repay.tsx

@@ -282,31 +282,34 @@ export default function Repay() {
   const maxAmountIn = route?.fromAmount ? pad(route.fromAmount, SLIPPAGE_DIVISOR) + 69n : undefined; // HACK try to avoid ZERO_SHARES on dust deposit
 
   const {
-    propose: { data: repayPropose },
-    executeProposal: { error: repayExecuteProposalError, isPending: isSimulatingRepay },
+    request: repayPropose,
+    error: repayExecuteProposalError,
+    isPending: isSimulatingRepay,
   } = useSimulateProposal({
     account,
     amount: maxRepay,
     market: selectedAsset.address,
-    enabled: enableSimulations && mode === "repay" && positionAssets > 0n,
     proposalType: ProposalType.RepayAtMaturity,
     maturity,
     positionAssets,
+    enabled: enableSimulations && mode === "repay" && positionAssets > 0n,
   });
 
   const {
-    propose: { data: crossRepayPropose },
-    executeProposal: { error: crossRepayExecuteProposalError, isPending: isSimulatingCrossRepay },
+    request: crossRepayPropose,
+    error: crossRepayExecuteProposalError,
+    isPending: isSimulatingCrossRepay,
   } = useSimulateProposal({
     account,
     amount: maxAmountIn,
     market: selectedAsset.address,
-    enabled: enableSimulations && mode === "crossRepay" && positionAssets > 0n,
     proposalType: ProposalType.CrossRepayAtMaturity,
+    marketOut: marketUSDCAddress,
     maturity,
     positionAssets,
     maxRepay,
     route: route?.data,
+    enabled: enableSimulations && mode === "crossRepay" && positionAssets > 0n && !!route,
   });
 
   const {
@@ -378,15 +381,15 @@ export default function Repay() {
     switch (mode) {
       case "repay":
         if (!repayPropose) throw new Error("no repay simulation");
-        mutate(repayPropose.request);
+        mutate(repayPropose);
         break;
       case "legacyRepay":
         if (!legacyRepaySimulation) throw new Error("no legacy repay simulation");
         mutate(legacyRepaySimulation.request);
         break;
       case "crossRepay":
         if (!crossRepayPropose) throw new Error("no cross repay simulation");
-        mutate(crossRepayPropose.request);
+        mutate(crossRepayPropose);
         break;
       case "legacyCrossRepay":
         if (!legacyCrossRepaySimulation) throw new Error("no legacy cross repay simulation");

src/components/roll-debt/RollDebt.tsx

@@ -10,14 +10,13 @@ import { useToastController } from "@tamagui/toast";
 import { ScrollView, Separator, Spinner, XStack, YStack } from "tamagui";
 
 import { nonEmpty, pipe, safeParse, string } from "valibot";
-import { ContractFunctionExecutionError, encodeAbiParameters } from "viem";
-import { useBytecode, useWriteContract } from "wagmi";
+import { ContractFunctionExecutionError } from "viem";
+import { useWriteContract } from "wagmi";
 
 import { exaPreviewerAddress, marketUSDCAddress, previewerAddress } from "@exactly/common/generated/chain";
 import {
   useReadExaPreviewerPendingProposals,
   useReadPreviewerPreviewBorrowAtMaturity,
-  useSimulateExaPluginPropose,
 } from "@exactly/common/generated/hooks";
 import ProposalType from "@exactly/common/ProposalType";
 import { MATURITY_INTERVAL, WAD } from "@exactly/lib";
@@ -28,6 +27,7 @@ import View from "../../components/shared/View";
 import reportError from "../../utils/reportError";
 import useAccount from "../../utils/useAccount";
 import useAsset from "../../utils/useAsset";
+import useSimulateProposal from "../../utils/useSimulateProposal";
 import Button from "../shared/Button";
 import Skeleton from "../shared/Skeleton";
 
@@ -51,12 +51,10 @@ export default function Pay() {
   const borrow = exaUSDC?.fixedBorrowPositions.find((b) => b.maturity === BigInt(success ? repayMaturity : 0));
   const rolloverMaturityBorrow = exaUSDC?.fixedBorrowPositions.find((b) => b.maturity === BigInt(borrowMaturity));
 
-  const { data: bytecode } = useBytecode({ address, query: { enabled: !!address } });
-
   const { data: borrowPreview } = useReadPreviewerPreviewBorrowAtMaturity({
     address: previewerAddress,
     args: [marketUSDCAddress, BigInt(borrowMaturity), borrow?.previewValue ?? 0n],
-    query: { enabled: !!bytecode && !!exaUSDC && !!borrow && !!address && !!borrowMaturity },
+    query: { enabled: !!exaUSDC && !!borrow && !!address && !!borrowMaturity },
   });
 
   if (!success || !exaUSDC || !borrow) return null;
@@ -228,35 +226,22 @@ function RolloverButton({
   const { t } = useTranslation();
   const { address } = useAccount();
   const router = useRouter();
-  const { data: bytecode } = useBytecode({ address, query: { enabled: !!address } });
   const toast = useToastController();
 
   const slippage = (WAD * 105n) / 100n;
   const maxRepayAssets = (borrow.previewValue * slippage) / WAD;
   const percentage = WAD;
 
-  const { data: proposeSimulation } = useSimulateExaPluginPropose({
-    address,
-    args: [
-      marketUSDCAddress,
-      maxRepayAssets,
-      ProposalType.RollDebt,
-      encodeAbiParameters(
-        [
-          {
-            type: "tuple",
-            components: [
-              { name: "repayMaturity", type: "uint256" },
-              { name: "borrowMaturity", type: "uint256" },
-              { name: "maxRepayAssets", type: "uint256" },
-              { name: "percentage", type: "uint256" },
-            ],
-          },
-        ],
-        [{ repayMaturity, borrowMaturity, maxRepayAssets, percentage }],
-      ),
-    ],
-    query: { enabled: !!address && !!bytecode },
+  const { request: proposeSimulation, error: executeProposalError } = useSimulateProposal({
+    account: address,
+    amount: maxRepayAssets,
+    market: marketUSDCAddress,
+    proposalType: ProposalType.RollDebt,
+    borrowMaturity,
+    maxRepayAssets,
+    percentage,
+    repayMaturity,
+    enabled: !!address,
   });
 
   const {
@@ -266,7 +251,7 @@ function RolloverButton({
   } = useReadExaPreviewerPendingProposals({
     address: exaPreviewerAddress,
     args: address ? [address] : undefined,
-    query: { enabled: !!address && !!bytecode, gcTime: 0, refetchInterval: 30_000 },
+    query: { enabled: !!address, gcTime: 0, refetchInterval: 30_000 },
   });
 
   const {
@@ -281,7 +266,7 @@ function RolloverButton({
           duration: 1000,
           burntOptions: { haptic: "success", preset: "done" },
         });
-        if (address && bytecode) refetchPendingProposals().catch(reportError);
+        if (address) refetchPendingProposals().catch(reportError);
         router.dismissTo("/activity");
       },
       onError: (error) => {
@@ -298,7 +283,7 @@ function RolloverButton({
   const proposeRollDebt = useCallback(() => {
     if (!address) throw new Error("no address");
     if (!proposeSimulation) throw new Error("no propose roll debt simulation");
-    mutate(proposeSimulation.request);
+    mutate(proposeSimulation);
   }, [address, proposeSimulation, mutate]);
 
   const hasProposed = pendingProposals?.some(
@@ -316,7 +301,12 @@ function RolloverButton({
     );
 
   const disabled =
-    !!isError || isProposeRollDebtPending || isPendingProposalsPending || !proposeSimulation || hasProposed;
+    !!isError ||
+    !!executeProposalError ||
+    isProposeRollDebtPending ||
+    isPendingProposalsPending ||
+    !proposeSimulation ||
+    hasProposed;
   return (
     <Button
       onPress={proposeRollDebt}

src/components/send-funds/Amount.tsx

@@ -10,16 +10,12 @@ import { Avatar, ScrollView, Square, XStack, YStack } from "tamagui";
 import { useForm, useStore } from "@tanstack/react-form";
 import { useQuery } from "@tanstack/react-query";
 import { bigint, check, parse, pipe, safeParse } from "valibot";
-import { encodeAbiParameters, erc20Abi, formatUnits, parseUnits, zeroAddress as viemZeroAddress } from "viem";
-import { useBytecode, useEstimateGas, useSendTransaction, useSimulateContract, useWriteContract } from "wagmi";
+import { erc20Abi, formatUnits, parseUnits, zeroAddress as viemZeroAddress } from "viem";
+import { useEstimateGas, useSendTransaction, useSimulateContract, useWriteContract } from "wagmi";
 
 import accountInit from "@exactly/common/accountInit";
 import { exaPluginAddress } from "@exactly/common/generated/chain";
-import {
-  exaPluginAbi,
-  upgradeableModularAccountAbi,
-  useReadUpgradeableModularAccountGetInstalledPlugins,
-} from "@exactly/common/generated/hooks";
+import { useReadUpgradeableModularAccountGetInstalledPlugins } from "@exactly/common/generated/hooks";
 import ProposalType from "@exactly/common/ProposalType";
 import shortenHex from "@exactly/common/shortenHex";
 import { Address, type Credential } from "@exactly/common/validation";
@@ -29,6 +25,7 @@ import ReviewSheet from "./ReviewSheet";
 import queryClient from "../../utils/queryClient";
 import useAccount from "../../utils/useAccount";
 import useAsset from "../../utils/useAsset";
+import useSimulateProposal from "../../utils/useSimulateProposal";
 import AmountSelector from "../shared/AmountSelector";
 import AssetLogo from "../shared/AssetLogo";
 import Blocky from "../shared/Blocky";
@@ -63,7 +60,6 @@ export default function Amount() {
   const formAmount = useStore(form.store, (state) => state.values.amount);
 
   const { data: credential } = useQuery<Credential>({ queryKey: ["credential"] });
-  const { data: bytecode } = useBytecode({ address, query: { enabled: !!address } });
   const { data: installedPlugins } = useReadUpgradeableModularAccountGetInstalledPlugins({
     address,
     factory: credential?.factory,
@@ -72,45 +68,14 @@ export default function Amount() {
   });
   const isLatestPlugin = installedPlugins?.[0] === exaPluginAddress;
 
-  const { data: proposeSimulation } = useSimulateContract(
-    isLatestPlugin
-      ? {
-          address,
-          functionName: "propose",
-          abi: [...upgradeableModularAccountAbi, ...exaPluginAbi],
-          args: [
-            market?.market ?? zeroAddress,
-            formAmount,
-            ProposalType.Withdraw,
-            encodeAbiParameters([{ type: "address" }], [receiver ?? zeroAddress]),
-          ],
-          query: {
-            enabled: !!market && !!address && !!bytecode && formAmount > 0n && !!receiver && receiver !== zeroAddress,
-          },
-        }
-      : {
-          address,
-          functionName: "propose",
-          abi: [
-            ...upgradeableModularAccountAbi,
-            {
-              type: "function",
-              name: "propose",
-              inputs: [
-                { internalType: "contract IMarket", name: "market", type: "address" },
-                { internalType: "uint256", name: "amount", type: "uint256" },
-                { internalType: "address", name: "receiver", type: "address" },
-              ],
-              outputs: [],
-              stateMutability: "nonpayable",
-            },
-          ],
-          args: [withdrawAsset ?? zeroAddress, formAmount, receiver ?? zeroAddress],
-          query: {
-            enabled: !!market && !!address && !!bytecode && formAmount > 0n && !!receiver && receiver !== zeroAddress,
-          },
-        },
-  );
+  const { request: proposeSimulation } = useSimulateProposal({
+    account: address,
+    amount: formAmount,
+    market: market?.market,
+    proposalType: ProposalType.Withdraw,
+    receiver,
+    enabled: !!market && !!address && formAmount > 0n && !!receiver && receiver !== zeroAddress,
+  });
 
   const externalAddress = useMemo(() => {
     const { success, output } = safeParse(Address, external?.address);
@@ -126,13 +91,7 @@ export default function Amount() {
     args: receiver ? [receiver, formAmount] : undefined,
     query: {
       enabled:
-        !!external &&
-        !isNativeTransfer &&
-        !!address &&
-        !!bytecode &&
-        formAmount > 0n &&
-        !!receiver &&
-        receiver !== zeroAddress,
+        !!external && !isNativeTransfer && !!address && formAmount > 0n && !!receiver && receiver !== zeroAddress,
     },
   });
 
@@ -188,7 +147,7 @@ export default function Amount() {
   const handleSubmit = useCallback(() => {
     if (!sendReady || !receiver) return;
     if (proposeSimulation) {
-      sendContract(proposeSimulation.request);
+      sendContract(proposeSimulation);
     } else if (isNativeTransfer) {
       sendNative({ to: receiver, value: formAmount });
     } else if (erc20TransferSimulation) {

src/components/swaps/Swaps.tsx

@@ -111,7 +111,7 @@ export default function Swaps() {
     (token: undefined | { external: boolean; token: Token }) => {
       if (!token) return;
       if (token.external) return parse(Address, token.token.address);
-      return protocolAssets.find((a) => a.asset === token.token.address)?.market ?? zeroAddress;
+      return protocolAssets.find((a) => a.asset === token.token.address)?.market;
     },
     [protocolAssets],
   );
@@ -253,8 +253,9 @@ export default function Swaps() {
   }, [activeInput, route]);
 
   const {
-    propose: { data: swapPropose },
-    executeProposal: { error: swapExecuteProposalError, isPending: isSimulatingSwap },
+    request: swapPropose,
+    error: swapExecuteProposalError,
+    isPending: isSimulatingSwap,
   } = useSimulateProposal({
     account,
     amount: activeInput === "from" ? fromAmount : (fromAmount * (WAD * (1000n + SLIPPAGE_PERCENT))) / 1000n / WAD,
@@ -345,7 +346,7 @@ export default function Swaps() {
     if (fromToken?.external && externalSwap) {
       mutate(externalSwap.request);
     } else if (swapPropose) {
-      mutate(swapPropose.request);
+      mutate(swapPropose);
     }
     updateSwap((old) => ({ ...old, enableSimulations: false }));
   }, [route, fromToken?.external, externalSwap, swapPropose, mutate]);