wip: sync

dmitriy-woof-software · Apr 11, 2024 · 61fa54e · 61fa54e
1 parent 00fafb3
commit 61fa54e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/scenario/BulkerScenario.ts b/scenario/BulkerScenario.ts
@@ -5,10 +5,11 @@ import { expectBase, isRewardSupported, isBulkerSupported, getExpectedBaseBalanc
 import { exp } from '../test/helpers';
 
 // XXX properly handle cases where asset0 is WETH
-scenario.skip(
+scenario.only(
   'Comet#bulker > (non-WETH base) all non-reward actions in one txn',
   {
-    filter: async (ctx) => await isBulkerSupported(ctx) && !matchesDeployment(ctx, [{deployment: 'weth'}, {network: 'mumbai'}, { network: 'linea-goerli' }]),
+    filter: async (ctx) =>
+      await isBulkerSupported(ctx) && !matchesDeployment(ctx, [{deployment: 'weth'}, {network: 'mumbai'}, { network: 'linea-goerli' }, {deployment: 'weth-lrt', network: 'mainnet'}]),
     supplyCaps: {
       $asset0: 3000,
       $asset1: 3000,
@@ -25,10 +26,10 @@ scenario.skip(
     const baseAsset = context.getAssetByAddress(baseAssetAddress);
     const baseScale = (await comet.baseScale()).toBigInt();
     // console.log('we are here')
-    const numAssets = await comet.numAssets()
-    // console.log({numAssets})
+    const numAssets = await comet.numAssets();
+    console.log({numAssets});
     // console.log({comet})
-    // console.log({comet: await comet.getAssetInfo(0)})
+    console.log({comet: await comet.getAssetInfo(0)});
     const { asset: collateralAssetAddress, scale: scaleBN } = await comet.getAssetInfo(0);
     const collateralAsset = context.getAssetByAddress(collateralAssetAddress);
     const collateralScale = scaleBN.toBigInt();
@@ -164,7 +165,7 @@ scenario(
 );
 
 // XXX properly handle cases where asset0 is WETH
-scenario(
+scenario.only(
   'Comet#bulker > (non-WETH base) all actions in one txn',
   {
     filter: async (ctx) => await isBulkerSupported(ctx) && await isRewardSupported(ctx) && !matchesDeployment(ctx, [{deployment: 'weth'}, { network: 'linea-goerli' }]),

diff --git a/scenario/LiquidationBotScenario.ts b/scenario/LiquidationBotScenario.ts
@@ -741,7 +741,7 @@ scenario(
     mainnet: {
       usdc: ' == 5000', // COMP
       weth: ' == 10000', // CB_ETH
-      'weth-lrt': ' == 100' // EZ_ETH
+      'weth-lrt': ' == 1' // EZ_ETH
     },
   };
 
@@ -794,24 +794,19 @@ scenario(
           weth9
         ]
       ) as OnChainLiquidator;
-      console.log('12');
 
       const baseToken = await comet.baseToken();
       const { asset: collateralAssetAddress } = await comet.getAssetInfo(0);
-      console.log('123');
       const initialRecipientBalance = await betty.getErc20Balance(baseToken);
       const [initialNumAbsorbs, initialNumAbsorbed] = await comet.liquidatorPoints(betty.address);
-      console.log('1234');
 
       const borrowCapacity = await borrowCapacityForAsset(comet, albert, 0);
       const borrowAmount = (borrowCapacity.mul(90n)).div(100n);
-      console.log('12345');
 
       await albert.withdrawAsset({
         asset: baseToken,
         amount: borrowAmount
       });
-      console.log('123456');
 
       await world.increaseTime(
         await timeUntilUnderwater({
@@ -820,10 +815,8 @@ scenario(
           fudgeFactor: 60n * 10n // 10 minutes past when position is underwater
         })
       );
-      console.log('1234567');
 
       await comet.connect(betty.signer).accrueAccount(albert.address); // force accrue
-      console.log('12345678');
 
       expect(await comet.isLiquidatable(albert.address)).to.be.true;
       expect(await comet.collateralBalanceOf(albert.address, collateralAssetAddress)).to.be.greaterThan(0);