Sdai adapter and substream

evm/src/sDai/manifest.yaml

@@ -22,6 +22,7 @@ instances:
       id: 1
     arguments:
       - "0x83F20F44975D03b1b09e64809B757c47f942BEeA"
+      - "0x6B175474E89094C44Da98b954EedeAC495271d0F"
 
 # Specify some automatic test cases in case getPoolIds and
 # getTokens are not implemented.

evm/src/sDai/sDaiSwapAdapter.sol

@@ -16,9 +16,9 @@ contract sDaiSwapAdapter is ISwapAdapter {
     ISavingsDai immutable savingsDai;
     IERC20 immutable dai;
 
-    constructor(address savingsDai_) {
+    constructor(address savingsDai_, address dai_) {
         savingsDai = ISavingsDai(savingsDai_);
-        dai = IERC20(address(0x6B175474E89094C44Da98b954EedeAC495271d0F));
+        dai = IERC20(dai_);
     }
 
     /// @dev Check if swap between provided sellToken and buyToken are supported
@@ -86,9 +86,6 @@ contract sDaiSwapAdapter is ISwapAdapter {
     }
 
     /// @inheritdoc ISwapAdapter
-    /// @dev Limits are underestimated to 90% of totalSupply as both Dai and
-    /// sDai
-    // have no limits but revert in some cases
     function getLimits(
         bytes32,
         address sellToken,
@@ -97,14 +94,12 @@ contract sDaiSwapAdapter is ISwapAdapter {
         limits = new uint256[](2);
 
         if (sellToken == address(dai)) {
-            limits[0] =
-                ((dai.totalSupply() - dai.balanceOf(address(savingsDai))) *
-                    90) /
-                100;
-            limits[1] = savingsDai.previewDeposit(limits[0]);
+            limits[0] = 3 * (10 ** 24);
+            limits[1] = limits[0];
         } else {
-            limits[0] = (savingsDai.totalSupply() * 90) / 100;
-            limits[1] = savingsDai.previewRedeem(limits[0]);
+            uint256 totalAssets = savingsDai.totalAssets();
+            limits[0] = savingsDai.previewWithdraw(totalAssets);
+            limits[1] = totalAssets;
         }
     }
 
@@ -213,6 +208,8 @@ interface ISavingsDai is IERC20 {
 
     function previewRedeem(uint256 shares) external view returns (uint256);
 
+    function totalAssets() external view returns (uint256);
+
     function totalSupply() external pure returns (uint256);
 
     function deposit(

evm/test/sDaiSwapAdapter.t.sol

@@ -28,7 +28,7 @@ contract sDaiSwapAdapterTest is Test, ISwapAdapterTypes, AdapterTest {
     function setUp() public {
         uint256 forkBlock = 19866715;
         vm.createSelectFork(vm.rpcUrl("mainnet"), forkBlock);
-        adapter = new sDaiSwapAdapter(SDAI_ADDRESS);
+        adapter = new sDaiSwapAdapter(SDAI_ADDRESS, DAI_ADDRESS);
     }
 
     function testPriceFuzzDaiForSDai(uint256 amount0, uint256 amount1) public {

substreams/ethereum-sdai/src/modules.rs

@@ -272,7 +272,7 @@ fn find_deployed_underlying_address(vault_address: &[u8]) -> Option<[u8; 20]> {
         // sDai
         hex!("83F20F44975D03b1b09e64809B757c47f942BEeA") => {
             // Dai
-            Some(hex!("6b175474e89094c44da98b954eedeac495271d0f"))
+            Some(hex!("6B175474E89094C44Da98b954EedeAC495271d0F"))
         }
         _ => None,
     }