From 2db101a7922b9fa5981052d688b433cd5951383d Mon Sep 17 00:00:00 2001
From: Shriya Tyagi <shriya243@gmail.com>
Date: Sun, 7 Aug 2022 03:40:43 +0800
Subject: [PATCH 1/8] sub-acc transfers updated

---
 contracts/mainnet/connectors/euler/interface.sol | 4 ++--
 contracts/mainnet/connectors/euler/main.sol      | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/contracts/mainnet/connectors/euler/interface.sol b/contracts/mainnet/connectors/euler/interface.sol
index c4f13ac4..88b4150c 100644
--- a/contracts/mainnet/connectors/euler/interface.sol
+++ b/contracts/mainnet/connectors/euler/interface.sol
@@ -36,7 +36,7 @@ interface IEulerEToken {
 
 	function balanceOf(address account) external view returns (uint256);
 
-	function transfer(address to, uint256 amount) external returns (bool);
+	function transferFrom(address from, address to, uint amount) external returns (bool);
 
 	function approve(address spender, uint256 amount) external returns (bool);
 }
@@ -55,7 +55,7 @@ interface IEulerDToken {
 
 	function balanceOf(address account) external view returns (uint256);
 
-	function transfer(address to, uint256 amount) external returns (bool);
+	function transferFrom(address from, address to, uint amount) external returns (bool);
 
 	function approveDebt(
 		uint256 subAccountId,
diff --git a/contracts/mainnet/connectors/euler/main.sol b/contracts/mainnet/connectors/euler/main.sol
index 070832bf..cd0d787c 100644
--- a/contracts/mainnet/connectors/euler/main.sol
+++ b/contracts/mainnet/connectors/euler/main.sol
@@ -305,9 +305,10 @@ abstract contract Euler is Helpers {
 
 		if (isEth) convertEthToWeth(isEth, TokenInterface(_token), _amt);
 
+		address _subAccountFromAddr = getSubAccount(address(this), subAccountFrom);
 		address _subAccountToAddr = getSubAccount(address(this), subAccountTo);
 
-		eToken.transfer(_subAccountToAddr, _amt);
+		eToken.transferFrom(_subAccountFromAddr, _subAccountToAddr, _amt);
 
 		setUint(setId, _amt);
 
@@ -357,8 +358,9 @@ abstract contract Euler is Helpers {
 
 		if (isEth) convertEthToWeth(isEth, TokenInterface(_token), _amt);
 
+		address _subAccountFromAddr = getSubAccount(address(this), subAccountFrom);
 		address _subAccountToAddr = getSubAccount(address(this), subAccountTo);
-		dToken.transfer(_subAccountToAddr, amt);
+		dToken.transferFrom(_subAccountFromAddr, _subAccountToAddr, _amt);
 
 		setUint(setId, _amt);
 

From be540b4ba8ed02e5e9d31cf3617782bf36159c54 Mon Sep 17 00:00:00 2001
From: Shriya Tyagi <shriya243@gmail.com>
Date: Sun, 7 Aug 2022 03:49:24 +0800
Subject: [PATCH 2/8] updated testcases

---
 test/mainnet/euler/euler.test.ts | 162 +++++++++++++++++++++++++++----
 1 file changed, 143 insertions(+), 19 deletions(-)

diff --git a/test/mainnet/euler/euler.test.ts b/test/mainnet/euler/euler.test.ts
index 01bedf09..d6215098 100644
--- a/test/mainnet/euler/euler.test.ts
+++ b/test/mainnet/euler/euler.test.ts
@@ -181,7 +181,26 @@ describe("Euler", function () {
 
         await tx.wait();
     });
-    it("Should borrow DAI into DSA wallet", async function () {
+
+    it("Should deposit in sub-account 1", async function () {
+      const spells = [
+        {
+          connector: connectorName,
+          method: "deposit",
+          args: ["1", tokens.usdc.address, "10000000", "true", "0", "0"],
+        },
+      ];
+
+      const tx = await dsaWallet0
+          .connect(wallet0)
+          .cast(...encodeSpells(spells), wallet1.getAddress());
+
+      await tx.wait();
+      expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(
+        parseUnits('1', 18)
+      );
+  })
+    it("Should borrow DAI into DSA wallet sub-account 0", async function () {
         const spells = [
           {
             connector: connectorName,
@@ -199,12 +218,12 @@ describe("Euler", function () {
           parseUnits('1', 18)
         );
     })
-    it("Should repay DAI", async function () {
+    it("Should repay DAI sub-account 0", async function () {
       const spells = [
         {
           connector: connectorName,
           method: "repay",
-          args: ["0", tokens.dai.address, "1000000000000000", "0", "0"],
+          args: ["0", tokens.dai.address, "500000000000000000", "0", "0"],
         },
       ];
 
@@ -218,7 +237,7 @@ describe("Euler", function () {
       );
     })
 
-    it("Should withdraw USDC into DSA wallet", async function () {
+    it("Should withdraw USDC into DSA wallet from sub-account 0", async function () {
       const spells = [
         {
           connector: connectorName,
@@ -234,12 +253,46 @@ describe("Euler", function () {
       await tx.wait();
     })
 
-    it("Should eTransfer to subAccount 2", async function () {
+    it("Should borrow ENS into DSA wallet sub-account 1", async function () {
+      const spells = [
+        {
+          connector: connectorName,
+          method: "borrow",
+          args: ["1", tokens.ens.address, "100000000000000", "0", "0"],
+        },
+      ];
+
+      const tx = await dsaWallet0
+          .connect(wallet0)
+          .cast(...encodeSpells(spells), wallet1.getAddress());
+
+      await tx.wait();
+      expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(
+        parseUnits('1', 18)
+      );
+  })
+  it("Should withdraw USDC from sub-account 1", async function () {
+    const spells = [
+      {
+        connector: connectorName,
+        method: "withdraw",
+        args: ["1", tokens.usdc.address, "20000", "0", "0"],
+      },
+    ];
+
+    const tx = await dsaWallet0
+        .connect(wallet0)
+        .cast(...encodeSpells(spells), wallet1.getAddress());
+
+    await tx.wait();
+  })
+
+    it("Should eTransfer from subAccount 0 to sub account 2", async function () {
       const spells = [
         {
           connector: connectorName,
           method: "eTransfer",
-          args: ["0", "1", tokens.usdc.address, "1000000", "0", "0"],
+          args: ["0", "2", tokens.usdc.address, "2000000", "0", "0"],
         },
       ];
 
@@ -250,26 +303,97 @@ describe("Euler", function () {
       await tx.wait();
     })
 
-    it("Should dTransfer to subAccount 2", async function () {
-      const spell = [
+    it("Should eTransfer from subAccount 1 to sub account 2", async function () {
+      const spells = [
         {
           connector: connectorName,
-          method: "deposit",
-          args: ["1", tokens.usdc.address, "10000000", "true", "0", "0"],
+          method: "eTransfer",
+          args: ["1", "2", tokens.usdc.address, "10000", "0", "0"],
         },
       ];
 
-      const txn = await dsaWallet0
+      const tx = await dsaWallet0
           .connect(wallet0)
-          .cast(...encodeSpells(spell), wallet1.getAddress());
+          .cast(...encodeSpells(spells), wallet1.getAddress());
 
-      await txn.wait();
+      await tx.wait();
+    })
+
+    it("Should eTransfer from subAccount 2 to sub account 0", async function () {
+      const spells = [
+        {
+          connector: connectorName,
+          method: "eTransfer",
+          args: ["2", "0", tokens.usdc.address, "10000", "0", "0"],
+        },
+      ];
+
+      const tx = await dsaWallet0
+          .connect(wallet0)
+          .cast(...encodeSpells(spells), wallet1.getAddress());
+
+      await tx.wait();
+    })
+
+    it("Should deposit in sub-account 2", async function () {
+      const spells = [
+        {
+          connector: connectorName,
+          method: "deposit",
+          args: ["2", tokens.usdc.address, "10000000", "true", "0", "0"],
+        },
+      ];
+
+      const tx = await dsaWallet0
+          .connect(wallet0)
+          .cast(...encodeSpells(spells), wallet1.getAddress());
+
+      await tx.wait();
+      expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(
+        parseUnits('1', 18)
+      );
+  })
+
+    it("Should dTransfer from subAccount 0 to sub account 2", async function () {
+      const spells = [
+        {
+          connector: connectorName,
+          method: "dTransfer",
+          args: ["0", "2", tokens.dai.address, "50000000000000", "0", "0"],
+        },
+      ];
+
+      const tx = await dsaWallet0
+          .connect(wallet0)
+          .cast(...encodeSpells(spells), wallet1.getAddress());
+
+      await tx.wait();
+    })
+
+    it("Should dTransfer from subAccount 1 to sub account 2", async function () {
 
       const spells = [
         {
           connector: connectorName,
           method: "dTransfer",
-          args: ["0", "1", tokens.dai.address, "100000000000000000", "0", "0"],
+          args: ["1", "2", tokens.ens.address, "100000", "0", "0"],
+        },
+      ];
+
+      const tx = await dsaWallet0
+          .connect(wallet0)
+          .cast(...encodeSpells(spells), wallet1.getAddress());
+
+      await tx.wait();
+    })
+
+    it("Should dTransfer from sub account 2 to subAccount 0", async function () {
+
+      const spells = [
+        {
+          connector: connectorName,
+          method: "dTransfer",
+          args: ["2", "0", tokens.dai.address, "5000000000000", "0", "0"],
         },
       ];
 
@@ -328,13 +452,13 @@ describe("Euler", function () {
       await txn.wait();
     });
 
-    it("Should mint", async function () {
+    it("Should mint in sub-account 3", async function () {
 
       const spells = [
         {
           connector: connectorName,
           method: "deposit",
-          args: ["2", tokens.weth.address, "1000000000000000000", "true", "0", "0"],
+          args: ["3", tokens.weth.address, "1000000000000000000", "true", "0", "0"],
         },
       ];
 
@@ -348,7 +472,7 @@ describe("Euler", function () {
         {
           connector: connectorName,
           method: "mint",
-          args: ["2", tokens.weth.address, "100000000", "0", "0"],
+          args: ["3", tokens.weth.address, "100000000", "0", "0"],
         },
       ];
 
@@ -359,12 +483,12 @@ describe("Euler", function () {
       await txn.wait();
     })
 
-    it("Should burn", async function () {
+    it("Should burn in sub account 3", async function () {
       const spell = [
         {
           connector: connectorName,
           method: "burn",
-          args: ["2", tokens.weth.address, "10000000", "0", "0"],
+          args: ["3", tokens.weth.address, "10000000", "0", "0"],
         },
       ];
 

From ef50cf7188e6663e5402240693aa273edcf4c3ae Mon Sep 17 00:00:00 2001
From: Shriya Tyagi <shriya243@gmail.com>
Date: Thu, 11 Aug 2022 04:37:03 +0800
Subject: [PATCH 3/8] new updates

---
 .../mainnet/connectors/euler/helpers.sol      |  2 -
 .../mainnet/connectors/euler/interface.sol    | 16 +---
 contracts/mainnet/connectors/euler/main.sol   | 88 +++----------------
 scripts/tests/mainnet/tokens.ts               |  7 ++
 test/mainnet/euler/euler.test.ts              | 40 +++++----
 5 files changed, 41 insertions(+), 112 deletions(-)

diff --git a/contracts/mainnet/connectors/euler/helpers.sol b/contracts/mainnet/connectors/euler/helpers.sol
index 73660049..a38342f1 100644
--- a/contracts/mainnet/connectors/euler/helpers.sol
+++ b/contracts/mainnet/connectors/euler/helpers.sol
@@ -10,8 +10,6 @@ contract Helpers is Basic, Events {
 		0x27182842E098f60e3D576794A5bFFb0777E025d3;
 	IEulerMarkets internal constant markets =
 		IEulerMarkets(0x3520d5a913427E6F0D6A83E07ccD4A4da316e4d3);
-	IEulerSwap internal constant swapExec =
-		IEulerSwap(0x7123C8cBBD76c5C7fCC9f7150f23179bec0bA341);
 
 	struct swapHelper {
 		address _sellAddr;
diff --git a/contracts/mainnet/connectors/euler/interface.sol b/contracts/mainnet/connectors/euler/interface.sol
index 88b4150c..594c068b 100644
--- a/contracts/mainnet/connectors/euler/interface.sol
+++ b/contracts/mainnet/connectors/euler/interface.sol
@@ -36,6 +36,8 @@ interface IEulerEToken {
 
 	function balanceOf(address account) external view returns (uint256);
 
+	function balanceOfUnderlying(address account) external view returns (uint);
+
 	function transferFrom(address from, address to, uint amount) external returns (bool);
 
 	function approve(address spender, uint256 amount) external returns (bool);
@@ -63,17 +65,3 @@ interface IEulerDToken {
 		uint256 amount
 	) external returns (bool);
 }
-
-struct Swap1InchParams {
-		uint256 subAccountIdIn;
-		uint256 subAccountIdOut;
-		address underlyingIn;
-		address underlyingOut;
-		uint256 amount;
-		uint256 amountOutMinimum;
-		bytes payload;
-}
-
-interface IEulerSwap {
-	function swap1Inch(Swap1InchParams memory) external;
-}
diff --git a/contracts/mainnet/connectors/euler/main.sol b/contracts/mainnet/connectors/euler/main.sol
index cd0d787c..45d9847a 100644
--- a/contracts/mainnet/connectors/euler/main.sol
+++ b/contracts/mainnet/connectors/euler/main.sol
@@ -95,7 +95,7 @@ abstract contract Euler is Helpers {
 
 		TokenInterface tokenContract = TokenInterface(_token);
 		IEulerEToken eToken = IEulerEToken(markets.underlyingToEToken(_token));
-		_amt = _amt == uint256(-1) ?  eToken.balanceOf(address(this)) : _amt;
+		_amt = _amt == uint256(-1) ?  eToken.balanceOfUnderlying(address(this)) : _amt;
 		uint256 initialBal = tokenContract.balanceOf(address(this));
 
 		eToken.withdraw(subAccount, _amt);
@@ -377,104 +377,36 @@ abstract contract Euler is Helpers {
 
 	/**
 	 * @dev Approve debt.
-	 * @notice Approves receiver to take debt.
-	 * @param subAccountId Subaccount number
-	 * @param debtReceiver Address of receiver
-	 * @param token The address of the token to mint.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
-	 * @param amt The amount of the token to mint.
-	 * @param getId ID to retrieve amt.
+	 * @notice Approve sender to send debt.
+	 * @param subAccountId Subaccount id of receiver
+	 * @param debtSender Address of sender
+	 * @param token The address of the token.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
+	 * @param amt The amount of the token.
 	 * @param setId ID stores the amount of tokens deposited.
 	 */
 	function approveDebt(
 		uint256 subAccountId,
-		address debtReceiver,
+		address debtSender,
 		address token,
 		uint256 amt,
-		uint256 getId,
 		uint256 setId
 	)
 		external
 		payable
 		returns (string memory _eventName, bytes memory _eventParam)
 	{
-		uint256 _amt = getUint(getId, amt);
 
 		bool isEth = token == ethAddr;
 		address _token = isEth ? wethAddr : token;
 
 		IEulerDToken dToken = IEulerDToken(markets.underlyingToDToken(_token));
 
-		dToken.approveDebt(subAccountId, debtReceiver, _amt);
+		dToken.approveDebt(subAccountId, debtSender, amt);
 
-		setUint(setId, _amt);
+		setUint(setId, amt);
 
 		_eventName = "LogApproveDebt(uint256,address,address,uint256)";
-		_eventParam = abi.encode(subAccountId, debtReceiver, token, _amt);
-	}
-
-	/**
-	 * @dev Swap.
-	 * @notice Executes swap.
-	 * @param params swapParams struct
-	 */
-	function swap(swapParams memory params)
-		external
-		payable
-		returns (string memory _eventName, bytes memory _eventParam)
-	{
-		swapHelper memory helperParams;
-
-		helperParams._sellAddr = params.sellAddr == ethAddr
-			? wethAddr
-			: params.sellAddr;
-		helperParams._buyAddr = params.sellAddr == ethAddr
-			? wethAddr
-			: params.buyAddr;
-
-		TokenInterface sellToken = TokenInterface(helperParams._sellAddr);
-		TokenInterface buyToken = TokenInterface(helperParams._buyAddr);
-
-		approve(sellToken, address(swapExec), params.sellAmt);
-
-		(helperParams._buyDec, helperParams._sellDec) = getTokensDec(
-			buyToken,
-			sellToken
-		);
-		helperParams._sellAmt18 = convertTo18(
-			helperParams._sellDec,
-			params.sellAmt
-		);
-		helperParams._slippageAmt = convert18ToDec(
-			helperParams._buyDec,
-			wmul(params.unitAmt, helperParams._sellAmt18)
-		);
-
-		Swap1InchParams memory oneInchParams = Swap1InchParams({
-				subAccountIdIn: params.subAccountFrom,
-				subAccountIdOut: params.subAccountTo,
-				underlyingIn: helperParams._sellAddr,
-				underlyingOut: helperParams._buyAddr,
-				amount: params.sellAmt,
-				amountOutMinimum: helperParams._slippageAmt,
-				payload: params.callData
-			});
-
-		swapExec.swap1Inch(oneInchParams);
-
-		if (!checkIfEnteredMarket(helperParams._buyAddr)) {
-			markets.enterMarket(params.subAccountTo, helperParams._buyAddr);
-		}
-
-		_eventName = "LogSwap(uint256,uint256,address,address,uint256,uint256,bytes)";
-		_eventParam = abi.encode(
-			params.subAccountFrom,
-			params.subAccountTo,
-			params.buyAddr,
-			params.sellAddr,
-			params.sellAmt,
-			params.unitAmt,
-			params.callData
-		);
+		_eventParam = abi.encode(subAccountId, debtSender, token, amt);
 	}
 
 	/**
diff --git a/scripts/tests/mainnet/tokens.ts b/scripts/tests/mainnet/tokens.ts
index b3f26d76..54e1c0bc 100644
--- a/scripts/tests/mainnet/tokens.ts
+++ b/scripts/tests/mainnet/tokens.ts
@@ -34,6 +34,13 @@ export const tokens = {
     name: "Wrapped Ether",
     address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
     decimals: 18
+  },
+  ens: {
+    type: "token",
+    symbol: "ENS",
+    name: "Etherem Name Services",
+    address: "0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72",
+    decimals: 18
   }
 };
 
diff --git a/test/mainnet/euler/euler.test.ts b/test/mainnet/euler/euler.test.ts
index d6215098..7e271f44 100644
--- a/test/mainnet/euler/euler.test.ts
+++ b/test/mainnet/euler/euler.test.ts
@@ -12,6 +12,24 @@ import { tokens } from "../../../scripts/tests/mainnet/tokens";
 const { ethers } = hre;
 import type { Signer, Contract } from "ethers";
 
+const USDC = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'
+const ACC_USDC = '0xe78388b4ce79068e89bf8aa7f218ef6b9ab0e9d0'
+const Usdc = parseUnits('5000', 6)
+
+const DAI = '0x6b175474e89094c44da98b954eedeac495271d0f'
+const ACC_DAI = '0xcd6Eb888e76450eF584E8B51bB73c76ffBa21FF2'
+const Dai = parseUnits('5000', 18)
+
+const WETH = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'
+const ACC_WETH = '0x05547D4e1A2191B91510Ea7fA8555a2788C70030'
+const Weth = parseUnits('50', 18)
+
+const token_usdc = new ethers.Contract(
+  USDC,
+  IERC20__factory.abi,
+  ethers.provider,
+)
+
 describe("Euler", function () {
   const connectorName = "EULER-TEST-A";
   let connector: any;
@@ -21,18 +39,6 @@ describe("Euler", function () {
   let instaConnectorsV2: Contract;
   let masterSigner: Signer;
 
-  const USDC = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'
-  const ACC_USDC = '0xe78388b4ce79068e89bf8aa7f218ef6b9ab0e9d0'
-  const Usdc = parseUnits('5000', 6)
-
-  const DAI = '0x6b175474e89094c44da98b954eedeac495271d0f'
-  const ACC_DAI = '0xcd6Eb888e76450eF584E8B51bB73c76ffBa21FF2'
-  const Dai = parseUnits('5000', 18)
-
-  const WETH = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'
-  const ACC_WETH = '0x05547D4e1A2191B91510Ea7fA8555a2788C70030'
-  const Weth = parseUnits('50', 18)
-
   before(async () => {
     await hre.network.provider.request({
       method: "hardhat_reset",
@@ -84,11 +90,6 @@ describe("Euler", function () {
     });
 
     it("Deposit USDC into DSA wallet", async function () {
-      const token_usdc = new ethers.Contract(
-          USDC,
-          IERC20__factory.abi,
-          ethers.provider,
-      )
 
       await hre.network.provider.request({
           method: 'hardhat_impersonateAccount',
@@ -251,6 +252,9 @@ describe("Euler", function () {
           .cast(...encodeSpells(spells), wallet1.getAddress());
 
       await tx.wait();
+      expect(await token_usdc.connect(masterSigner).balanceOf(dsaWallet0.address)).to.be.gte(
+        parseUnits('2', 6)
+      );
     })
 
     it("Should borrow ENS into DSA wallet sub-account 1", async function () {
@@ -409,7 +413,7 @@ describe("Euler", function () {
         {
           connector: connectorName,
           method: "approveDebt",
-          args: ["0", "0x9F60699cE23f1Ab86Ec3e095b477Ff79d4f409AD", tokens.dai.address, "10000000", "0", "0"],
+          args: ["0", "0x85c2ac24a8BD9Ff6E2Ef6cf76C198E36550f41D7", tokens.dai.address, "10000000", "0"],
         },
       ];
 

From d2700b42e3bf5196a7938b1e497d1ac036c6f422 Mon Sep 17 00:00:00 2001
From: Shriya Tyagi <shriya243@gmail.com>
Date: Thu, 11 Aug 2022 05:14:39 +0800
Subject: [PATCH 4/8] added dsa check

---
 contracts/mainnet/connectors/euler/main.sol | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contracts/mainnet/connectors/euler/main.sol b/contracts/mainnet/connectors/euler/main.sol
index 45d9847a..9b31ec1e 100644
--- a/contracts/mainnet/connectors/euler/main.sol
+++ b/contracts/mainnet/connectors/euler/main.sol
@@ -395,6 +395,7 @@ abstract contract Euler is Helpers {
 		payable
 		returns (string memory _eventName, bytes memory _eventParam)
 	{
+		require(instaList.accountID(debtSender) != 0, "not-a-DSA");
 
 		bool isEth = token == ethAddr;
 		address _token = isEth ? wethAddr : token;

From 79d88be34e5d71b9132ccea04224c8722f6c0ba2 Mon Sep 17 00:00:00 2001
From: Shriya Tyagi <shriya243@gmail.com>
Date: Thu, 11 Aug 2022 05:39:53 +0800
Subject: [PATCH 5/8] approve renamed

---
 contracts/mainnet/connectors/euler/main.sol | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/contracts/mainnet/connectors/euler/main.sol b/contracts/mainnet/connectors/euler/main.sol
index 9b31ec1e..289d211b 100644
--- a/contracts/mainnet/connectors/euler/main.sol
+++ b/contracts/mainnet/connectors/euler/main.sol
@@ -376,7 +376,7 @@ abstract contract Euler is Helpers {
 	}
 
 	/**
-	 * @dev Approve debt.
+	 * @dev Approve Spender's debt.
 	 * @notice Approve sender to send debt.
 	 * @param subAccountId Subaccount id of receiver
 	 * @param debtSender Address of sender
@@ -384,7 +384,7 @@ abstract contract Euler is Helpers {
 	 * @param amt The amount of the token.
 	 * @param setId ID stores the amount of tokens deposited.
 	 */
-	function approveDebt(
+	function approveSpenderDebt(
 		uint256 subAccountId,
 		address debtSender,
 		address token,
@@ -395,7 +395,6 @@ abstract contract Euler is Helpers {
 		payable
 		returns (string memory _eventName, bytes memory _eventParam)
 	{
-		require(instaList.accountID(debtSender) != 0, "not-a-DSA");
 
 		bool isEth = token == ethAddr;
 		address _token = isEth ? wethAddr : token;

From 34a4ad41bd25cce9fcda2f59cce6ceacafefa387 Mon Sep 17 00:00:00 2001
From: Shriya Tyagi <shriya243@gmail.com>
Date: Sat, 13 Aug 2022 02:56:20 +0800
Subject: [PATCH 6/8] new fixes

---
 contracts/mainnet/connectors/euler/events.sol | 39 +++++++------------
 contracts/mainnet/connectors/euler/main.sol   | 26 +++++++------
 test/mainnet/euler/euler.test.ts              | 34 +++++++++++++++-
 3 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/contracts/mainnet/connectors/euler/events.sol b/contracts/mainnet/connectors/euler/events.sol
index d36db4cf..be8770f6 100644
--- a/contracts/mainnet/connectors/euler/events.sol
+++ b/contracts/mainnet/connectors/euler/events.sol
@@ -52,8 +52,8 @@ contract Events {
 	);
 
 	event LogETransfer(
-		uint256 subAccount1,
-		uint256 subAccount2,
+		uint256 subAccountFrom,
+		uint256 subAccountTo,
 		address token,
 		uint256 amount,
 		uint256 getId,
@@ -61,31 +61,20 @@ contract Events {
 	);
 
 	event LogDTransfer(
-		uint256 subAccount1,
-		uint256 subAccount2,
-		address token,
-		uint256 amount,
-		uint256 getId,
-		uint256 setId
-	);
-
-	event LogApproveDebt(
-		uint256 subAccountId,
-		address debtReceiver,
-		address token,
-		uint256 amount,
-		uint256 getId,
-		uint256 setId
-	);
-
-	event LogSwap(
 		uint256 subAccountFrom,
 		uint256 subAccountTo,
-		address buyAddr,
-		address sellAddr,
-		uint256 sellAmt,
-		uint256 unitAmt,
-		bytes callData
+		address token,
+		uint256 amount,
+		uint256 getId,
+		uint256 setId
+	);
+
+	event LogApproveSpenderDebt(
+		uint256 subAccountId,
+		address debtSender,
+		address token,
+		uint256 amount,
+		uint256 setId
 	);
 
 	event LogEnterMarket(uint256 subAccountId, address[] newMarkets);
diff --git a/contracts/mainnet/connectors/euler/main.sol b/contracts/mainnet/connectors/euler/main.sol
index 289d211b..ef16ccab 100644
--- a/contracts/mainnet/connectors/euler/main.sol
+++ b/contracts/mainnet/connectors/euler/main.sol
@@ -95,7 +95,9 @@ abstract contract Euler is Helpers {
 
 		TokenInterface tokenContract = TokenInterface(_token);
 		IEulerEToken eToken = IEulerEToken(markets.underlyingToEToken(_token));
-		_amt = _amt == uint256(-1) ?  eToken.balanceOfUnderlying(address(this)) : _amt;
+
+		address _subAccount = getSubAccount(address(this), subAccount);
+		_amt = _amt == uint256(-1) ?  eToken.balanceOfUnderlying(_subAccount) : _amt;
 		uint256 initialBal = tokenContract.balanceOf(address(this));
 
 		eToken.withdraw(subAccount, _amt);
@@ -178,7 +180,8 @@ abstract contract Euler is Helpers {
 			markets.underlyingToDToken(_token)
 		);
 
-		_amt = _amt == uint256(-1) ? borrowedDToken.balanceOf(address(this)) : _amt;
+		address _subAccount = getSubAccount(address(this), subAccount);
+		_amt = _amt == uint256(-1) ? borrowedDToken.balanceOf(_subAccount) : _amt;
 		if (isEth) {
 			convertEthToWeth(isEth, TokenInterface(_token), _amt);
 		}
@@ -299,15 +302,15 @@ abstract contract Euler is Helpers {
 
 		IEulerEToken eToken = IEulerEToken(markets.underlyingToEToken(_token));
 
+		address _subAccountFromAddr = getSubAccount(address(this), subAccountFrom);
+		address _subAccountToAddr = getSubAccount(address(this), subAccountTo);
+
 		_amt = _amt == uint256(-1)
-			? eToken.balanceOf(address(this))
+			? eToken.balanceOf(_subAccountFromAddr)
 			: _amt;
 
 		if (isEth) convertEthToWeth(isEth, TokenInterface(_token), _amt);
 
-		address _subAccountFromAddr = getSubAccount(address(this), subAccountFrom);
-		address _subAccountToAddr = getSubAccount(address(this), subAccountTo);
-
 		eToken.transferFrom(_subAccountFromAddr, _subAccountToAddr, _amt);
 
 		setUint(setId, _amt);
@@ -352,14 +355,15 @@ abstract contract Euler is Helpers {
 
 		IEulerDToken dToken = IEulerDToken(markets.underlyingToDToken(_token));
 
+		address _subAccountFromAddr = getSubAccount(address(this), subAccountFrom);
+		address _subAccountToAddr = getSubAccount(address(this), subAccountTo);
+
 		_amt = _amt == uint256(-1)
-			? dToken.balanceOf(address(this))
+			? dToken.balanceOf(_subAccountFromAddr)
 			: _amt;
 
 		if (isEth) convertEthToWeth(isEth, TokenInterface(_token), _amt);
 
-		address _subAccountFromAddr = getSubAccount(address(this), subAccountFrom);
-		address _subAccountToAddr = getSubAccount(address(this), subAccountTo);
 		dToken.transferFrom(_subAccountFromAddr, _subAccountToAddr, _amt);
 
 		setUint(setId, _amt);
@@ -405,8 +409,8 @@ abstract contract Euler is Helpers {
 
 		setUint(setId, amt);
 
-		_eventName = "LogApproveDebt(uint256,address,address,uint256)";
-		_eventParam = abi.encode(subAccountId, debtSender, token, amt);
+		_eventName = "LogApproveSpenderDebt(uint256,address,address,uint256,uint256)";
+		_eventParam = abi.encode(subAccountId, debtSender, token, amt, setId);
 	}
 
 	/**
diff --git a/test/mainnet/euler/euler.test.ts b/test/mainnet/euler/euler.test.ts
index 7e271f44..f6539eaa 100644
--- a/test/mainnet/euler/euler.test.ts
+++ b/test/mainnet/euler/euler.test.ts
@@ -412,7 +412,7 @@ describe("Euler", function () {
       const spell = [
         {
           connector: connectorName,
-          method: "approveDebt",
+          method: "approveSpenderDebt",
           args: ["0", "0x85c2ac24a8BD9Ff6E2Ef6cf76C198E36550f41D7", tokens.dai.address, "10000000", "0"],
         },
       ];
@@ -502,5 +502,37 @@ describe("Euler", function () {
 
       await txn.wait();
     })
+
+    it("Should deposit in sub account 4", async function () {
+
+      const spells = [
+        {
+          connector: connectorName,
+          method: "deposit",
+          args: ["4", tokens.weth.address, "1000000000000000000", "true", "0", "0"],
+        },
+      ];
+
+      const tx = await dsaWallet0
+          .connect(wallet0)
+          .cast(...encodeSpells(spells), wallet1.getAddress());
+
+      await tx.wait();
+    })
+    it("Should withdraw from sub account 4", async function () {
+      const spell = [
+        {
+          connector: connectorName,
+          method: "withdraw",
+          args: ["4", tokens.weth.address, "115792089237316195423570985008687907853269984665640564039457584007913129639935", "0", "0"],
+        },
+      ];
+
+      const txn = await dsaWallet0
+          .connect(wallet0)
+          .cast(...encodeSpells(spell), wallet1.getAddress());
+
+      await txn.wait();
+    })
   });
 });

From a599b46dee4867c78589951c0bfc034b32a17c5f Mon Sep 17 00:00:00 2001
From: Shriya Tyagi <shriya243@gmail.com>
Date: Sun, 14 Aug 2022 18:34:45 +0800
Subject: [PATCH 7/8] Added max check in burn + minor edits

---
 .../mainnet/connectors/euler/helpers.sol      | 50 +++++++------------
 contracts/mainnet/connectors/euler/main.sol   | 16 ++++--
 test/mainnet/euler/euler.test.ts              | 14 +++---
 3 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/contracts/mainnet/connectors/euler/helpers.sol b/contracts/mainnet/connectors/euler/helpers.sol
index a38342f1..e26e9575 100644
--- a/contracts/mainnet/connectors/euler/helpers.sol
+++ b/contracts/mainnet/connectors/euler/helpers.sol
@@ -11,40 +11,10 @@ contract Helpers is Basic, Events {
 	IEulerMarkets internal constant markets =
 		IEulerMarkets(0x3520d5a913427E6F0D6A83E07ccD4A4da316e4d3);
 
-	struct swapHelper {
-		address _sellAddr;
-		address _buyAddr;
-		uint256 _buyDec;
-		uint256 _sellDec;
-		uint256 _sellAmt18;
-		uint256 _slippageAmt;
-	}
-
-	struct swapParams {
-		uint256 subAccountFrom;
-		uint256 subAccountTo;
-		address buyAddr;
-		address sellAddr;
-		uint256 sellAmt;
-		uint256 unitAmt;
-		bytes callData;
-	}
-
-	/**
-	 * @dev Get Enetered markets for a user
-	 */
-	function getEnteredMarkets()
-		internal
-		view
-		returns (address[] memory enteredMarkets)
-	{
-		enteredMarkets = markets.getEnteredMarkets(address(this));
-	}
-
 	/**
 	 * @dev Get sub account address
 	 * @param primary address of user
-	 * @param subAccountId subAccount ID
+	 * @param subAccountId sub-account id
 	 */
 	function getSubAccount(address primary, uint256 subAccountId)
 		public
@@ -55,12 +25,26 @@ contract Helpers is Basic, Events {
 		return address(uint160(primary) ^ uint160(subAccountId));
 	}
 
+	/**
+	 * @dev Get Enetered markets for a user
+	 * @param subAccountId sub-account id
+	 */
+	function getEnteredMarkets(uint256 subAccountId)
+		internal
+		view
+		returns (address[] memory enteredMarkets)
+	{
+		address _subAccountAddress = getSubAccount(address(this), subAccountId);
+		enteredMarkets = markets.getEnteredMarkets(_subAccountAddress);
+	}
+
 	/**
 	 * @dev Check if the market is entered
+	 * @param subAccountId sub-account id
 	 * @param token token address
 	 */
-	function checkIfEnteredMarket(address token) public view returns (bool) {
-		address[] memory enteredMarkets = getEnteredMarkets();
+	function checkIfEnteredMarket(uint256 subAccountId, address token) public view returns (bool) {
+		address[] memory enteredMarkets = getEnteredMarkets(subAccountId);
 		uint256 length = enteredMarkets.length;
 
 		for (uint256 i = 0; i < length; i++) {
diff --git a/contracts/mainnet/connectors/euler/main.sol b/contracts/mainnet/connectors/euler/main.sol
index ef16ccab..5c99fbf6 100644
--- a/contracts/mainnet/connectors/euler/main.sol
+++ b/contracts/mainnet/connectors/euler/main.sol
@@ -98,11 +98,11 @@ abstract contract Euler is Helpers {
 
 		address _subAccount = getSubAccount(address(this), subAccount);
 		_amt = _amt == uint256(-1) ?  eToken.balanceOfUnderlying(_subAccount) : _amt;
-		uint256 initialBal = tokenContract.balanceOf(address(this));
+		uint256 initialBal = tokenContract.balanceOf(_subAccount);
 
 		eToken.withdraw(subAccount, _amt);
 
-		uint256 finalBal = tokenContract.balanceOf(address(this));
+		uint256 finalBal = tokenContract.balanceOf(_subAccount);
 		_amt = finalBal - initialBal;
 
 		convertWethToEth(isEth, tokenContract, _amt);
@@ -259,9 +259,15 @@ abstract contract Euler is Helpers {
 		IEulerDToken dToken = IEulerDToken(markets.underlyingToDToken(_token));
 		IEulerEToken eToken = IEulerEToken(markets.underlyingToEToken(_token));
 
-		_amt = _amt == type(uint256).max
-			? dToken.balanceOf(address(this))
-			: _amt;
+		address _subAccount = getSubAccount(address(this), subAccount);
+
+		if(_amt == uint256(-1)) {
+
+			uint256 _eTokenBalance = eToken.balanceOfUnderlying(_subAccount);
+			uint256 _dTokenBalance = dToken.balanceOf(_subAccount);
+
+			_amt = _eTokenBalance <= _dTokenBalance ? _eTokenBalance : _dTokenBalance;
+		}
 
 		if (isEth) convertEthToWeth(isEth, TokenInterface(_token), _amt);
 
diff --git a/test/mainnet/euler/euler.test.ts b/test/mainnet/euler/euler.test.ts
index f6539eaa..7322299f 100644
--- a/test/mainnet/euler/euler.test.ts
+++ b/test/mainnet/euler/euler.test.ts
@@ -172,7 +172,7 @@ describe("Euler", function () {
           {
             connector: connectorName,
             method: "deposit",
-            args: ["0", tokens.usdc.address, "10000000", "true", "0", "0"],
+            args: ["0", tokens.usdc.address, "10000000", "true", "0", "0"], // 10 USDC
           },
         ];
 
@@ -188,7 +188,7 @@ describe("Euler", function () {
         {
           connector: connectorName,
           method: "deposit",
-          args: ["1", tokens.usdc.address, "10000000", "true", "0", "0"],
+          args: ["1", tokens.usdc.address, "10000000", "true", "0", "0"], // 10 USDC
         },
       ];
 
@@ -206,7 +206,7 @@ describe("Euler", function () {
           {
             connector: connectorName,
             method: "borrow",
-            args: ["0", tokens.dai.address, "1000000000000000000", "0", "0"],
+            args: ["0", tokens.dai.address, "1000000000000000000", "0", "0"], // 1 DAI
           },
         ];
 
@@ -224,7 +224,7 @@ describe("Euler", function () {
         {
           connector: connectorName,
           method: "repay",
-          args: ["0", tokens.dai.address, "500000000000000000", "0", "0"],
+          args: ["0", tokens.dai.address, "500000000000000000", "0", "0"], // 0.5 DAI
         },
       ];
 
@@ -243,7 +243,7 @@ describe("Euler", function () {
         {
           connector: connectorName,
           method: "withdraw",
-          args: ["0", tokens.usdc.address, "2000000", "0", "0"],
+          args: ["0", tokens.usdc.address, "2000000", "0", "0"], // 2 USDC
         },
       ];
 
@@ -462,7 +462,7 @@ describe("Euler", function () {
         {
           connector: connectorName,
           method: "deposit",
-          args: ["3", tokens.weth.address, "1000000000000000000", "true", "0", "0"],
+          args: ["3", tokens.dai.address, "1000000000000000000", "true", "0", "0"],
         },
       ];
 
@@ -492,7 +492,7 @@ describe("Euler", function () {
         {
           connector: connectorName,
           method: "burn",
-          args: ["3", tokens.weth.address, "10000000", "0", "0"],
+          args: ["3", tokens.weth.address, "115792089237316195423570985008687907853269984665640564039457584007913129639935", "0", "0"],
         },
       ];
 

From 2b0c84c74d8f1ec9fbb002f114a559bc6d1b7c82 Mon Sep 17 00:00:00 2001
From: Shriya Tyagi <shriya243@gmail.com>
Date: Sun, 14 Aug 2022 21:12:17 +0800
Subject: [PATCH 8/8] withdarw address -> address(this)

---
 contracts/mainnet/connectors/euler/main.sol | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/mainnet/connectors/euler/main.sol b/contracts/mainnet/connectors/euler/main.sol
index 5c99fbf6..296ee60a 100644
--- a/contracts/mainnet/connectors/euler/main.sol
+++ b/contracts/mainnet/connectors/euler/main.sol
@@ -98,11 +98,11 @@ abstract contract Euler is Helpers {
 
 		address _subAccount = getSubAccount(address(this), subAccount);
 		_amt = _amt == uint256(-1) ?  eToken.balanceOfUnderlying(_subAccount) : _amt;
-		uint256 initialBal = tokenContract.balanceOf(_subAccount);
+		uint256 initialBal = tokenContract.balanceOf(address(this));
 
 		eToken.withdraw(subAccount, _amt);
 
-		uint256 finalBal = tokenContract.balanceOf(_subAccount);
+		uint256 finalBal = tokenContract.balanceOf(address(this));
 		_amt = finalBal - initialBal;
 
 		convertWethToEth(isEth, tokenContract, _amt);