Merge pull request #94 from MeshJS/Staking

hf4

Author: QSchlegel

src/components/multisig/inspect-multisig-script.tsx

@@ -46,6 +46,10 @@ export default function InspectMultisigScript({
         label="CBOR"
         value={<Code>{mWallet.getPaymentScript()}</Code>}
       />
+      {appWallet?.stakeCredentialHash && <RowLabelInfo
+        label="Stake Credential Hash"
+        value={<Code>{appWallet?.stakeCredentialHash}</Code>}
+        />}
     </div>,
   ];
 

src/components/pages/wallet/info/card-info.tsx

@@ -105,7 +105,6 @@ function EditInfo({
       isArchived,
     });
   }
-
   return (
     <fieldset className="grid gap-6">
       <div className="grid gap-3">

src/components/pages/wallet/new-transaction/index.tsx

@@ -3,6 +3,7 @@ import { useRouter } from "next/router";
 
 import {
   keepRelevant,
+  NativeScript,
   Quantity,
   Unit,
   UTxO,
@@ -153,7 +154,7 @@ export default function PageNewTransaction() {
 
       if(!multisigWallet) return
 
-      const paymentScript = multisigWallet?.getPaymentScript()
+      const paymentScript = appWallet.scriptCbor
       // const rewardAddress = multisigWallet?.getStakeAddress()
       // const stakingScript = multisigWallet?.getStakingScript()
 
@@ -162,6 +163,7 @@ export default function PageNewTransaction() {
       if(!paymentScript) return
       console.log(paymentScript)
       console.log(multisigWallet.getKeysByRole(0))
+      console.log(multisigWallet.getScript())
 
       for (const utxo of selectedUtxos) {
         txBuilder

src/utils/common.ts

@@ -13,17 +13,22 @@ import {
 import { Address, getDRepIds } from "@meshsdk/core-cst";
 import { MultisigKey, MultisigWallet } from "@/utils/multisigSDK";
 
-function addressToNetwork(address:string):number {
-  return (address.includes("test"))?0:1;
+function addressToNetwork(address: string): number {
+  return address.includes("test") ? 0 : 1;
 }
 
 export function buildMultisigWallet(
   wallet: DbWallet,
   network?: number,
 ): MultisigWallet | undefined {
+  console.log(
+    "buildMultisigWallet - stakeCredentialHash",
+    wallet.stakeCredentialHash,
+  );
+
   const keys: MultisigKey[] = [];
   if (wallet.signersAddresses.length > 0) {
-    if(!network) network = addressToNetwork(wallet.signersAddresses[0]!)
+    if (!network) network = addressToNetwork(wallet.signersAddresses[0]!);
     wallet.signersAddresses.forEach((addr, i) => {
       if (addr) {
         try {
@@ -55,14 +60,22 @@ export function buildMultisigWallet(
       }
     });
   }
-  if (keys.length === 0) return;
+
+  if (keys.length === 0 && !wallet.stakeCredentialHash) {
+    console.warn(
+      "buildMultisigWallet: no valid keys and no stakeCredentialHash provided",
+      wallet,
+    );
+    return;
+  }
+  const stakeCredentialHash = wallet.stakeCredentialHash as undefined | string;
   const multisigWallet = new MultisigWallet(
     wallet.name,
     keys,
     wallet.description ?? "",
     wallet.numRequiredSigners ?? 1,
     network,
-    wallet.stakeCredentialHash ?? undefined
+    stakeCredentialHash,
   );
   return multisigWallet;
 }
@@ -72,6 +85,7 @@ export function buildWallet(
   network: number,
   utxos?: UTxO[],
 ): Wallet {
+  console.log("hi");
   const mWallet = buildMultisigWallet(wallet, network);
   if (!mWallet) {
     console.error("error when building Multisig Wallet!");
@@ -105,8 +119,7 @@ export function buildWallet(
   const paymentAddrEmpty =
     utxos?.filter((f) => f.output.address === paymentAddress).length === 0;
 
-  if (paymentAddrEmpty && mWallet.stakingEnabled()) address = stakeableAddress
-  
+  if (paymentAddrEmpty && mWallet.stakingEnabled()) address = stakeableAddress;
 
   const dRepIdCip105 = resolveScriptHashDRepId(
     resolveNativeScriptHash(nativeScript as NativeScript),

src/utils/multisigSDK.ts

@@ -37,7 +37,7 @@ export class MultisigWallet {
   keys: MultisigKey[];
   required: number;
   network: number;
-  stakeCredentialHash: string;
+  stakeCredentialHash: string | undefined;
 
   constructor(
     name: string,
@@ -59,9 +59,7 @@ export class MultisigWallet {
     this.description = description ? description : "";
     this.required = required ? required : 1;
     this.network = network !== undefined ? network : 1;
-    this.stakeCredentialHash = stakeCredentialHash
-      ? stakeCredentialHash
-      : "undefined";
+    this.stakeCredentialHash = stakeCredentialHash;
   }
 
   /**
@@ -87,7 +85,7 @@ export class MultisigWallet {
       this.network,
       this.stakingEnabled()
         ? stakeCredentialHash
-        : this.stakeCredentialHash === "undefined"
+        : this.stakeCredentialHash === undefined
           ? undefined
           : this.stakeCredentialHash,
       this.stakingEnabled(),
@@ -104,7 +102,7 @@ export class MultisigWallet {
       );
       return undefined;
     }
-    return getScript(paymentScript, this.network).scriptCbor;
+    return getScript(paymentScript, this.network, ).scriptCbor;
   }
 
   getStakingScript(): string | undefined {
@@ -159,8 +157,7 @@ export class MultisigWallet {
    * @returns The stake credential hash as a string or undefined if no stake script.
    */
   getStakeCredentialHash(): string | undefined {
-    if (this.stakeCredentialHash !== "undefined")
-      return this.stakeCredentialHash;
+    if (this.stakeCredentialHash) return this.stakeCredentialHash;
     // Builds script with stake key hashes
     const stakeScript = this.buildScript(2);
     if (!stakeScript) return undefined;
@@ -274,7 +271,7 @@ function buildNativeScript(
 }
 
 /**
- * Returns the address of a given multisig script for the specified network.
+ * Returns the address and cbor of a given multisig script for the specified network.
  *
  * @param script - The NativeScript.
  * @param network - Network identifier (e.g., 1 for mainnet, 0 for testnet).
@@ -291,7 +288,7 @@ function getScript(
     script,
     stakeCredentialHash,
     network,
-    enabled,
+    enabled
   );
   if (!scriptCbor) {
     throw new Error("Failed to serialize multisig script");