@paraswap/dex-lib 4.1.10 → 4.1.11-erc-4626.0

package/src/dex/erc4626/scripts/validate-state.ts

@@ -0,0 +1,168 @@
+// import dotenv from 'dotenv';
+// dotenv.config();
+
+// import { Network } from '../../../constants';
+// import { DummyDexHelper } from '../../../dex-helper';
+// import { DEPOSIT_TOPIC, TRANSFER_TOPIC, WITHDRAW_TOPIC } from '../constants';
+// import { ERC4626EventPool } from '../erc-4626-pool';
+// import { ERC4626Config } from '../config';
+// import { Interface } from '@ethersproject/abi';
+// import wUSDM_ABI from '../../../abi/ERC4626.json';
+// import ERC20_ABI from '../../../abi/erc20.json';
+// import { BlockHeader } from 'web3-eth';
+// import _ from 'lodash';
+// import { ERC4626PoolState } from '../types';
+// import { ethers } from 'ethers';
+
+// const blockHeaders: Record<number, BlockHeader> = {};
+
+// async function fetchPoolState(
+//   wusdmPool: ERC4626EventPool,
+//   blockNumber: number,
+// ): Promise<ERC4626PoolState> {
+//   // const eventState = wusdmPool.getState(blockNumber);
+//   // if (eventState) return eventState;
+//   const onChainState = await wusdmPool.generateState(blockNumber);
+//   wusdmPool.setState(onChainState, blockNumber);
+//   return onChainState;
+// }
+
+// async function checkPoolStateForBlockRange(
+//   startBlockNumber: number,
+//   endBlockNumber: number,
+// ): Promise<boolean> {
+//   console.log(
+//     'startBlockNumber',
+//     startBlockNumber,
+//     'endBlockNumber',
+//     endBlockNumber,
+//   );
+//   try {
+//     const network = Network.GNOSIS;
+//     const dexKey = 'sDAI';
+//     const dexHelper = new DummyDexHelper(network);
+
+//     const wUSDMAddress = ERC4626Config[dexKey][network].vault;
+//     const USDMAddress = ERC4626Config[dexKey][network].asset;
+//     const wUSDMIface = new Interface([...wUSDM_ABI, ...ERC20_ABI]);
+
+//     const logger = dexHelper.getLogger(dexKey);
+
+//     const pool = new ERC4626EventPool(
+//       dexKey,
+//       network,
+//       `wusdm-pool`,
+//       dexHelper,
+//       wUSDMAddress,
+//       USDMAddress,
+//       wUSDMIface,
+//       logger,
+//       DEPOSIT_TOPIC,
+//       WITHDRAW_TOPIC,
+//       TRANSFER_TOPIC,
+//     );
+
+//     const initState = await fetchPoolState(pool, startBlockNumber);
+//     console.log('initState', initState);
+
+//     // console.log(await pool.getState(startBlockNumber));
+
+//     const vaultLogs = await dexHelper.provider.getLogs({
+//       fromBlock: startBlockNumber,
+//       toBlock: endBlockNumber,
+//       address: wUSDMAddress,
+//     });
+
+//     const assetLogs = await dexHelper.provider.getLogs({
+//       fromBlock: startBlockNumber,
+//       toBlock: endBlockNumber,
+//       address: USDMAddress,
+//     });
+
+//     const logsToDispatch = [...vaultLogs, ...assetLogs];
+
+//     console.log(logsToDispatch.length);
+
+//     // group logs by block number
+//     const logsByBlockNumber: Record<number, any[]> = {};
+//     for (let log of logsToDispatch) {
+//       if (!logsByBlockNumber[log.blockNumber]) {
+//         logsByBlockNumber[log.blockNumber] = [];
+//       }
+//       logsByBlockNumber[log.blockNumber].push(log);
+//     }
+
+//     Object.keys(logsByBlockNumber).forEach(blockNumber => {
+//       logsByBlockNumber[Number(blockNumber)] = logsByBlockNumber[
+//         Number(blockNumber)
+//       ].sort((a, b) => a.logIndex - b.logIndex);
+//     });
+
+//     const sortedBlocks = Object.keys(logsByBlockNumber)
+//       .map(Number)
+//       .sort((a, b) => Number(a) - Number(b));
+
+//     for (let blockNumber of sortedBlocks) {
+//       console.log('blockNumber', blockNumber);
+//       if (!blockHeaders[blockNumber]) {
+//         blockHeaders[blockNumber] = await dexHelper.web3Provider.eth.getBlock(
+//           blockNumber,
+//         );
+//       }
+
+//       await pool?.update(logsByBlockNumber[blockNumber], {
+//         [blockNumber]: blockHeaders[blockNumber],
+//       });
+//     }
+
+//     const state = pool?.getState(startBlockNumber);
+//     const expectedState = await fetchPoolState(pool, endBlockNumber);
+//     console.log('state', state, 'expectedState', expectedState);
+//     return _.isEqual(state, expectedState);
+//   } catch (error) {
+//     console.log('error', error);
+//     return false;
+//   }
+// }
+
+// //
+
+// async function makeStaticCall(
+//   contractAddress: string,
+//   calldata: string,
+//   blockNumber: number,
+// ): Promise<string> {
+//   const dexHelper = new DummyDexHelper(Network.GNOSIS);
+//   const result = await dexHelper.web3Provider.eth.call(
+//     {
+//       to: contractAddress,
+//       data: calldata,
+//     },
+//     blockNumber,
+//   );
+//   const resultNumber = ethers.BigNumber.from(result).toBigInt();
+//   console.log('result', blockNumber, resultNumber);
+//   return result;
+// }
+
+// // makeStaticCall(
+// //   '0xaf204776c7245bf4147c2612bf6e5972ee483701',
+// //   '0x01e1d114',
+// //   38964253,
+// // );
+
+// const brokenBlockNumber = 38964315;
+// checkPoolStateForBlockRange(
+//   brokenBlockNumber - 100,
+//   brokenBlockNumber + 100,
+//   //   38964251,
+//   //   38964254,
+// ).then(result => {
+//   console.log('isEqual', result);
+// });
+
+// // makeStaticCall(
+// //   '0xDDAfbb505ad214D7b80b1f830fcCc89B60fb7A83',
+// //   '0x70a082310000000000000000000000000b338c79644d73d188086c38ff5cc858a76b1162',
+// //   39018709,
+// // );

