Merge pull request #2964 from IntersectMBO/feat/merge-utxos-on-faucet-refund

Feat: merge utxos on faucet refund

Author: kneerose

tests/govtool-frontend/playwright/lib/constants/staticWallets.ts

@@ -1,5 +1,6 @@
 const staticWallets: StaticWallet[] = require("../_mock/wallets.json");
 import { StaticWallet } from "@types";
+import { proposalFaucetWallet } from "./proposalFaucetWallet";
 export const faucetWallet = staticWallets[0];
 
 export const dRep01Wallet = staticWallets[1];
@@ -37,4 +38,21 @@ export const userWallets = [user01Wallet];
 
 export const dRepWallets = [dRep01Wallet, dRep02Wallet];
 
-export const proposalWallets = [proposal01Wallet];
+export const proposalWallets = [
+  proposal01Wallet,
+  proposal02Wallet,
+  proposal03Wallet,
+  proposal04Wallet,
+  proposal05Wallet,
+  proposal06Wallet,
+  proposal07Wallet,
+];
+
+export const allStaticWallets = [
+  ...dRepWallets,
+  ...adaHolderWallets,
+  user01Wallet,
+  ...proposalWallets,
+  faucetWallet,
+  proposalFaucetWallet,
+];

tests/govtool-frontend/playwright/lib/services/kuberService.ts

@@ -12,6 +12,7 @@ import fetch, { BodyInit, RequestInit } from "node-fetch";
 import { cborxEncoder } from "@helpers/encodeDecode";
 import { Logger } from "@helpers/logger";
 import { blockfrostSubmitTransaction } from "@services/blockfrostService";
+import { proposalFaucetWallet } from "@constants/proposalFaucetWallet";
 
 type CertificateType = "registerstake" | "registerdrep" | "deregisterdrep";
 
@@ -161,6 +162,25 @@ const kuberService = {
       certificates,
     });
   },
+  mergeUtXos: (wallets: StaticWallet[]) => {
+    const kuber = new Kuber(
+      proposalFaucetWallet.address,
+      proposalFaucetWallet.payment.private
+    );
+    const selections = wallets.map((wallet) => ({
+      type: "PaymentSigningKeyShelley_ed25519",
+      description: "Payment Signing Key",
+      cborHex: "5820" + wallet.payment.private,
+    }));
+
+    const inputs = wallets.map((wallet) => wallet.address);
+    return kuber.signAndSubmitTx({
+      inputs,
+      selections,
+      changeAddress: proposalFaucetWallet.address,
+    });
+  },
+
   transferADA: (receiverAddressList: string[], ADA = 20) => {
     const kuber = new Kuber(faucetWallet.address, faucetWallet.payment.private);
     const req = {

tests/govtool-frontend/playwright/tests/faucet.teardown.ts

@@ -1,10 +1,12 @@
 import environments from "@constants/environments";
-import { faucetWallet } from "@constants/staticWallets";
+import { allStaticWallets } from "@constants/staticWallets";
 import { setAllureEpic, setAllureStory } from "@helpers/allure";
 import { skipIfMainnet } from "@helpers/cardano";
 import { pollTransaction } from "@helpers/transaction";
 import { test as cleanup, expect } from "@playwright/test";
 import kuberService from "@services/kuberService";
+import { StaticWallet } from "@types";
+import walletManager from "lib/walletManager";
 
 cleanup.describe.configure({ timeout: environments.txTimeOut });
 cleanup.beforeEach(async () => {
@@ -14,16 +16,16 @@ cleanup.beforeEach(async () => {
 });
 
 cleanup("Refund faucet", async () => {
+  const registerDRepWallets: StaticWallet[] =
+    await walletManager.readWallets("registerDRepCopy");
+  const registeredDRepWallets: StaticWallet[] =
+    await walletManager.readWallets("registeredDRepCopy");
   try {
-    const faucetRemainingBalance = await kuberService.getBalance(
-      faucetWallet.address
-    );
-
-    const transferBalance = Math.floor(faucetRemainingBalance) - 3;
-    const { txId, lockInfo } = await kuberService.transferADA(
-      [environments.faucet.address],
-      transferBalance
-    );
+    const { txId, lockInfo } = await kuberService.mergeUtXos([
+      ...allStaticWallets,
+      ...registerDRepWallets,
+      ...registeredDRepWallets,
+    ]);
     await pollTransaction(txId, lockInfo);
   } catch (err) {
     console.log(err);