Merge pull request #107 from MeshJS/bug-fix/staking

add staking inclusion for gov.

Author: QSchlegel

src/components/pages/wallet/governance/drep/registerDrep.tsx

@@ -13,6 +13,7 @@ import { getDRepMetadata } from "./drepMetadata";
 import { getFile, hashDrepAnchor } from "@meshsdk/core";
 import type { UTxO } from "@meshsdk/core";
 import router from "next/router";
+import useMultisigWallet from "@/hooks/useMultisigWallet";
 
 interface PutResponse {
   url: string;
@@ -26,6 +27,7 @@ export default function RegisterDRep() {
   const loading = useSiteStore((state) => state.loading);
   const setLoading = useSiteStore((state) => state.setLoading);
   const { newTransaction } = useTransaction();
+  const { multisigWallet } = useMultisigWallet();
 
   const [manualUtxos, setManualUtxos] = useState<UTxO[]>([]);
   const [formState, setFormState] = useState({
@@ -77,6 +79,7 @@ export default function RegisterDRep() {
   async function registerDrep(): Promise<void> {
     if (!connected || !userAddress || !appWallet)
       throw new Error("Wallet not connected");
+    if (!multisigWallet) throw new Error("Multisig Wallet could not be built.");
 
     setLoading(true);
     const txBuilder = getTxBuilder(network);
@@ -111,6 +114,18 @@ export default function RegisterDRep() {
         .changeAddress(appWallet.address)
         .selectUtxosFrom(manualUtxos);
 
+      const paymentKeys = multisigWallet.getKeysByRole(0) ?? [];
+      for (const key of paymentKeys) {
+        txBuilder.requiredSignerHash(key.keyHash);
+      }
+      
+      if (multisigWallet.stakingEnabled()) {
+        const stakingKeys = multisigWallet.getKeysByRole(2) ?? [];
+        for (const key of stakingKeys) {
+          txBuilder.requiredSignerHash(key.keyHash);
+        }
+      }
+
       await newTransaction({
         txBuilder,
         description: "DRep registration",

src/components/pages/wallet/governance/drep/retire.tsx

@@ -1,8 +1,5 @@
 import { Button } from "@/components/ui/button";
 import { Wallet } from "@/types/wallet";
-// import { useState } from "react";
-// import { api } from "@/utils/api";
-// import { useToast } from "@/hooks/use-toast";
 import { useSiteStore } from "@/lib/zustand/site";
 import { getProvider } from "@/utils/get-provider";
 import { getTxBuilder } from "@/utils/get-tx-builder";
@@ -11,40 +8,22 @@ import { useWallet } from "@meshsdk/react";
 import { useUserStore } from "@/lib/zustand/user";
 import { useWalletsStore } from "@/lib/zustand/wallets";
 import useTransaction from "@/hooks/useTransaction";
+import useMultisigWallet from "@/hooks/useMultisigWallet";
 
 export default function Retire({ appWallet }: { appWallet: Wallet }) {
-  // const [loading, setLoading] = useState<boolean>(false);
-  // const { toast } = useToast();
-  // const ctx = api.useUtils();
   const network = useSiteStore((state) => state.network);
   const { connected } = useWallet();
   const userAddress = useUserStore((state) => state.userAddress);
   const drepInfo = useWalletsStore((state) => state.drepInfo);
   const { newTransaction } = useTransaction();
   const loading = useSiteStore((state) => state.loading);
   const setLoading = useSiteStore((state) => state.setLoading);
-
-  // const { mutate: createTransaction } =
-  //   api.transaction.createTransaction.useMutation({
-  //     onSuccess: async () => {
-  //       setLoading(false);
-  //       toast({
-  //         title: "Transaction Created",
-  //         description: "DRep registration transaction has been created",
-  //         duration: 5000,
-  //       });
-  //       void ctx.transaction.getPendingTransactions.invalidate();
-  //       void ctx.transaction.getAllTransactions.invalidate();
-  //     },
-  //     onError: (e) => {
-  //       console.error(e);
-  //       setLoading(false);
-  //     },
-  //   });
+  const { multisigWallet } = useMultisigWallet();
 
   async function retireDrep() {
     if (!connected) throw new Error("Not connected to wallet");
     if (!userAddress) throw new Error("No user address");
+    if (!multisigWallet) throw new Error("Multisig Wallet could not be built.");
 
     setLoading(true);
 
@@ -73,29 +52,16 @@ export default function Retire({ appWallet }: { appWallet: Wallet }) {
       .drepDeregistrationCertificate(appWallet.dRepId, "500000000")
       .certificateScript(appWallet.scriptCbor);
 
-    // const unsignedTx = await txBuilder.complete();
-
-    // const signedTx = await wallet.signTx(unsignedTx, true);
-
-    // const signedAddresses = [];
-    // signedAddresses.push(userAddress);
-
-    // let txHash = undefined;
-    // let state = 0;
-    // if (appWallet.numRequiredSigners == signedAddresses.length) {
-    //   state = 1;
-    //   txHash = await wallet.submitTx(signedTx);
-    // }
-
-    // createTransaction({
-    //   walletId: appWallet.id,
-    //   txJson: JSON.stringify(txBuilder.meshTxBuilderBody),
-    //   txCbor: signedTx,
-    //   signedAddresses: [userAddress],
-    //   state: state,
-    //   description: "DRep retirement",
-    //   txHash: txHash,
-    // });
+    const paymentKeys = multisigWallet.getKeysByRole(0) ?? [];
+    for (const key of paymentKeys) {
+      txBuilder.requiredSignerHash(key.keyHash);
+    }
+    if (multisigWallet.stakingEnabled()) {
+      const stakingKeys = multisigWallet.getKeysByRole(2) ?? [];
+      for (const key of stakingKeys) {
+        txBuilder.requiredSignerHash(key.keyHash);
+      }
+    }
 
     await newTransaction({
       txBuilder,

src/components/pages/wallet/governance/drep/updateDrep.tsx

@@ -13,6 +13,7 @@ import { getDRepMetadata } from "./drepMetadata";
 import { getFile, hashDrepAnchor } from "@meshsdk/core";
 import type { UTxO } from "@meshsdk/core";
 import router from "next/router";
+import useMultisigWallet from "@/hooks/useMultisigWallet";
 
 export default function UpdateDRep() {
   const { appWallet } = useAppWallet();
@@ -22,6 +23,7 @@ export default function UpdateDRep() {
   const loading = useSiteStore((state) => state.loading);
   const setLoading = useSiteStore((state) => state.setLoading);
   const { newTransaction } = useTransaction();
+  const { multisigWallet } = useMultisigWallet();
 
   const [manualUtxos, setManualUtxos] = useState<UTxO[]>([]);
   const [formState, setFormState] = useState({
@@ -70,6 +72,7 @@ export default function UpdateDRep() {
   async function updateDrep(): Promise<void> {
     if (!connected || !userAddress || !appWallet)
       throw new Error("Wallet not connected");
+    if (!multisigWallet) throw new Error("Multisig Wallet could not be built.");
 
     setLoading(true);
     const txBuilder = getTxBuilder(network);
@@ -104,6 +107,17 @@ export default function UpdateDRep() {
         .changeAddress(appWallet.address)
         .selectUtxosFrom(manualUtxos);
 
+      const paymentKeys = multisigWallet.getKeysByRole(0) ?? [];
+      for (const key of paymentKeys) {
+        txBuilder.requiredSignerHash(key.keyHash);
+      }
+      if (multisigWallet.stakingEnabled()) {
+        const stakingKeys = multisigWallet.getKeysByRole(2) ?? [];
+        for (const key of stakingKeys) {
+          txBuilder.requiredSignerHash(key.keyHash);
+        }
+      }
+
       await newTransaction({
         txBuilder,
         description: "DRep update",

src/hooks/useMultisigWallet.ts

@@ -18,7 +18,7 @@ export default function useMultisigWallet() {
       enabled: walletId !== undefined && userAddress !== undefined,
     },
   );
-  if (wallet && network !== undefined) {
+  if (wallet) {
     return { multisigWallet: buildMultisigWallet(wallet, network), isLoading };
   }