package/src/dex/{wusdm → erc4626}/types.ts

@@ -1,22 +1,22 @@
 import { Address } from '../../types';
 
-export type WusdmPoolState = {
+export type ERC4626PoolState = {
   totalShares: bigint;
   totalAssets: bigint;
 };
 
-export type WUSDMData = {
+export type ERC4626Data = {
   exchange: string;
 };
 
-export enum WUSDMFunctions {
+export enum ERC4626Functions {
   deposit = 'deposit',
   redeem = 'redeem',
   withdraw = 'withdraw',
   mint = 'mint',
 }
 
-export type WusdmParams = {
-  wUSDMAddress: Address;
-  USDMAddress: Address;
+export type ERC4626Params = {
+  vault: Address;
+  asset: Address;
 };

package/src/dex/index.ts

@@ -58,7 +58,7 @@ import { CurveV1StableNg } from './curve-v1-stable-ng/curve-v1-stable-ng';
 import { curveV1Merge } from './curve-v1-factory/optimizer';
 import { GenericRFQ } from './generic-rfq/generic-rfq';
 import { WstETH } from './wsteth/wsteth';
-import { WUSDM } from './wusdm/wusdm';
+import { ERC4626 } from './erc4626/erc4626';
 import { Camelot } from './camelot/camelot';
 import { Hashflow } from './hashflow/hashflow';
 import { Infusion } from './infusion/infusion';
@@ -169,7 +169,7 @@ const Dexes = [
   CurveV1Factory,
   CurveV1StableNg,
   WstETH,
-  WUSDM,
+  ERC4626,
   Hashflow,
   Infusion,
   MaverickV1,

package/tests/constants-e2e.ts

@@ -1954,7 +1954,7 @@ export const Holders: {
     USDCe: '0xA67EFB69A4f58F568aAB1b9d51110102985835b0',
     USDCn: '0x4B6f17856215eab57c29ebfA18B0a0F74A3627bb',
     USDM: '0x57F5E098CaD7A3D1Eed53991D4d66C45C9AF7812',
-    wUSDM: '0x76272a79F7e529247b663fC8857BD69244b0d412',
+    wUSDM: '0xC98D785ECEEa2b074fffc24F682c8AD9fA2D9D8d',
     TRYB: '0xD05007f1BD1304bFAEb370Ec5EbD18fD02a581e6',
   },
   [Network.FANTOM]: {

package/.idea/aws.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="activeRegion" value="us-east-1" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-    <option name="recentlyUsedRegions">
-      <list>
-        <option value="us-east-1" />
-      </list>
-    </option>
-  </component>
-</project>

package/.idea/codeStyles/Project.xml

@@ -1,19 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACKETS" value="true" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" filepath="$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/paraswap-dex-lib.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/prettier.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myRunOnSave" value="true" />
-    <option name="myRunOnReformat" value="true" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

package/build/abi/integral/factory.json

@@ -1,333 +0,0 @@
-[
-    {
-        "inputs": [],
-        "stateMutability": "nonpayable",
-        "type": "constructor"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": false,
-                "internalType": "address",
-                "name": "owner",
-                "type": "address"
-            }
-        ],
-        "name": "OwnerSet",
-        "type": "event"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "token0",
-                "type": "address"
-            },
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "token1",
-                "type": "address"
-            },
-            {
-                "indexed": false,
-                "internalType": "address",
-                "name": "pair",
-                "type": "address"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "name": "PairCreated",
-        "type": "event"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "uint256",
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "name": "allPairs",
-        "outputs": [
-            {
-                "internalType": "address",
-                "name": "",
-                "type": "address"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "allPairsLength",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "tokenA",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "tokenB",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "to",
-                "type": "address"
-            }
-        ],
-        "name": "collect",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "tokenA",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "tokenB",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "oracle",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "trader",
-                "type": "address"
-            }
-        ],
-        "name": "createPair",
-        "outputs": [
-            {
-                "internalType": "address",
-                "name": "pair",
-                "type": "address"
-            }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "",
-                "type": "address"
-            }
-        ],
-        "name": "getPair",
-        "outputs": [
-            {
-                "internalType": "address",
-                "name": "",
-                "type": "address"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "owner",
-        "outputs": [
-            {
-                "internalType": "address",
-                "name": "",
-                "type": "address"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "tokenA",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "tokenB",
-                "type": "address"
-            },
-            {
-                "internalType": "uint256",
-                "name": "fee",
-                "type": "uint256"
-            }
-        ],
-        "name": "setBurnFee",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "tokenA",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "tokenB",
-                "type": "address"
-            },
-            {
-                "internalType": "uint256",
-                "name": "fee",
-                "type": "uint256"
-            }
-        ],
-        "name": "setMintFee",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "tokenA",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "tokenB",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "oracle",
-                "type": "address"
-            }
-        ],
-        "name": "setOracle",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "_owner",
-                "type": "address"
-            }
-        ],
-        "name": "setOwner",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "tokenA",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "tokenB",
-                "type": "address"
-            },
-            {
-                "internalType": "uint256",
-                "name": "fee",
-                "type": "uint256"
-            }
-        ],
-        "name": "setSwapFee",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "tokenA",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "tokenB",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "trader",
-                "type": "address"
-            }
-        ],
-        "name": "setTrader",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "tokenA",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "tokenB",
-                "type": "address"
-            },
-            {
-                "internalType": "uint256",
-                "name": "amount",
-                "type": "uint256"
-            },
-            {
-                "internalType": "address",
-                "name": "to",
-                "type": "address"
-            }
-        ],
-        "name": "withdraw",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    }
-]