wip: testing

packages/core/src/TxBuilders/TxBuilder.Lucid.V1.class.ts

@@ -392,6 +392,7 @@ export class TxBuilderLucidV1 extends TxBuilderV1 {
       };
     }
 
+    console.log(secondSwapData.datum);
     const datumHash = this.lucid.utils.datumToHash(
       secondSwapData.datum as string
     );

packages/core/src/TxBuilders/__tests__/TxBuilder.Lucid.V1.class.test.ts

@@ -251,7 +251,7 @@ describe("TxBuilderLucidV1", () => {
     }
   });
 
-  test("orderRouteSwap() - v1 to v1", async () => {
+  test.only("orderRouteSwap() - v1 to v1", async () => {
     const { build, datum, fees } = await builder.orderRouteSwap({
       ownerAddress: PREVIEW_DATA.addresses.current,
       swapA: {

packages/gummiworm/src/GummiWorm.Lucid.class.ts

@@ -67,7 +67,7 @@ export class GummiWormLucid implements GummiWorm {
   };
 
   constructor(public sdk: SundaeSDK) {
-    const lucid = sdk.builder().lucid;
+    const lucid = sdk.lucid();
     if (!lucid) {
       throw new Error(
         "A lucid instance is required. Ensure that you have a builder set up in your SDK."
@@ -119,14 +119,21 @@ export class GummiWormLucid implements GummiWorm {
       orderDeposit: this.getParam("minLockAda"),
     });
 
-    const wallet = this.sdk.builder().lucid.wallet;
+    const lucid = this.sdk.lucid();
+    if (!lucid) {
+      throw new Error(
+        "Lucid is not available. Are you using a different builder?"
+      );
+    }
+
+    const wallet = lucid.wallet;
     if (!wallet) {
       throw new Error(
         "A wallet was not initialized in your Lucid instance. Please select a wallet, and then try again."
       );
     }
 
-    const txInstance = this.sdk.builder().lucid.newTx();
+    const txInstance = lucid.newTx();
     const { inline } = this.datumBuilder.buildDepositDatum({
       address: depositArgs.address ?? (await wallet.address()),
     });

packages/gummiworm/src/__tests__/GummiWorm.Lucid.class.test.ts

@@ -5,9 +5,10 @@ import {
   SundaeSDK,
   type ITxBuilderFees,
 } from "@sundaeswap/core";
-import { PREVIEW_DATA, setupLucid } from "@sundaeswap/core/testing";
+import { PREVIEW_DATA } from "@sundaeswap/core/testing";
 import { C } from "lucid-cardano";
 
+import { setupLucid } from "@sundaeswap/core/lucid";
 import { GummiWormLucid } from "../GummiWorm.Lucid.class.js";
 
 let GWInstance: GummiWormLucid;

packages/taste-test/src/@types/index.ts

@@ -4,7 +4,7 @@ import type {
   MintingPolicy,
   OutRef,
   SpendingValidator,
-  UTXO,
+  UTxO,
 } from "lucid-cardano";
 
 /**
@@ -88,7 +88,7 @@ export interface IBaseArgs {
     validator: TScriptType;
   };
   tasteTestType?: TTasteTestType;
-  utxos?: UTXO[];
+  utxos?: UTxO[];
 }
 
 /**

packages/taste-test/src/lib/__tests__/TasteTest.Lucid.class.test.ts

@@ -1,4 +1,4 @@
-import { setupLucid } from "@sundaeswap/core/testing";
+import { setupLucid } from "@sundaeswap/core/lucid";
 import { Lucid } from "lucid-cardano";
 
 import { TasteTestLucid } from "../classes/TasteTest.Lucid.class.js";

packages/taste-test/src/lib/classes/TasteTest.Lucid.class.ts

@@ -7,7 +7,7 @@ import {
   Datum,
   Tx,
   TxComplete,
-  UTXO,
+  UTxO,
   fromText,
   toUnit,
   type Lucid,
@@ -133,7 +133,7 @@ export class TasteTestLucid implements AbstractTasteTest {
 
     const userKey = await this.getUserKey();
 
-    let coveringNode: UTXO | undefined;
+    let coveringNode: UTxO | undefined;
     const nodeUTXOs = await this.lucid.utxosAt(args.validatorAddress);
 
     if (args.utxos) {
@@ -276,7 +276,7 @@ export class TasteTestLucid implements AbstractTasteTest {
       throw new Error("Missing wallet's payment credential hash.");
     }
 
-    let ownNode: UTXO | undefined;
+    let ownNode: UTxO | undefined;
     if (args.utxos) {
       ownNode = args.utxos[0];
     } else {
@@ -506,7 +506,7 @@ export class TasteTestLucid implements AbstractTasteTest {
 
     const userKey = await this.getUserKey();
 
-    let ownNode: UTXO | undefined;
+    let ownNode: UTxO | undefined;
     if (args.utxos) {
       ownNode = args.utxos[0];
     } else {

packages/taste-test/src/utils.ts

@@ -1,23 +1,23 @@
-import { Data, UTXO } from "lucid-cardano";
+import { Data, UTxO } from "lucid-cardano";
 
 import { LiquiditySetNode, SetNode } from "./@types/contracts.js";
 import { TTasteTestType } from "./@types/index.js";
 
 /**
  * Finds the UTxO node that covers a given user key.
  *
- * @param {UTXO[]} utxos - An array of UTxO objects to search through.
+ * @param {UTxO[]} utxos - An array of UTxO objects to search through.
  * @param {string} userKey - The user key to find the covering node for.
  * @param {TTasteTestType} ttType - The type of Taste Test we are using.
- * @returns {UTXO|undefined} - The covering UTxO node, or undefined if no covering node is found.
+ * @returns {UTxO|undefined} - The covering UTxO node, or undefined if no covering node is found.
  *
  * @example
  * const utxos = [...]; // your array of UTxO objects
  * const userKey = 'someUserKey';
  * const coveringNode = findCoveringNode(utxos, userKey);
  */
 export const findCoveringNode = (
-  utxos: UTXO[],
+  utxos: UTxO[],
   userKey: string,
   ttType: TTasteTestType
 ) =>
@@ -39,17 +39,17 @@ export const findCoveringNode = (
 /**
  * Searches through a list of UTXOs to find a node owned by the user, identified by a specific key.
  *
- * @param {UTXO[]} utxos - An array of unspent transaction outputs (UTXOs).
+ * @param {UTxO[]} utxos - An array of unspent transaction outputs (UTXOs).
  * @param {string} userKey - The unique identifier key for the user, used to find a specific node in the UTXOs.
  * @param {TTasteTestType} ttType - The type of Taste Test we are using.
- * @returns {UTXO | undefined} - Returns the UTXO that contains the user's node if found, otherwise returns undefined.
+ * @returns {UTxO | undefined} - Returns the UTXO that contains the user's node if found, otherwise returns undefined.
  *
  * This function iterates through the provided `utxos`, attempting to match the `userKey` with a key within the datum of each UTXO.
  * If a match is found, it indicates that the UTXO belongs to the user's node, and this UTXO is returned.
  * If no matching node is found in the list of UTXOs, the function returns undefined, indicating the user's node was not found.
  */
 export const findOwnNode = (
-  utxos: UTXO[],
+  utxos: UTxO[],
   userKey: string,
   ttType: TTasteTestType
 ) =>
@@ -68,17 +68,17 @@ export const findOwnNode = (
 /**
  * Searches through a list of UTXOs to find a node owned by the user, identified by a specific key, and return the next reference (previous to the user's node).
  *
- * @param {UTXO[]} utxos - An array of unspent transaction outputs (UTXOs).
+ * @param {UTxO[]} utxos - An array of unspent transaction outputs (UTXOs).
  * @param {string} userKey - The unique identifier key for the user, used to find a specific node in the UTXOs.
  * @param {TTasteTestType} ttType - The type of Taste Test we are using.
- * @returns {UTXO | undefined} - Returns the UTXO that contains the previous node of the user's node if found, otherwise returns undefined.
+ * @returns {UTxO | undefined} - Returns the UTXO that contains the previous node of the user's node if found, otherwise returns undefined.
  *
  * This function iterates through the provided `utxos`, attempting to match the `userKey` with a key within the datum of each UTXO.
  * If a match is found, it indicates that the UTXO belongs to the user's node, and the UTXO referenced as the previous node is returned.
  * If no matching node is found in the list of UTXOs, the function returns undefined, indicating the previous node of the user's node was not found.
  */
 export const findPrevNode = (
-  utxos: UTXO[],
+  utxos: UTxO[],
   userKey: string,
   ttType: TTasteTestType
 ) =>

packages/yield-farming/src/lib/classes/YieldFarming.Lucid.class.ts

@@ -12,7 +12,7 @@ import { SundaeUtils } from "@sundaeswap/core/utilities";
 import {
   Constr,
   Data,
-  UTXO,
+  UTxO,
   type Assets,
   type Datum,
   type Lucid,
@@ -337,7 +337,7 @@ export class YieldFarmingLucid implements YieldFarming {
     referralFee,
   }: {
     destination: string;
-    positions: UTXO[];
+    positions: UTxO[];
     referralFee?: ITxBuilderReferralFee;
   }) {
     const tx = this.lucid.newTx();

packages/yield-farming/src/lib/classes/__tests__/YieldFarming.Lucid.class.test.ts

@@ -1,7 +1,8 @@
 import { jest } from "@jest/globals";
 import { AssetAmount } from "@sundaeswap/asset";
 import { ADA_METADATA } from "@sundaeswap/core";
-import { PREVIEW_DATA, setupLucid } from "@sundaeswap/core/testing";
+import { setupLucid } from "@sundaeswap/core/lucid";
+import { PREVIEW_DATA } from "@sundaeswap/core/testing";
 import { C, Data, Lucid, Tx } from "lucid-cardano";
 
 import { Delegation, TDelegation } from "../../../@types/contracts.js";