@indigo-labs/indigo-sdk 0.3.0 → 0.3.2

package/tests/stability-pool.test.ts

@@ -9,7 +9,7 @@ import {
   addrDetails,
   annulRequest,
   createProposal,
-  createSpAccount,
+  requestSpAccountCreation,
   fromSystemParamsAsset,
   MAX_E2S2S_ENTRIES_COUNT,
 } from '../src';
@@ -65,7 +65,7 @@ import {
   runOpenCdpAndCreateSPAccount,
   runProcessSpRequest,
 } from './stability-pool/actions';
-import { getValueChangeAtAddressAfterAction } from './utils';
+import { getValueChangeAtAddressAfterAction, sendValueTo } from './utils';
 import { calculateFeeFromRatio } from '../src/utils/indigo-helpers';
 import {
   refreshPriceOracle,
@@ -91,19 +91,20 @@ type MyContext = LucidContext<{
   user1: EmulatorAccount;
   user2: EmulatorAccount;
   user3: EmulatorAccount;
+  user4: EmulatorAccount;
 }>;
 
 const collateralAssetA: AssetClass = {
   currencySymbol: fromHex(
     // random generated
-    'cc072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dea',
+    'cc072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8daa',
   ),
   tokenName: fromHex(fromText('A')),
 };
 const collateralAssetB: AssetClass = {
   currencySymbol: fromHex(
     // random generated
-    'cc072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dea',
+    'cc072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dab',
   ),
   tokenName: fromHex(fromText('B')),
 };
@@ -111,7 +112,7 @@ const collateralAssetB: AssetClass = {
 const collateralAssetC: AssetClass = {
   currencySymbol: fromHex(
     // random generated
-    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dea',
+    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dac',
   ),
   tokenName: fromHex(fromText('C')),
 };
@@ -119,7 +120,7 @@ const collateralAssetC: AssetClass = {
 const collateralAssetD: AssetClass = {
   currencySymbol: fromHex(
     // random generated
-    'cc072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dea',
+    'cc072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dad',
   ),
   tokenName: fromHex(fromText('D')),
 };
@@ -127,7 +128,7 @@ const collateralAssetD: AssetClass = {
 const collateralAssetE: AssetClass = {
   currencySymbol: fromHex(
     // random generated
-    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dea',
+    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dae',
   ),
   tokenName: fromHex(fromText('E')),
 };
@@ -135,7 +136,7 @@ const collateralAssetE: AssetClass = {
 const collateralAssetF: AssetClass = {
   currencySymbol: fromHex(
     // random generated
-    'cc072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dea',
+    'cc072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8daf',
   ),
   tokenName: fromHex(fromText('F')),
 };
@@ -143,7 +144,7 @@ const collateralAssetF: AssetClass = {
 const collateralAssetG: AssetClass = {
   currencySymbol: fromHex(
     // random generated
-    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dea',
+    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dba',
   ),
   tokenName: fromHex(fromText('G')),
 };
@@ -151,7 +152,7 @@ const collateralAssetG: AssetClass = {
 const collateralAssetH: AssetClass = {
   currencySymbol: fromHex(
     // random generated
-    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dea',
+    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dbb',
   ),
   tokenName: fromHex(fromText('H')),
 };
@@ -159,11 +160,51 @@ const collateralAssetH: AssetClass = {
 const collateralAssetI: AssetClass = {
   currencySymbol: fromHex(
     // random generated
-    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dea',
+    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dbc',
   ),
   tokenName: fromHex(fromText('I')),
 };
 
+const collateralAssetJ: AssetClass = {
+  currencySymbol: fromHex(
+    // random generated
+    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dbd',
+  ),
+  tokenName: fromHex(fromText('J')),
+};
+
+const collateralAssetK: AssetClass = {
+  currencySymbol: fromHex(
+    // random generated
+    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dbe',
+  ),
+  tokenName: fromHex(fromText('K')),
+};
+
+const collateralAssetL: AssetClass = {
+  currencySymbol: fromHex(
+    // random generated
+    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dbf',
+  ),
+  tokenName: fromHex(fromText('L')),
+};
+
+const collateralAssetM: AssetClass = {
+  currencySymbol: fromHex(
+    // random generated
+    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dca',
+  ),
+  tokenName: fromHex(fromText('M')),
+};
+
+const collateralAssetN: AssetClass = {
+  currencySymbol: fromHex(
+    // random generated
+    'aa072059ae741791b7b9c23d9baea6a0b0d764dec617ce7e027a8dcb',
+  ),
+  tokenName: fromHex(fromText('N')),
+};
+
 describe('Stability pool', () => {
   beforeEach<MyContext>(async (context: MyContext) => {
     context.users = {
@@ -197,8 +238,16 @@ describe('Stability pool', () => {
           mkAssetsOf(collateralAssetG, 1_000_000_000_000n),
           mkAssetsOf(collateralAssetH, 1_000_000_000_000n),
           mkAssetsOf(collateralAssetI, 1_000_000_000_000n),
+          mkAssetsOf(collateralAssetJ, 1_000_000_000_000n),
+          mkAssetsOf(collateralAssetK, 1_000_000_000_000n),
+          mkAssetsOf(collateralAssetL, 1_000_000_000_000n),
+          mkAssetsOf(collateralAssetM, 1_000_000_000_000n),
+          mkAssetsOf(collateralAssetN, 1_000_000_000_000n),
         ),
       ),
+      user4: generateEmulatorAccount(
+        addAssets(mkLovelacesOf(100_000_000_000_000n)),
+      ),
     };
 
     context.emulator = new Emulator(
@@ -232,7 +281,7 @@ describe('Stability pool', () => {
 
     await benchmarkAndAwaitTx(
       'Stability Pool - Create Account - Request',
-      await createSpAccount(
+      await requestSpAccountCreation(
         iusdAssetInfo.iassetTokenNameAscii,
         10n,
         sysParams,
@@ -281,7 +330,7 @@ describe('Stability pool', () => {
 
       await runAndAwaitTx(
         context.lucid,
-        createSpAccount(
+        requestSpAccountCreation(
           iusdAssetInfo.iassetTokenNameAscii,
           10n,
           sysParams,
@@ -330,7 +379,7 @@ describe('Stability pool', () => {
 
       await runAndAwaitTx(
         context.lucid,
-        createSpAccount(
+        requestSpAccountCreation(
           iusdAssetInfo.iassetTokenNameAscii,
           10n,
           sysParams,
@@ -399,7 +448,7 @@ describe('Stability pool', () => {
 
       await runAndAwaitTx(
         context.lucid,
-        createSpAccount(
+        requestSpAccountCreation(
           iusdAssetInfo.iassetTokenNameAscii,
           10n,
           sysParams,
@@ -467,7 +516,7 @@ describe('Stability pool', () => {
 
       await runAndAwaitTx(
         context.lucid,
-        createSpAccount(
+        requestSpAccountCreation(
           iusdAssetInfo.iassetTokenNameAscii,
           1_000n,
           sysParams,
@@ -553,7 +602,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             ACCOUNT_DEPOSIT,
             sysParams,
@@ -574,12 +623,12 @@ describe('Stability pool', () => {
         );
       }
 
-      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
-
       // After price doubles the collateral ratio will be 110%
       const LIQUIDATED_DEBT = 5_000_000n;
       const LIQUIDATED_COLLATERAL = 11_000_000n;
 
+      context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
       await executeLiquidation(
         context,
         sysParams,
@@ -678,7 +727,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             ACCOUNT_DEPOSIT,
             sysParams,
@@ -699,12 +748,30 @@ describe('Stability pool', () => {
         );
       }
 
-      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
-
       // After price doubles the collateral ratio will be 110%
       const LIQUIDATED_DEBT = 5_000_000n;
       const LIQUIDATED_COLLATERAL = 11_000_000n;
 
+      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
+
+      // Send funds to user4 so liquidation is performed from a clean address.
+      await sendValueTo(
+        context.users.user4.address,
+        mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+        context.lucid,
+      );
+
+      context.emulator.awaitSlot(1000);
+
+      await refreshPriceOracle(
+        context,
+        sysParams,
+        iusdAssetInfo,
+        collateralAssetA,
+      );
+
+      context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
       await executeLiquidation(
         context,
         sysParams,
@@ -799,7 +866,7 @@ describe('Stability pool', () => {
 
       await runAndAwaitTx(
         context.lucid,
-        createSpAccount(
+        requestSpAccountCreation(
           iusdAssetInfo.iassetTokenNameAscii,
           10_000n,
           sysParams,
@@ -920,11 +987,12 @@ describe('Stability pool', () => {
         );
       }
 
-      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
-
       // After price doubles the collateral ratio will be 110%
       const LIQUIDATED_DEBT = 5_000_000n;
       const LIQUIDATED_COLLATERAL = 11_000_000n;
+
+      context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
       await executeLiquidation(
         context,
         sysParams,
@@ -1053,12 +1121,30 @@ describe('Stability pool', () => {
         );
       }
 
-      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
-
       // After price doubles the collateral ratio will be 110%
       const LIQUIDATED_DEBT = 5_000_000n;
       const LIQUIDATED_COLLATERAL = 11_000_000n;
 
+      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
+
+      // Send funds to user4 so liquidation is performed from a clean address.
+      await sendValueTo(
+        context.users.user4.address,
+        mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+        context.lucid,
+      );
+
+      context.emulator.awaitSlot(1000);
+
+      await refreshPriceOracle(
+        context,
+        sysParams,
+        iusdAssetInfo,
+        collateralAssetA,
+      );
+
+      context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
       await executeLiquidation(
         context,
         sysParams,
@@ -1174,7 +1260,7 @@ describe('Stability pool', () => {
 
       await runAndAwaitTx(
         context.lucid,
-        createSpAccount(
+        requestSpAccountCreation(
           iusdAssetInfo.iassetTokenNameAscii,
           10n,
           sysParams,
@@ -1268,7 +1354,7 @@ describe('Stability pool', () => {
 
       await runAndAwaitTx(
         context.lucid,
-        createSpAccount(
+        requestSpAccountCreation(
           iusdAssetInfo.iassetTokenNameAscii,
           10n,
           sysParams,
@@ -1523,11 +1609,12 @@ describe('Stability pool', () => {
         );
       }
 
-      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
-
       // After price doubles the collateral ratio will be 110%
       const LIQUIDATED_DEBT = 5_000_000n;
       const LIQUIDATED_COLLATERAL = 11_000_000n;
+
+      context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
       await executeLiquidation(
         context,
         sysParams,
@@ -1688,12 +1775,30 @@ describe('Stability pool', () => {
         );
       }
 
-      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
-
       // After price doubles the collateral ratio will be 110%
       const LIQUIDATED_DEBT = 5_000_000n;
       const LIQUIDATED_COLLATERAL = 11_000_000n;
 
+      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
+
+      // Send funds to user4 so liquidation is performed from a clean address.
+      await sendValueTo(
+        context.users.user4.address,
+        mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+        context.lucid,
+      );
+
+      context.emulator.awaitSlot(1000);
+
+      await refreshPriceOracle(
+        context,
+        sysParams,
+        iusdAssetInfo,
+        collateralAssetA,
+      );
+
+      context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
       await executeLiquidation(
         context,
         sysParams,
@@ -1816,7 +1921,7 @@ describe('Stability pool', () => {
   });
 
   describe('Liquidate', () => {
-    test<MyContext>('Liquidate adding 8th reward asset', async (context: MyContext) => {
+    test<MyContext>('Liquidate adding 9th reward asset', async (context: MyContext) => {
       context.lucid.selectWallet.fromSeed(context.users.admin.seedPhrase);
 
       const initialAssets = [
@@ -1828,9 +1933,10 @@ describe('Stability pool', () => {
         collateralAssetE,
         collateralAssetF,
         collateralAssetG,
+        collateralAssetH,
       ];
 
-      expect(initialAssets.length, 'Unexpected reward assets count').toEqual(8);
+      expect(initialAssets.length, 'Unexpected reward assets count').toEqual(9);
 
       const [sysParams, [iusdAssetInfo]] = await init(
         context.lucid,
@@ -1862,6 +1968,13 @@ describe('Stability pool', () => {
       {
         context.lucid.selectWallet.fromSeed(context.users.user2.seedPhrase);
 
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
         await runAndAwaitTx(
           context.lucid,
           runOpenCdp(
@@ -1876,7 +1989,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             BigInt(initialAssets.length + 1) * LIQUIDATED_DEBT,
             sysParams,
@@ -1905,6 +2018,17 @@ describe('Stability pool', () => {
 
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateral, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await refreshPriceOracle(context, sysParams, iusdAssetInfo, collateral);
 
         await executeLiquidation(
@@ -1938,6 +2062,20 @@ describe('Stability pool', () => {
         }
 
         const collateral = initialAssets[initialAssets.length - 1];
+
+        context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
+
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateral, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await refreshPriceOracle(context, sysParams, iusdAssetInfo, collateral);
 
         await executeLiquidation(
@@ -1949,7 +2087,7 @@ describe('Stability pool', () => {
           iusdAssetInfo,
           (tx) =>
             benchmarkAndAwaitTx(
-              'Stability Pool - Liquidate adding 8th reward asset',
+              'Stability Pool - Liquidate adding 9th reward asset',
               tx,
               context.lucid,
               context.emulator,
@@ -1972,7 +2110,7 @@ describe('Stability pool', () => {
       }
     });
 
-    test<MyContext>('Liquidate adding 8th reward asset and increasing epoch', async (context: MyContext) => {
+    test<MyContext>('Liquidate adding 9th reward asset and increasing epoch', async (context: MyContext) => {
       context.lucid.selectWallet.fromSeed(context.users.admin.seedPhrase);
 
       const initialAssets = [
@@ -1984,9 +2122,10 @@ describe('Stability pool', () => {
         collateralAssetE,
         collateralAssetF,
         collateralAssetG,
+        collateralAssetH,
       ];
 
-      expect(initialAssets.length, 'Unexpected reward assets count').toEqual(8);
+      expect(initialAssets.length, 'Unexpected reward assets count').toEqual(9);
 
       const [sysParams, [iusdAssetInfo]] = await init(
         context.lucid,
@@ -2003,7 +2142,7 @@ describe('Stability pool', () => {
 
       await createMultipleUtxosAtTreasury(
         mkLovelacesOf(2n),
-        16n,
+        27n,
         sysParams,
         context,
       );
@@ -2018,6 +2157,13 @@ describe('Stability pool', () => {
       {
         context.lucid.selectWallet.fromSeed(context.users.user2.seedPhrase);
 
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
         await runAndAwaitTx(
           context.lucid,
           runOpenCdp(
@@ -2032,7 +2178,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             BigInt(initialAssets.length) * LIQUIDATED_DEBT,
             sysParams,
@@ -2061,6 +2207,15 @@ describe('Stability pool', () => {
 
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateral, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await refreshPriceOracle(context, sysParams, iusdAssetInfo, collateral);
 
         await executeLiquidation(
@@ -2095,6 +2250,17 @@ describe('Stability pool', () => {
 
         const collateral = initialAssets[initialAssets.length - 1];
 
+        context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
+
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateral, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await refreshPriceOracle(context, sysParams, iusdAssetInfo, collateral);
 
         await executeLiquidation(
@@ -2104,9 +2270,9 @@ describe('Stability pool', () => {
           LIQUIDATED_COLLATERAL,
           collateral,
           iusdAssetInfo,
-          (tx) =>
+          async (tx) =>
             benchmarkAndAwaitTx(
-              'Stability Pool - Liquidate adding 8th reward asset and increasing epoch',
+              'Stability Pool - Liquidate adding 9th reward asset and increasing epoch',
               tx,
               context.lucid,
               context.emulator,
@@ -2128,7 +2294,7 @@ describe('Stability pool', () => {
       }
     });
 
-    test<MyContext>('Liquidate adding 8th reward asset and increasing scale', async (context: MyContext) => {
+    test<MyContext>('Liquidate adding 9th reward asset and increasing scale', async (context: MyContext) => {
       context.lucid.selectWallet.fromSeed(context.users.admin.seedPhrase);
 
       const initialAssets = [
@@ -2140,9 +2306,10 @@ describe('Stability pool', () => {
         collateralAssetE,
         collateralAssetF,
         collateralAssetG,
+        collateralAssetH,
       ];
 
-      expect(initialAssets.length, 'Unexpected reward assets count').toEqual(8);
+      expect(initialAssets.length, 'Unexpected reward assets count').toEqual(9);
 
       const [sysParams, [iusdAssetInfo]] = await init(
         context.lucid,
@@ -2174,6 +2341,13 @@ describe('Stability pool', () => {
       {
         context.lucid.selectWallet.fromSeed(context.users.user2.seedPhrase);
 
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
         await runAndAwaitTx(
           context.lucid,
           runOpenCdp(
@@ -2188,7 +2362,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             BigInt(initialAssets.length - 1) * LIQUIDATED_DEBT +
               LIQUIDATED_DEBT +
@@ -2219,6 +2393,15 @@ describe('Stability pool', () => {
 
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateral, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await refreshPriceOracle(context, sysParams, iusdAssetInfo, collateral);
 
         await executeLiquidation(
@@ -2236,7 +2419,7 @@ describe('Stability pool', () => {
        ***********/
 
       await repeat(1, async () => {
-        context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
 
         await executeLiquidation(
           context,
@@ -2292,9 +2475,18 @@ describe('Stability pool', () => {
           ).toEqual(initialAssets.length - 1);
         }
 
+        const collateral = initialAssets[initialAssets.length - 1];
+
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
-        const collateral = initialAssets[initialAssets.length - 1];
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateral, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
 
         await refreshPriceOracle(context, sysParams, iusdAssetInfo, collateral);
 
@@ -2307,7 +2499,7 @@ describe('Stability pool', () => {
           iusdAssetInfo,
           (tx) =>
             benchmarkAndAwaitTx(
-              'Stability Pool - Liquidate adding 8th reward asset and increasing scale',
+              'Stability Pool - Liquidate adding 9th reward asset and increasing scale',
               tx,
               context.lucid,
               context.emulator,
@@ -2333,7 +2525,7 @@ describe('Stability pool', () => {
 
   // We're skipping these tests, because they take really looong to execute... It must be some Lucid evolution issue.
   describe.todo('Snapshot e2s2s', () => {
-    test<MyContext>('Record snapshots for 10 assets at once', async (context: MyContext) => {
+    test<MyContext>('Record snapshots for 15 assets at once', async (context: MyContext) => {
       context.lucid.selectWallet.fromSeed(context.users.admin.seedPhrase);
 
       const initialAssets = [
@@ -2347,10 +2539,14 @@ describe('Stability pool', () => {
         collateralAssetG,
         collateralAssetH,
         collateralAssetI,
+        collateralAssetJ,
+        collateralAssetK,
+        collateralAssetL,
+        collateralAssetM,
       ];
 
       expect(initialAssets.length, 'Unexpected reward assets count').toEqual(
-        10,
+        14,
       );
 
       const [sysParams, [iusdAssetInfo]] = await init(
@@ -2368,7 +2564,7 @@ describe('Stability pool', () => {
 
       await createMultipleUtxosAtTreasury(
         mkLovelacesOf(2n),
-        12n,
+        34n,
         sysParams,
         context,
       );
@@ -2383,6 +2579,13 @@ describe('Stability pool', () => {
       {
         context.lucid.selectWallet.fromSeed(context.users.user2.seedPhrase);
 
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
         await runAndAwaitTx(
           context.lucid,
           runOpenCdp(
@@ -2397,7 +2600,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             BigInt(initialAssets.length) * LIQUIDATED_DEBT + LIQUIDATED_DEBT,
             sysParams,
@@ -2424,6 +2627,15 @@ describe('Stability pool', () => {
       for (const collateral of initialAssets) {
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateral, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await refreshPriceOracle(context, sysParams, iusdAssetInfo, collateral);
         await executeLiquidation(
           context,
@@ -2440,7 +2652,7 @@ describe('Stability pool', () => {
        ***********/
 
       await repeat(4, async () => {
-        context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
+        context.lucid.selectWallet.fromSeed(context.users.user1.seedPhrase);
 
         await executeLiquidation(
           context,
@@ -2499,7 +2711,7 @@ describe('Stability pool', () => {
       }
 
       await benchmarkAndAwaitTx(
-        'Stability Pool - Record snapshots for 10 assets at once',
+        'Stability Pool - Record snapshots for 15 assets at once',
         await runCreateE2s2sSnapshots(
           context,
           sysParams,
@@ -2530,19 +2742,30 @@ describe('Stability pool', () => {
 
   // We're skipping these tests, because they take really looong to execute... It must be some Lucid evolution issue.
   describe.todo('Complex cases', () => {
-    test<MyContext>('Deposit Account multiple rewards (4 assets)', async (context: MyContext) => {
+    test<MyContext>('Deposit Account multiple rewards (9 assets)', async (context: MyContext) => {
       context.lucid.selectWallet.fromSeed(context.users.admin.seedPhrase);
+      const initialAssets = [
+        adaAssetClass,
+        collateralAssetA,
+        collateralAssetB,
+        collateralAssetC,
+        collateralAssetD,
+        collateralAssetE,
+        collateralAssetF,
+        collateralAssetG,
+        collateralAssetH,
+      ];
+
+      expect(initialAssets.length, 'Unexpected reward assets count').toEqual(9);
+
       const [sysParams, [iusdAssetInfo]] = await init(
         context.lucid,
         [
           {
             ...iusdInitialAssetCfg(),
-            collateralAssets: mkCollateralAssetsChain([
-              mkBaseCollateralAsset(collateralAssetA, 0n),
-              mkBaseCollateralAsset(collateralAssetB, 0n),
-              mkBaseCollateralAsset(collateralAssetC, 0n),
-              mkBaseCollateralAsset(adaAssetClass, 0n),
-            ]),
+            collateralAssets: mkCollateralAssetsChain(
+              initialAssets.map((a) => mkBaseCollateralAsset(a, 0n)),
+            ),
           },
         ],
         context.emulator.slot,
@@ -2550,12 +2773,16 @@ describe('Stability pool', () => {
 
       await createMultipleUtxosAtTreasury(
         mkLovelacesOf(2n),
-        6n,
+        14n,
         sysParams,
         context,
       );
 
-      const ACCOUNT_DEPOSIT = 20_000_000n;
+      // After price doubles the collateral ratio will be 110%
+      const LIQUIDATED_DEBT = 5_000_000n;
+      const LIQUIDATED_COLLATERAL = 11_000_000n;
+      const ACCOUNT_DEPOSIT = LIQUIDATED_DEBT * BigInt(initialAssets.length);
+
       for (const u of [context.users.user1, context.users.user2]) {
         context.lucid.selectWallet.fromSeed(u.seedPhrase);
 
@@ -2566,14 +2793,14 @@ describe('Stability pool', () => {
             sysParams,
             iusdAssetInfo.iassetTokenNameAscii,
             collateralAssetA,
-            100_000_000n,
-            30_000_000n,
+            ACCOUNT_DEPOSIT * 3n,
+            ACCOUNT_DEPOSIT + LIQUIDATED_DEBT,
           ),
         );
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             ACCOUNT_DEPOSIT,
             sysParams,
@@ -2594,43 +2821,33 @@ describe('Stability pool', () => {
         );
       }
 
-      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
-      // After price doubles the collateral ratio will be 110%
-      const LIQUIDATED_DEBT = 5_000_000n;
-      const LIQUIDATED_COLLATERAL = 11_000_000n;
+      for (let idx = 0; idx < initialAssets.length; idx++) {
+        const collateral = initialAssets[idx];
 
-      await executeLiquidation(
-        context,
-        sysParams,
-        LIQUIDATED_DEBT,
-        LIQUIDATED_COLLATERAL,
-        collateralAssetA,
-        iusdAssetInfo,
-      );
-      await executeLiquidation(
-        context,
-        sysParams,
-        LIQUIDATED_DEBT,
-        LIQUIDATED_COLLATERAL,
-        collateralAssetB,
-        iusdAssetInfo,
-      );
-      await executeLiquidation(
-        context,
-        sysParams,
-        LIQUIDATED_DEBT,
-        LIQUIDATED_COLLATERAL,
-        collateralAssetC,
-        iusdAssetInfo,
-      );
-      await executeLiquidation(
-        context,
-        sysParams,
-        LIQUIDATED_DEBT,
-        LIQUIDATED_COLLATERAL,
-        adaAssetClass,
-        iusdAssetInfo,
-      );
+        context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
+
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateral, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(context, sysParams, iusdAssetInfo, collateral);
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
+        await executeLiquidation(
+          context,
+          sysParams,
+          LIQUIDATED_DEBT,
+          LIQUIDATED_COLLATERAL,
+          collateral,
+          iusdAssetInfo,
+        );
+      }
 
       context.lucid.selectWallet.fromSeed(context.users.user1.seedPhrase);
 
@@ -2651,7 +2868,7 @@ describe('Stability pool', () => {
         context.users.user1.address,
         async () =>
           benchmarkAndAwaitTx(
-            'Stability Pool - Deposit Account multiple rewards (4 assets) - Process',
+            'Stability Pool - Deposit Account multiple rewards (9 assets) - Process',
             await runProcessSpRequest(
               context,
               sysParams,
@@ -2676,12 +2893,18 @@ describe('Stability pool', () => {
             iasset.datum.liquidationProcessingFeeRatio,
             LIQUIDATED_COLLATERAL,
           )) /
-        2n;
+          2n -
+        1n; // The -1n is to compensate for rounding errors.
 
       const expectedReceived = addAssets(
         mkAssetsOf(collateralAssetA, expectedRewardPerAsset),
         mkAssetsOf(collateralAssetB, expectedRewardPerAsset),
         mkAssetsOf(collateralAssetC, expectedRewardPerAsset),
+        mkAssetsOf(collateralAssetD, expectedRewardPerAsset),
+        mkAssetsOf(collateralAssetE, expectedRewardPerAsset),
+        mkAssetsOf(collateralAssetF, expectedRewardPerAsset),
+        mkAssetsOf(collateralAssetG, expectedRewardPerAsset),
+        mkAssetsOf(collateralAssetH, expectedRewardPerAsset),
         mkAssetsOf(
           adaAssetClass,
           expectedRewardPerAsset +
@@ -2741,7 +2964,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             SINGLE_ACCOUNT_DEPOSIT,
             sysParams,
@@ -2776,6 +2999,24 @@ describe('Stability pool', () => {
             collateralAssetB,
           );
 
+          // Send funds to user4 so liquidation is performed from a clean address.
+          await sendValueTo(
+            context.users.user4.address,
+            mkAssetsOf(collateralAssetB, LIQUIDATED_COLLATERAL),
+            context.lucid,
+          );
+
+          context.emulator.awaitSlot(1000);
+
+          await refreshPriceOracle(
+            context,
+            sysParams,
+            iusdAssetInfo,
+            collateralAssetB,
+          );
+
+          context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
           // Make an additional liquidation with collateral Asset B
           await executeLiquidation(
             context,
@@ -2786,6 +3027,23 @@ describe('Stability pool', () => {
             iusdAssetInfo,
           );
         } else {
+          // Send funds to user4 so liquidation is performed from a clean address.
+          await sendValueTo(
+            context.users.user4.address,
+            mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+            context.lucid,
+          );
+
+          context.emulator.awaitSlot(1000);
+
+          await refreshPriceOracle(
+            context,
+            sysParams,
+            iusdAssetInfo,
+            collateralAssetA,
+          );
+
+          context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
           await executeLiquidation(
             context,
             sysParams,
@@ -2956,7 +3214,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             5_000_010n,
             sysParams,
@@ -2988,6 +3246,24 @@ describe('Stability pool', () => {
       await repeat(6, async (isLast) => {
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -3044,7 +3320,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             LIQUIDATED_DEBT,
             sysParams,
@@ -3071,6 +3347,24 @@ describe('Stability pool', () => {
       await repeat(2, async () => {
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -3269,6 +3563,24 @@ describe('Stability pool', () => {
 
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -3436,7 +3748,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             5_000_010n,
             sysParams,
@@ -3468,6 +3780,24 @@ describe('Stability pool', () => {
       await repeat(6, async (isLast) => {
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -3524,7 +3854,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             LIQUIDATED_DEBT,
             sysParams,
@@ -3551,6 +3881,24 @@ describe('Stability pool', () => {
       await repeat(2, async (isLast) => {
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -3662,6 +4010,24 @@ describe('Stability pool', () => {
 
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -3758,6 +4124,24 @@ describe('Stability pool', () => {
 
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -3947,7 +4331,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             BigInt(initialAssets.length) * LIQUIDATED_DEBT +
               LIQUIDATED_DEBT +
@@ -3976,7 +4360,19 @@ describe('Stability pool', () => {
       for (const collateral of initialAssets) {
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateral, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
         await refreshPriceOracle(context, sysParams, iusdAssetInfo, collateral);
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -3994,6 +4390,24 @@ describe('Stability pool', () => {
       await repeat(6, async (isLast) => {
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -4050,7 +4464,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             LIQUIDATED_DEBT,
             sysParams,
@@ -4077,6 +4491,24 @@ describe('Stability pool', () => {
       await repeat(2, async (isLast) => {
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -4195,6 +4627,24 @@ describe('Stability pool', () => {
 
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -4291,6 +4741,24 @@ describe('Stability pool', () => {
 
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -4444,6 +4912,13 @@ describe('Stability pool', () => {
       {
         context.lucid.selectWallet.fromSeed(context.users.user1.seedPhrase);
 
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
         await runAndAwaitTx(
           context.lucid,
           runOpenCdp(
@@ -4477,7 +4952,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             5_000_010n,
             sysParams,
@@ -4509,6 +4984,24 @@ describe('Stability pool', () => {
       await repeat(6, async (isLast) => {
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -4565,7 +5058,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             LIQUIDATED_DEBT,
             sysParams,
@@ -4617,6 +5110,15 @@ describe('Stability pool', () => {
         for (const collateral of initialAssets) {
           context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+          // Send funds to user4 so liquidation is performed from a clean address.
+          await sendValueTo(
+            context.users.user4.address,
+            mkAssetsOf(collateral, LIQUIDATED_COLLATERAL),
+            context.lucid,
+          );
+
+          context.emulator.awaitSlot(1000);
+
           await refreshPriceOracle(
             context,
             sysParams,
@@ -4624,6 +5126,8 @@ describe('Stability pool', () => {
             collateral,
           );
 
+          context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
           await executeLiquidation(
             context,
             sysParams,
@@ -4642,6 +5146,24 @@ describe('Stability pool', () => {
       await repeat(2, async (isLast) => {
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -4773,6 +5295,24 @@ describe('Stability pool', () => {
 
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -4865,6 +5405,24 @@ describe('Stability pool', () => {
 
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -5027,7 +5585,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             SINGLE_ACCOUNT_DEPOSIT,
             sysParams,
@@ -5058,6 +5616,24 @@ describe('Stability pool', () => {
       const LIQUIDATED_DEBT = 5_000_000n;
       const LIQUIDATED_COLLATERAL = 11_000_000n;
 
+      // Send funds to user4 so liquidation is performed from a clean address.
+      await sendValueTo(
+        context.users.user4.address,
+        mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+        context.lucid,
+      );
+
+      context.emulator.awaitSlot(1000);
+
+      await refreshPriceOracle(
+        context,
+        sysParams,
+        iusdAssetInfo,
+        collateralAssetA,
+      );
+
+      context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
       await executeLiquidation(
         context,
         sysParams,
@@ -5099,47 +5675,83 @@ describe('Stability pool', () => {
        * Liquidate CDP with collateral asset D (the new whitelisted one)
        ***********/
 
-      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
+      {
+        context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
-      await executeLiquidation(
-        context,
-        sysParams,
-        LIQUIDATED_DEBT,
-        LIQUIDATED_COLLATERAL,
-        collateralAssetD,
-        {
-          iassetTokenNameAscii: iusdAssetInfo.iassetTokenNameAscii,
-          collateralAssets: [newCollateralAssetDInfo],
-        },
-      );
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetD, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
 
-      /**********
-       * Liquidate CDP with collateral asset C (the new whitelisted one)
-       ***********/
+        context.emulator.awaitSlot(1000);
 
-      await refreshPriceOracle(
-        context,
-        sysParams,
-        {
-          iassetTokenNameAscii: iusdAssetInfo.iassetTokenNameAscii,
-          collateralAssets: [newCollateralAssetCInfo],
-        },
-        collateralAssetC,
-      );
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          {
+            iassetTokenNameAscii: iusdAssetInfo.iassetTokenNameAscii,
+            collateralAssets: [newCollateralAssetDInfo],
+          },
+          collateralAssetD,
+        );
 
-      context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
 
-      await executeLiquidation(
-        context,
-        sysParams,
-        LIQUIDATED_DEBT,
-        LIQUIDATED_COLLATERAL,
-        collateralAssetC,
-        {
-          iassetTokenNameAscii: iusdAssetInfo.iassetTokenNameAscii,
-          collateralAssets: [newCollateralAssetCInfo],
-        },
-      );
+        await executeLiquidation(
+          context,
+          sysParams,
+          LIQUIDATED_DEBT,
+          LIQUIDATED_COLLATERAL,
+          collateralAssetD,
+          {
+            iassetTokenNameAscii: iusdAssetInfo.iassetTokenNameAscii,
+            collateralAssets: [newCollateralAssetDInfo],
+          },
+        );
+      }
+
+      {
+        /**********
+         * Liquidate CDP with collateral asset C (the new whitelisted one)
+         ***********/
+
+        context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
+
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetC, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          {
+            iassetTokenNameAscii: iusdAssetInfo.iassetTokenNameAscii,
+            collateralAssets: [newCollateralAssetCInfo],
+          },
+          collateralAssetC,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
+        await executeLiquidation(
+          context,
+          sysParams,
+          LIQUIDATED_DEBT,
+          LIQUIDATED_COLLATERAL,
+          collateralAssetC,
+          {
+            iassetTokenNameAscii: iusdAssetInfo.iassetTokenNameAscii,
+            collateralAssets: [newCollateralAssetCInfo],
+          },
+        );
+      }
 
       /**********
        * Deposit to user1 account and withdraw rewards
@@ -5300,7 +5912,7 @@ describe('Stability pool', () => {
 
         await runAndAwaitTx(
           context.lucid,
-          createSpAccount(
+          requestSpAccountCreation(
             iusdAssetInfo.iassetTokenNameAscii,
             SINGLE_ACCOUNT_DEPOSIT,
             sysParams,
@@ -5332,6 +5944,24 @@ describe('Stability pool', () => {
       await repeat(2, async () => {
         context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+        // Send funds to user4 so liquidation is performed from a clean address.
+        await sendValueTo(
+          context.users.user4.address,
+          mkAssetsOf(collateralAssetA, LIQUIDATED_COLLATERAL),
+          context.lucid,
+        );
+
+        context.emulator.awaitSlot(1000);
+
+        await refreshPriceOracle(
+          context,
+          sysParams,
+          iusdAssetInfo,
+          collateralAssetA,
+        );
+
+        context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
         await executeLiquidation(
           context,
           sysParams,
@@ -5400,6 +6030,27 @@ describe('Stability pool', () => {
 
       context.lucid.selectWallet.fromSeed(context.users.user3.seedPhrase);
 
+      // Send funds to user4 so liquidation is performed from a clean address.
+      await sendValueTo(
+        context.users.user4.address,
+        mkAssetsOf(collateralAssetC, LIQUIDATED_COLLATERAL),
+        context.lucid,
+      );
+
+      context.emulator.awaitSlot(1000);
+
+      await refreshPriceOracle(
+        context,
+        sysParams,
+        {
+          iassetTokenNameAscii: iusdAssetInfo.iassetTokenNameAscii,
+          collateralAssets: [newCollateralAssetCInfo],
+        },
+        collateralAssetC,
+      );
+
+      context.lucid.selectWallet.fromSeed(context.users.user4.seedPhrase);
+
       await executeLiquidation(
         context,
         sysParams,