From f0a39003e5958e4a828d84ef51b1bf4c87a00051 Mon Sep 17 00:00:00 2001 From: Samarendra Gouda Date: Mon, 15 Apr 2024 14:11:37 +0530 Subject: [PATCH] fix: migrating old PR --- contracts/mainnet/connectors/eeth/events.sol | 6 + contracts/mainnet/connectors/eeth/helpers.sol | 8 + .../mainnet/connectors/eeth/interfaces.sol | 6 + contracts/mainnet/connectors/eeth/main.sol | 41 +++++ contracts/mainnet/connectors/weeth/events.sol | 2 +- .../mainnet/connectors/weeth/interfaces.sol | 2 +- contracts/mainnet/connectors/weeth/main.sol | 3 +- test/mainnet/eeth/eeth.test.ts | 98 ++++++++++ test/mainnet/weeth/weeth.test.ts | 167 ++++++++++++++++++ 9 files changed, 330 insertions(+), 3 deletions(-) create mode 100644 contracts/mainnet/connectors/eeth/events.sol create mode 100644 contracts/mainnet/connectors/eeth/helpers.sol create mode 100644 contracts/mainnet/connectors/eeth/interfaces.sol create mode 100644 contracts/mainnet/connectors/eeth/main.sol create mode 100644 test/mainnet/eeth/eeth.test.ts diff --git a/contracts/mainnet/connectors/eeth/events.sol b/contracts/mainnet/connectors/eeth/events.sol new file mode 100644 index 0000000..9843a4a --- /dev/null +++ b/contracts/mainnet/connectors/eeth/events.sol @@ -0,0 +1,6 @@ +//SPDX-License-Identifier: MIT +pragma solidity 0.8.19; + +contract Events { + event LogDeposit(uint256 amount, uint256 getId, uint256 setId); +} diff --git a/contracts/mainnet/connectors/eeth/helpers.sol b/contracts/mainnet/connectors/eeth/helpers.sol new file mode 100644 index 0000000..d020c84 --- /dev/null +++ b/contracts/mainnet/connectors/eeth/helpers.sol @@ -0,0 +1,8 @@ +//SPDX-License-Identifier: MIT +pragma solidity 0.8.19; + +import "./interfaces.sol"; + +contract Helpers{ + IEtherfiPool constant etherfiPool = IEtherfiPool(0x308861A430be4cce5502d0A12724771Fc6DaF216); +} diff --git a/contracts/mainnet/connectors/eeth/interfaces.sol b/contracts/mainnet/connectors/eeth/interfaces.sol new file mode 100644 index 0000000..2d8c78c --- /dev/null +++ b/contracts/mainnet/connectors/eeth/interfaces.sol @@ -0,0 +1,6 @@ +//SPDX-License-Identifier: MIT +pragma solidity 0.8.19; + +interface IEtherfiPool{ + function deposit() external payable returns (uint256); +} diff --git a/contracts/mainnet/connectors/eeth/main.sol b/contracts/mainnet/connectors/eeth/main.sol new file mode 100644 index 0000000..847355c --- /dev/null +++ b/contracts/mainnet/connectors/eeth/main.sol @@ -0,0 +1,41 @@ +//SPDX-License-Identifier: MIT +pragma solidity 0.8.19; + +import "./helpers.sol"; +import "./events.sol"; +import {Basic} from "../../common/basic.sol"; + +contract EETHContract is Helpers, Basic, Events { + /** + * @dev deposit ETH into Etherfi. + * @notice stake Eth in Etherfi, users receive eETH tokens on a 1:1 basis representing their staked ETH. + * @param amount The amount of ETH to deposit. (For max: `uint256(-1)`) + * @param getId ID to retrieve amt. + * @param setId ID stores the amount of ETH deposited. + */ + function deposit( + uint256 amount, + uint256 getId, + uint256 setId + ) + public + payable + returns (string memory _eventName, bytes memory _eventParam) + { + uint256 _amount = getUint(getId, amount); + _amount = _amount == type(uint256).max + ? address(this).balance + : _amount; + + etherfiPool.deposit{value: _amount}(); + + setUint(setId, _amount); + + _eventName = "LogDeposit(uint256,uint256,uint256)"; + _eventParam = abi.encode(_amount, getId, setId); + } +} + +contract ConnectV2EETH is EETHContract { + string public name = "EETH-v1.0"; +} diff --git a/contracts/mainnet/connectors/weeth/events.sol b/contracts/mainnet/connectors/weeth/events.sol index 1b0b8c1..4e627a3 100644 --- a/contracts/mainnet/connectors/weeth/events.sol +++ b/contracts/mainnet/connectors/weeth/events.sol @@ -4,4 +4,4 @@ pragma solidity 0.8.19; contract Events { event LogDeposit(uint256 eETHAmount, uint256 weETHAmount, uint256 getId, uint256 setId); event LogWithdraw(uint256 weETHAmount, uint256 eETHAmount, uint256 getId, uint256 setId); -} \ No newline at end of file +} diff --git a/contracts/mainnet/connectors/weeth/interfaces.sol b/contracts/mainnet/connectors/weeth/interfaces.sol index 896f333..bb64e42 100644 --- a/contracts/mainnet/connectors/weeth/interfaces.sol +++ b/contracts/mainnet/connectors/weeth/interfaces.sol @@ -5,4 +5,4 @@ interface IWEETH{ function balanceOf(address account) external view returns (uint256); function wrap(uint256 _eETHAmount) external returns (uint256); function unwrap(uint256 _weETHAmount) external returns (uint256); -} \ No newline at end of file +} diff --git a/contracts/mainnet/connectors/weeth/main.sol b/contracts/mainnet/connectors/weeth/main.sol index c703d6e..a4074a0 100644 --- a/contracts/mainnet/connectors/weeth/main.sol +++ b/contracts/mainnet/connectors/weeth/main.sol @@ -2,9 +2,10 @@ pragma solidity 0.8.19; import "./helpers.sol"; +import "./events.sol"; import {Basic} from "../../common/basic.sol"; -contract WEETHContract is Helpers, Basic { +contract WEETHContract is Helpers, Basic, Events { /** * @dev Deposit eETH into weETH. diff --git a/test/mainnet/eeth/eeth.test.ts b/test/mainnet/eeth/eeth.test.ts new file mode 100644 index 0000000..d562e2a --- /dev/null +++ b/test/mainnet/eeth/eeth.test.ts @@ -0,0 +1,98 @@ +import hre from "hardhat"; +import { expect } from "chai"; +const { ethers } = hre; +import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector"; +import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"; +import { encodeSpells } from "../../../scripts/tests/encodeSpells"; +import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"; +import { addresses } from "../../../scripts/tests/mainnet/addresses"; +import { abis } from "../../../scripts/constant/abis"; +import { ConnectV2EETH__factory } from "../../../typechain"; +import type { Signer, Contract } from "ethers"; + +describe("eETH Staking", function () { + const connectorName = "eETH-test"; + + let dsaWallet0: Contract; + let wallet0: Signer, wallet1: Signer; + let masterSigner: Signer; + let instaConnectorsV2: Contract; + let connector: Contract; + + before(async () => { + [wallet0, wallet1] = await ethers.getSigners(); + masterSigner = await getMasterSigner(); + instaConnectorsV2 = await ethers.getContractAt( + abis.core.connectorsV2, + addresses.core.connectorsV2 + ); + connector = await deployAndEnableConnector({ + connectorName, + contractArtifact: ConnectV2EETH__factory, + signer: masterSigner, + connectors: instaConnectorsV2, + }); + console.log("Connector address", connector.address); + }); + + it("Should have contracts deployed.", async function () { + expect(!!instaConnectorsV2.address).to.be.true; + expect(!!connector.address).to.be.true; + expect(!!(await masterSigner.getAddress())).to.be.true; + }); + + describe("DSA wallet setup", function () { + it("Should build DSA v2", async function () { + dsaWallet0 = await buildDSAv2(await wallet0.getAddress()); + expect(!!dsaWallet0.address).to.be.true; + }); + + it("Deposit ETH into DSA wallet", async function () { + await wallet0.sendTransaction({ + to: dsaWallet0.address, + value: ethers.utils.parseEther("10"), + }); + expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte( + ethers.utils.parseEther("10") + ); + }); + }); + + describe("Main", function () { + it("Should deposit ETH into eETH", async function () { + const amount = ethers.utils.parseEther("1"); + const eETHTAddress = "0x35fA164735182de50811E8e2E824cFb9B6118ac2"; + const IERC20ABI = [ + "function approve(address spender, uint256 amount) external returns (bool)", + "function balanceOf(address account) external view returns (uint256)", + ]; + const eETHContract = await ethers.getContractAt(IERC20ABI, eETHTAddress); + + const initialBalance = await eETHContract.balanceOf(dsaWallet0.address); + console.log( + "eETH Balance before:", + ethers.utils.formatEther(initialBalance) + ); + + const spells = [ + { + connector: connectorName, + method: "deposit", + args: [amount, 0, 0], + }, + ]; + + const spellsEncoded = encodeSpells(spells); + const tx = await dsaWallet0 + .connect(wallet0) + .cast(...encodeSpells(spells), await wallet1.getAddress()); + const receipt = await tx.wait(); + + const finalBalance = await eETHContract.balanceOf(dsaWallet0.address); + console.log( + "eETH Balance after:", + ethers.utils.formatEther(finalBalance) + ); + }); + }); +}); diff --git a/test/mainnet/weeth/weeth.test.ts b/test/mainnet/weeth/weeth.test.ts index e69de29..f3af88c 100644 --- a/test/mainnet/weeth/weeth.test.ts +++ b/test/mainnet/weeth/weeth.test.ts @@ -0,0 +1,167 @@ +import hre from "hardhat"; +import { expect } from "chai"; +const { ethers } = hre; +import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector"; +import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"; +import { encodeSpells } from "../../../scripts/tests/encodeSpells"; +import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"; +import { addresses } from "../../../scripts/tests/mainnet/addresses"; +import { abis } from "../../../scripts/constant/abis"; +import { ConnectV2WEETH__factory } from "../../../typechain"; +import type { Signer, Contract } from "ethers"; + +describe("Wrapping / Unwrapping eETH", function () { + const connectorName = "weETH-test"; + + let dsaWallet0: Contract; + let wallet0: Signer, wallet1: Signer; + let masterSigner: Signer; + let instaConnectorsV2: Contract; + let connector: Contract; + + before(async () => { + [wallet0, wallet1] = await ethers.getSigners(); + masterSigner = await getMasterSigner(); + instaConnectorsV2 = await ethers.getContractAt( + abis.core.connectorsV2, + addresses.core.connectorsV2 + ); + connector = await deployAndEnableConnector({ + connectorName, + contractArtifact: ConnectV2WEETH__factory, + signer: masterSigner, + connectors: instaConnectorsV2, + }); + console.log("Connector address", connector.address); + }); + + it("Should have contracts deployed.", async function () { + expect(!!instaConnectorsV2.address).to.be.true; + expect(!!connector.address).to.be.true; + expect(!!(await masterSigner.getAddress())).to.be.true; + }); + + describe("DSA wallet setup", function () { + it("Should build DSA v2", async function () { + dsaWallet0 = await buildDSAv2(await wallet0.getAddress()); + expect(!!dsaWallet0.address).to.be.true; + }); + + it("Deposit ETH into DSA wallet", async function () { + await wallet0.sendTransaction({ + to: dsaWallet0.address, + value: ethers.utils.parseEther("10"), + }); + expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte( + ethers.utils.parseEther("10") + ); + }); + + it("Topup eETH into DSA wallet", async function () { + const eETHTAddress = "0x35fA164735182de50811E8e2E824cFb9B6118ac2"; + const IERC20ABI = [ + "function approve(address spender, uint256 amount) external returns (bool)", + "function balanceOf(address account) external view returns (uint256)", + "function transfer(address recipient, uint256 amount) external returns (bool)", + ]; + const eETHHolder = "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee"; + const amount = ethers.utils.parseEther("10"); + + const eETHContract = await ethers.getContractAt(IERC20ABI, eETHTAddress); + await hre.network.provider.send("hardhat_setBalance", [ + eETHHolder, + "0x56BC75E2D63100000", + ]); + + console.log( + "Holder eETH Balance before topup:", + ethers.utils.formatEther(await eETHContract.balanceOf(eETHHolder)) + ); + console.log( + "holder ETH Balance before topup:", + ethers.utils.formatEther(await ethers.provider.getBalance(eETHHolder)) + ); + await hre.network.provider.request({ + method: "hardhat_impersonateAccount", + params: [eETHHolder], + }); + const eETHHolderSigner = await ethers.getSigner(eETHHolder); + await eETHContract + .connect(eETHHolderSigner) + .approve(dsaWallet0.address, amount); + await eETHContract + .connect(eETHHolderSigner) + .transfer(dsaWallet0.address, amount); + const balance = await eETHContract.balanceOf(dsaWallet0.address); + console.log( + "DSA eETH Balance after topup:", + ethers.utils.formatEther(balance) + ); + + await hre.network.provider.request({ + method: "hardhat_stopImpersonatingAccount", + params: [eETHHolder], + }); + }); + }); + describe("Main", function () { + it("Should wrap and unwrap eETH", async function () { + const eETHTAddress = "0x35fA164735182de50811E8e2E824cFb9B6118ac2"; + const weETHAddress = "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee"; + const IERC20ABI = [ + "function balanceOf(address account) external view returns (uint256)", + ]; + const eETHContract = await ethers.getContractAt(IERC20ABI, eETHTAddress); + const weETHContract = await ethers.getContractAt(IERC20ABI, weETHAddress); + const amount = ethers.utils.parseEther("10"); + const initialBalance = await weETHContract.balanceOf(dsaWallet0.address); + console.log( + "weETH Balance before wrapping:", + ethers.utils.formatEther(initialBalance) + ); + console.log("Wrapping 10 eETH to weETH"); + const spells = [ + { + connector: connectorName, + method: "deposit", + args: [amount, 0, 0], + }, + ]; + const spellsEncoded = encodeSpells(spells); + const tx = await dsaWallet0 + .connect(wallet0) + .cast(...spellsEncoded, await wallet1.getAddress()); + const receipt = await tx.wait(); + const finalBalance = await weETHContract.balanceOf(dsaWallet0.address); + console.log( + "weETH Balance after wrapping:", + ethers.utils.formatEther(finalBalance) + ); + + const uint256Max = ethers.BigNumber.from(2).pow(256).sub(1); + const initialBalance2 = await eETHContract.balanceOf(dsaWallet0.address); + console.log( + "eETH Balance before unwrapping:", + ethers.utils.formatEther(initialBalance2) + ); + console.log("Unwrapping all eETH to ETH"); + const spells2 = [ + { + connector: connectorName, + method: "withdraw", + args: [uint256Max, 0, 0], + }, + ]; + const spellsEncoded2 = encodeSpells(spells2); + const tx2 = await dsaWallet0 + .connect(wallet0) + .cast(...spellsEncoded2, await wallet1.getAddress()); + const receipt2 = await tx2.wait(); + const finalBalance2 = await eETHContract.balanceOf(dsaWallet0.address); + console.log( + "eETH Balance after unwrapping:", + ethers.utils.formatEther(finalBalance2) + ); + }); + }); +});