@indigo-labs/indigo-sdk 0.3.8 → 0.3.10

package/tests/rob/rob.test.ts

@@ -28,7 +28,8 @@ import {
   createProposal,
   fromSystemParamsAsset,
   MIN_ROB_COLLATERAL_AMT,
-  robAmountToSpend,
+  robAmtToSpend,
+  robCollateralAmtToSpend,
 } from '../../src';
 import { strictEqual } from 'assert';
 import {
@@ -1124,10 +1125,9 @@ describe('ROB', () => {
         ownPkh,
       );
 
-      const amtToSpendBefore = robAmountToSpend(
+      const amtToSpendBefore = robCollateralAmtToSpend(
         robBefore.utxo,
         robBefore.datum,
-        sysParams,
       );
 
       await runAndAwaitTx(
@@ -1148,10 +1148,9 @@ describe('ROB', () => {
         ownPkh,
       );
 
-      const amtToSpendAfter = robAmountToSpend(
+      const amtToSpendAfter = robCollateralAmtToSpend(
         adjustedUtxo1.utxo,
         adjustedUtxo1.datum,
-        sysParams,
       );
 
       assert(amtToSpendBefore - amtToSpendAfter === 1_000_000n);
@@ -1170,10 +1169,9 @@ describe('ROB', () => {
         ownPkh,
       );
 
-      const amtToSpendBefore = robAmountToSpend(
+      const amtToSpendBefore = robCollateralAmtToSpend(
         robBefore.utxo,
         robBefore.datum,
-        sysParams,
       );
 
       await runAndAwaitTx(
@@ -1194,10 +1192,9 @@ describe('ROB', () => {
         ownPkh,
       );
 
-      const amtToSpendAfter = robAmountToSpend(
+      const amtToSpendAfter = robCollateralAmtToSpend(
         adjustedUtxo2.utxo,
         adjustedUtxo2.datum,
-        sysParams,
       );
 
       strictEqual(amtToSpendAfter - amtToSpendBefore, 5_000_000n);
@@ -1274,13 +1271,21 @@ describe('ROB', () => {
     };
 
     assert(
-      robAmountToSpend(adjustedUtxo1.utxo, adjustedUtxo1.datum, sysParams) ===
+      robAmtToSpend(
+        adjustedUtxo1.utxo,
+        adjustedUtxo1.datum,
+        sysParams.cdpParams.cdpAssetSymbol,
+      ) ===
         20_000_000n - 1_000_000n,
     );
 
     expect(
       assetClassValueOf(adjustedUtxo1.utxo.assets, iassetAc) ===
-        robAmountToSpend(adjustedUtxo1.utxo, adjustedUtxo1.datum, sysParams),
+        robAmtToSpend(
+          adjustedUtxo1.utxo,
+          adjustedUtxo1.datum,
+          sysParams.cdpParams.cdpAssetSymbol,
+        ),
       'IAssets to spend has to equal iassets in UTXO',
     ).toBeTruthy();
 
@@ -1305,13 +1310,21 @@ describe('ROB', () => {
     const expectedResultAdaAmt = 20_000_000n - 1_000_000n + 5_000_000n;
 
     strictEqual(
-      robAmountToSpend(adjustedUtxo2.utxo, adjustedUtxo2.datum, sysParams),
+      robAmtToSpend(
+        adjustedUtxo2.utxo,
+        adjustedUtxo2.datum,
+        sysParams.cdpParams.cdpAssetSymbol,
+      ),
       expectedResultAdaAmt,
     );
 
     expect(
       assetClassValueOf(adjustedUtxo2.utxo.assets, iassetAc) >=
-        robAmountToSpend(adjustedUtxo2.utxo, adjustedUtxo2.datum, sysParams),
+        robAmtToSpend(
+          adjustedUtxo2.utxo,
+          adjustedUtxo2.datum,
+          sysParams.cdpParams.cdpAssetSymbol,
+        ),
       'IAssets to spend has to equal iassets in UTXO',
     ).toBeTruthy();
   });
@@ -1376,10 +1389,9 @@ describe('ROB', () => {
 
     const redemptionIAssetAmt = 11_000_000n;
 
-    const amtToSpendBefore = robAmountToSpend(
+    const amtToSpendBefore = robCollateralAmtToSpend(
       robUtxo.utxo,
       robUtxo.datum,
-      sysParams,
     );
 
     await runAndAwaitTx(
@@ -1408,7 +1420,7 @@ describe('ROB', () => {
 
     expect(
       amtToSpendBefore -
-        robAmountToSpend(redeemedRob.utxo, redeemedRob.datum, sysParams),
+        robCollateralAmtToSpend(redeemedRob.utxo, redeemedRob.datum),
       'ROB has wrong number redeemed',
     ).toEqual(
       // Since price is 1
@@ -1553,7 +1565,7 @@ describe('ROB', () => {
     );
 
     expect(
-      robAmountToSpend(redeemedRob.utxo, redeemedRob.datum, sysParams),
+      robCollateralAmtToSpend(redeemedRob.utxo, redeemedRob.datum),
       'Wrong amt to spend in datum',
     ).toEqual(initialDeposit - expectedRedeemedAmt);
 
@@ -1701,7 +1713,11 @@ describe('ROB', () => {
     );
 
     expect(
-      robAmountToSpend(redeemedRob.utxo, redeemedRob.datum, sysParams),
+      robAmtToSpend(
+        redeemedRob.utxo,
+        redeemedRob.datum,
+        sysParams.cdpParams.cdpAssetSymbol,
+      ),
       'Wrong amt to spend in datum',
     ).toEqual(initialDeposit - expectedRedemptionAmt);
 
@@ -2274,7 +2290,7 @@ describe('ROB', () => {
 
     // Since price is 1
     expect(
-      robAmountToSpend(adjustedRob.utxo, adjustedRob.datum, sysParams),
+      robCollateralAmtToSpend(adjustedRob.utxo, adjustedRob.datum),
     ).toEqual(
       // 20mil start, -1mil adjusted, rest redeemed
       20_000_000n -

package/tests/rob/transactions-mutated.ts

@@ -124,7 +124,9 @@ export async function testRedeemRob(
     0n,
     refInputIdxs[2],
     refInputIdxs[1],
-    priceOracleUtxo !== undefined ? refInputIdxs[3] : null,
+    priceOracleOutRef !== undefined
+      ? { OracleRefInputIdx: refInputIdxs[3] }
+      : 'OracleVoid',
   );
 
   const transaction = lucid
@@ -295,7 +297,7 @@ export async function redeemWithCdpCreate(
     0n,
     refInputIdxs[0],
     refInputIdxs[1],
-    refInputIdxs[2],
+    { OracleRefInputIdx: refInputIdxs[2] },
   );
 
   const txValidity = oracleExpirationAwareValidity(
@@ -534,7 +536,7 @@ export async function redeemWithCdpClose(
     0n,
     refInputIdxs[0],
     refInputIdxs[1],
-    refInputIdxs[2],
+    { OracleRefInputIdx: refInputIdxs[2] },
   );
 
   const validateFrom = slotToUnixTime(network, currentSlot - 1);
@@ -758,7 +760,7 @@ export async function redeemWithCdpAdjust(
     0n,
     refInputIdxs[0],
     refInputIdxs[1],
-    refInputIdxs[2],
+    { OracleRefInputIdx: refInputIdxs[2] },
   );
 
   const txValidity = oracleExpirationAwareValidity(