@paraswap/dex-lib 3.8.20-lite-psm → 3.8.20-lite-psm.2

package/src/dex/lite-psm/lite-psm-event-pool.ts

@@ -10,9 +10,13 @@ import { LitePsmConfig } from './config';
 import PsmABI from '../../abi/maker-psm/psm.json';
 import VatABI from '../../abi/maker-psm/vat.json';
 import { erc20Iface } from '../../lib/tokens/utils';
+import DaiABI from '../../abi/lite-psm/dai.json';
+import UsdcABI from '../../abi/lite-psm/usdc.json';
 
 const vatInterface = new Interface(VatABI);
 const psmInterface = new Interface(PsmABI);
+const daiInterface = new Interface(DaiABI);
+const usdcInterface = new Interface(UsdcABI);
 
 const bigIntify = (b: any) => BigInt(b.toString());
 
@@ -115,11 +119,10 @@ export class LitePsmEventPool extends StatefulEventSubscriber<PoolState> {
       LitePsmConfig[this.parentName][this.network].dai.address.toLowerCase();
     this.logDecoder = (log: Log) => {
       const logAddress = log.address.toLowerCase();
-      if (
-        logAddress === this.daiAddress ||
-        logAddress === this.poolConfig.gem.address
-      ) {
-        return erc20Iface.parseLog(log);
+      if (logAddress === this.daiAddress) {
+        return daiInterface.parseLog(log);
+      } else if (logAddress === this.poolConfig.gem.address) {
+        return usdcInterface.parseLog(log);
       } else {
         return psmInterface.parseLog(log);
       }
@@ -155,10 +158,10 @@ export class LitePsmEventPool extends StatefulEventSubscriber<PoolState> {
   }
 
   handleTransferDAI(event: any, pool: PoolState, log: Log): PoolState {
-    if (event.args?.from?.toLowerCase() === this.poolConfig.psmAddress) {
-      pool.daiBalance -= bigIntify(event.args.value);
-    } else if (event.args?.to?.toLowerCase() === this.poolConfig.psmAddress) {
-      pool.daiBalance += bigIntify(event.args.value);
+    if (event.args?.src?.toLowerCase() === this.poolConfig.psmAddress) {
+      pool.daiBalance -= bigIntify(event.args.wad);
+    } else if (event.args?.dst?.toLowerCase() === this.poolConfig.psmAddress) {
+      pool.daiBalance += bigIntify(event.args.wad);
     }
     return pool;
   }

package/src/dex/lite-psm/lite-psm.ts

@@ -560,12 +560,10 @@ export class LitePsm
     //   this.vatAddress,
     //   'latest',
     // );
+    const blockNumber = this.dexHelper.blockManager.getLatestBlockNumber();
     const poolStates = await Promise.all(
       Object.values(this.eventPools).map(e =>
-        this.getPoolState(
-          e,
-          this.dexHelper.blockManager.getLatestBlockNumber(),
-        ),
+        this.getPoolState(e, blockNumber),
       ),
     );
     return validPoolConfigs.map((p, i) => ({

package/src/dex-helper/dummy-dex-helper.ts

@@ -261,7 +261,7 @@ export class DummyRequestWrapper implements IRequestWrapper {
 }
 
 class DummyBlockManager implements IBlockManager {
-  constructor(public _blockNumber: number = 42) {}
+  constructor(public _blockNumber: number = 20569333) {}
 
   subscribeToLogs(
     subscriber: EventSubscriber,