fix conflicts

This commit is contained in:
bhavik-m 2022-03-14 16:51:44 +05:30
commit 9fbc3c12fd
22 changed files with 1387 additions and 3 deletions

3
.gitignore vendored
View File

@ -63,4 +63,5 @@ build/contracts
# buidler
artifacts
cache
typechain
typechain

View File

@ -0,0 +1,6 @@
pragma solidity ^0.7.0;
contract Events {
event LogAddAuth(address indexed _msgSender, address indexed _authority);
event LogRemoveAuth(address indexed _msgSender, address indexed _authority);
}

View File

@ -0,0 +1,15 @@
pragma solidity ^0.7.0;
pragma experimental ABIEncoderV2;
import { DSMath } from "../../common/math.sol";
import { Basic } from "../../common/basic.sol";
import { ListInterface } from "./interface.sol";
abstract contract Helpers is DSMath, Basic {
ListInterface internal constant listContract = ListInterface(0x3565F6057b7fFE36984779A507fC87b31EFb0f09);
function checkAuthCount() internal view returns (uint count) {
uint64 accountId = listContract.accountID(address(this));
count = listContract.accountLink(accountId).count;
}
}

View File

@ -0,0 +1,13 @@
pragma solidity ^0.7.0;
pragma experimental ABIEncoderV2;
interface ListInterface {
struct AccountLink {
address first;
address last;
uint64 count;
}
function accountID(address) external view returns (uint64);
function accountLink(uint64) external view returns (AccountLink memory);
}

View File

@ -0,0 +1,45 @@
pragma solidity ^0.7.0;
/**
* @title Authority.
* @dev Manage Authorities to DSA.
*/
import { AccountInterface } from "../../common/interfaces.sol";
import { Helpers } from "./helpers.sol";
import { Events } from "./events.sol";
abstract contract AuthorityResolver is Events, Helpers {
/**
* @dev Add New authority
* @notice Add an address as account authority
* @param authority The authority Address.
*/
function add(
address authority
) external payable returns (string memory _eventName, bytes memory _eventParam) {
AccountInterface(address(this)).enable(authority);
_eventName = "LogAddAuth(address,address)";
_eventParam = abi.encode(msg.sender, authority);
}
/**
* @dev Remove authority
* @notice Remove an address as account authority
* @param authority The authority Address.
*/
function remove(
address authority
) external payable returns (string memory _eventName, bytes memory _eventParam) {
require(checkAuthCount() > 1, "Removing-all-authorities");
AccountInterface(address(this)).disable(authority);
_eventName = "LogRemoveAuth(address,address)";
_eventParam = abi.encode(msg.sender, authority);
}
}
contract ConnectV2AuthFantom is AuthorityResolver {
string public constant name = "Auth-v1";
}

View File

@ -0,0 +1,20 @@
pragma solidity ^0.7.0;
contract Events {
event LogDepositERC1155(
address indexed erc1155,
address from,
uint256 tokenId,
uint256 amount,
uint256 getId,
uint256 setId
);
event LogWithdrawERC1155(
address indexed erc1155,
uint256 tokenId,
address indexed to,
uint256 amount,
uint256 getId,
uint256 setId
);
}

View File

@ -0,0 +1,93 @@
pragma solidity ^0.7.0;
/**
* @title Basic.
* @dev Deposit & Withdraw from ERC1155 DSA.
*/
import {IERC1155} from "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
import {DSMath} from "../../common/math.sol";
import {Basic} from "../../common/basic.sol";
import {Events} from "./events.sol";
abstract contract BasicResolver is Events, DSMath, Basic {
/**
* @dev Deposit Assets To Smart Account.
* @notice Deposit a ERC1155 token to DSA
* @param token Address of token.
* @param tokenId ID of token.
* @param amount Amount to deposit.
* @param getId ID to retrieve amount.
* @param setId ID stores the amount.
*/
function depositERC1155(
address token,
uint256 tokenId,
uint256 amount,
uint256 getId,
uint256 setId
)
public
payable
returns (string memory _eventName, bytes memory _eventParam)
{
uint256 _amount = getUint(getId, amount);
IERC1155 tokenContract = IERC1155(token);
tokenContract.safeTransferFrom(
msg.sender,
address(this),
tokenId,
_amount,
""
);
setUint(setId, _amount);
_eventName = "LogDepositERC1155(address,address,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(
token,
msg.sender,
tokenId,
_amount,
getId,
setId
);
}
/**
* @dev Withdraw Assets To Smart Account.
* @notice Withdraw a ERC1155 token from DSA
* @param token Address of the token.
* @param tokenId ID of token.
* @param to The address to receive the token upon withdrawal
* @param amount Amount to withdraw.
* @param getId ID to retrieve amount.
* @param setId ID stores the amount.
*/
function withdrawERC1155(
address token,
uint256 tokenId,
address payable to,
uint256 amount,
uint256 getId,
uint256 setId
)
public
payable
returns (string memory _eventName, bytes memory _eventParam)
{
uint256 _amount = getUint(getId, amount);
IERC1155 tokenContract = IERC1155(token);
tokenContract.safeTransferFrom(address(this), to, tokenId, _amount, "");
setUint(setId, _amount);
_eventName = "LogWithdrawERC1155(address,uint256,address,uint256,uint256,uint256)";
_eventParam = abi.encode(token, tokenId, to, _amount, getId, setId);
}
}
contract ConnectV2BasicERC1155Fantom is BasicResolver {
string public constant name = "BASIC-ERC1155-v1.0";
}

View File

@ -0,0 +1,18 @@
pragma solidity ^0.7.0;
contract Events {
event LogDepositERC721(
address indexed erc721,
address from,
uint256 tokenId,
uint256 getId,
uint256 setId
);
event LogWithdrawERC721(
address indexed erc721,
uint256 tokenId,
address indexed to,
uint256 getId,
uint256 setId
);
}

View File

@ -0,0 +1,76 @@
pragma solidity ^0.7.0;
/**
* @title Basic.
* @dev Deposit & Withdraw ERC721 from DSA.
*/
import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
import {DSMath} from "../../common/math.sol";
import {Basic} from "../../common/basic.sol";
import {Events} from "./events.sol";
abstract contract BasicResolver is Events, DSMath, Basic {
/**
* @dev Deposit Assets To Smart Account.
* @notice Deposit a ERC721 token to DSA
* @param token Address of token.
* @param tokenId ID of token.
* @param getId ID to retrieve tokenId.
* @param setId ID stores the tokenId.
*/
function depositERC721(
address token,
uint256 tokenId,
uint256 getId,
uint256 setId
)
public
payable
returns (string memory _eventName, bytes memory _eventParam)
{
uint256 _tokenId = getUint(getId, tokenId);
IERC721 tokenContract = IERC721(token);
tokenContract.safeTransferFrom(msg.sender, address(this), _tokenId);
setUint(setId, _tokenId);
_eventName = "LogDepositERC721(address,address,uint256,uint256,uint256)";
_eventParam = abi.encode(token, msg.sender, _tokenId, getId, setId);
}
/**
* @dev Withdraw Assets To Smart Account.
* @notice Withdraw a ERC721 token from DSA
* @param token Address of the token.
* @param tokenId ID of token.
* @param to The address to receive the token upon withdrawal
* @param getId ID to retrieve tokenId.
* @param setId ID stores the tokenId.
*/
function withdrawERC721(
address token,
uint256 tokenId,
address payable to,
uint256 getId,
uint256 setId
)
public
payable
returns (string memory _eventName, bytes memory _eventParam)
{
uint256 _tokenId = getUint(getId, tokenId);
IERC721 tokenContract = IERC721(token);
tokenContract.safeTransferFrom(address(this), to, _tokenId);
setUint(setId, _tokenId);
_eventName = "LogWithdrawERC721(address,uint256,address,uint256,uint256)";
_eventParam = abi.encode(token, _tokenId, to, getId, setId);
}
}
contract ConnectV2BasicERC721Fantom is BasicResolver {
string public constant name = "BASIC-ERC721-v1.0";
}

View File

@ -0,0 +1,6 @@
pragma solidity ^0.7.0;
contract Events {
event LogDeposit(address indexed erc20, uint256 tokenAmt, uint256 getId, uint256 setId);
event LogWithdraw(address indexed erc20, uint256 tokenAmt, address indexed to, uint256 getId, uint256 setId);
}

View File

@ -0,0 +1,82 @@
pragma solidity ^0.7.0;
/**
* @title Basic.
* @dev Deposit & Withdraw from DSA.
*/
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { DSMath } from "../../common/math.sol";
import { Basic } from "../../common/basic.sol";
import { Events } from "./events.sol";
abstract contract BasicResolver is Events, DSMath, Basic {
using SafeERC20 for IERC20;
/**
* @dev Deposit Assets To Smart Account.
* @notice Deposit a token to DSA
* @param token The address of the token to deposit. (For MATIC: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param amt The amount of tokens to deposit. (For max: `uint256(-1)` (Not valid for MATIC))
* @param getId ID to retrieve amt.
* @param setId ID stores the amount of tokens deposited.
*/
function deposit(
address token,
uint256 amt,
uint256 getId,
uint256 setId
) public payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt);
if (token != ftmAddr) {
IERC20 tokenContract = IERC20(token);
_amt = _amt == uint(-1) ? tokenContract.balanceOf(msg.sender) : _amt;
tokenContract.safeTransferFrom(msg.sender, address(this), _amt);
} else {
require(msg.value == _amt || _amt == uint(-1), "invalid-ether-amount");
_amt = msg.value;
}
setUint(setId, _amt);
_eventName = "LogDeposit(address,uint256,uint256,uint256)";
_eventParam = abi.encode(token, _amt, getId, setId);
}
/**
* @dev Withdraw Assets from Smart Account
* @notice Withdraw a token from DSA
* @param token The address of the token to withdraw. (For MATIC: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param amt The amount of tokens to withdraw. (For max: `uint256(-1)`)
* @param to The address to receive the token upon withdrawal
* @param getId ID to retrieve amt.
* @param setId ID stores the amount of tokens withdrawn.
*/
function withdraw(
address token,
uint amt,
address payable to,
uint getId,
uint setId
) public payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt);
if (token == ftmAddr) {
_amt = _amt == uint(-1) ? address(this).balance : _amt;
to.call{value: _amt}("");
} else {
IERC20 tokenContract = IERC20(token);
_amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt;
tokenContract.safeTransfer(to, _amt);
}
setUint(setId, _amt);
_eventName = "LogWithdraw(address,uint256,address,uint256,uint256)";
_eventParam = abi.encode(token, _amt, to, getId, setId);
}
}
contract ConnectV2BasicFantom is BasicResolver {
string constant public name = "Basic-v1";
}

View File

@ -0,0 +1,6 @@
pragma solidity ^0.7.0;
contract Events {
event LogDeposit(uint256 tokenAmt, uint256 getId, uint256 setId);
event LogWithdraw(uint256 tokenAmt, uint256 getId, uint256 setId);
}

View File

@ -0,0 +1,8 @@
pragma solidity ^0.7.0;
import { TokenInterface } from "../../common/interfaces.sol";
abstract contract Helpers {
TokenInterface constant internal wftmContract = TokenInterface(0x21be370D5312f44cB42ce377BC9b8a0cEF1A4C83);
}

View File

@ -0,0 +1,65 @@
pragma solidity ^0.7.0;
/**
* @title WFTM.
* @dev Wrap and Unwrap WFTM.
*/
import { DSMath } from "../../common/math.sol";
import { Basic } from "../../common/basic.sol";
import { Events } from "./events.sol";
import { Helpers } from "./helpers.sol";
abstract contract Resolver is Events, DSMath, Basic, Helpers {
/**
* @dev Deposit FTM into WFTM.
* @notice Wrap FTM into WFTM
* @param amt The amount of FTM to deposit. (For max: `uint256(-1)`)
* @param getId ID to retrieve amt.
* @param setId ID stores the amount of FTM deposited.
*/
function deposit(
uint256 amt,
uint256 getId,
uint256 setId
) public payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt);
_amt = _amt == uint(-1) ? address(this).balance : _amt;
wftmContract.deposit{value: _amt}();
setUint(setId, _amt);
_eventName = "LogDeposit(uint256,uint256,uint256)";
_eventParam = abi.encode(_amt, getId, setId);
}
/**
* @dev Withdraw FTM from WFTM from Smart Account
* @notice Unwrap FTM from WFTM
* @param amt The amount of wFTM to withdraw. (For max: `uint256(-1)`)
* @param getId ID to retrieve amt.
* @param setId ID stores the amount of FTM withdrawn.
*/
function withdraw(
uint amt,
uint getId,
uint setId
) public payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt);
_amt = _amt == uint(-1) ? wftmContract.balanceOf(address(this)) : _amt;
approve(wftmContract, wftmAddr, _amt);
wftmContract.withdraw(_amt);
setUint(setId, _amt);
_eventName = "LogWithdraw(uint256,uint256,uint256)";
_eventParam = abi.encode(_amt, getId, setId);
}
}
contract ConnectV2WFTMFantom is Resolver {
string constant public name = "WFTM-v1.0";
}

View File

@ -0,0 +1,5 @@
pragma solidity ^0.7.0;
contract Events {
event LogDeposit(uint256 Amt, uint256 getId, uint256 setId);
}

View File

@ -0,0 +1,12 @@
pragma solidity ^0.7.0;
import { TokenInterface } from "../../common/interfaces.sol";
import { ILido } from "./interface.sol";
abstract contract Helpers {
ILido internal constant lidoInterface =
ILido(0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84);
address internal constant treasury =
0x28849D2b63fA8D361e5fc15cB8aBB13019884d09; // Instadapp's treasury address
}

View File

@ -0,0 +1,5 @@
pragma solidity ^0.7.0;
interface ILido {
function submit(address _referral) external payable returns (uint256);
}

View File

@ -0,0 +1,43 @@
pragma solidity ^0.7.0;
/**
* @title Stake Eth.
* @dev deposit Eth into lido and in return you get equivalent of stEth tokens
*/
import { DSMath } from "../../common/math.sol";
import { Basic } from "../../common/basic.sol";
import { Events } from "./events.sol";
import { Helpers } from "./helpers.sol";
abstract contract Resolver is Events, DSMath, Basic, Helpers {
/**
* @dev deposit ETH into Lido.
* @notice sends Eth into lido and in return you get equivalent of stEth tokens
* @param amt 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 amt,
uint256 getId,
uint256 setId
)
public
payable
returns (string memory _eventName, bytes memory _eventParam)
{
uint256 _amt = getUint(getId, amt);
_amt = _amt == uint256(-1) ? address(this).balance : _amt;
lidoInterface.submit{ value: amt }(treasury);
setUint(setId, _amt);
_eventName = "LogDeposit(uint256,uint256,uint256)";
_eventParam = abi.encode(_amt, getId, setId);
}
}
contract ConnectV2LidoStEth is Resolver {
string public constant name = "LidoStEth-v1";
}

View File

@ -49,6 +49,12 @@
"UNISWAP-V3-A": "0x3254Ce8f5b1c82431B8f21Df01918342215825C2",
"1INCH-A": "0xA4BF319968986D2352FA1c550D781bBFCCE3FcaB",
"WETH-A": "0x6C7256cf7C003dD85683339F75DdE9971f98f2FD"
},
"fantom" : {
"AUTHORITY-A": "0x6CE3e607C808b4f4C26B7F6aDAeB619e49CAbb25",
"BASIC-A": "0x9926955e0dd681dc303370c52f4ad0a4dd061687",
"BASIC-B": "0x8dA60dee0815a08d16C066b07814b10722fA9306",
"BASIC-C": "0x2EadEecf1aB9283a9F76D219CF17eeD4932B8811"
}
},
"mappings": {

View File

@ -24,7 +24,8 @@ const chainIds = {
avalanche: 43114,
polygon: 137,
arbitrum: 42161,
optimism: 10
optimism: 10,
fantom:250
};
const alchemyApiKey = process.env.ALCHEMY_API_KEY;
@ -38,7 +39,13 @@ const POLYGONSCAN_API = process.env.POLYGON_API_KEY;
const ARBISCAN_API = process.env.ARBISCAN_API_KEY;
const SNOWTRACE_API = process.env.SNOWTRACE_API_KEY;
const FANTOMSCAN_API = process.env.FANTOM_API_KEY;
<<<<<<< HEAD
const mnemonic = process.env.MNEMONIC ?? "test test test test test test test test test test test junk";
=======
const mnemonic =
process.env.MNEMONIC ??
"test test test test test test test test test test test junk";
>>>>>>> 2a009cc8da9682a1e82ec3119909e6dbaf30f11e
const networkGasPriceConfig: Record<string, string> = {
mainnet: "160",
@ -56,11 +63,24 @@ function createConfig(network: string) {
}
function getNetworkUrl(networkType: string) {
<<<<<<< HEAD
if (networkType === "avalanche") return "https://api.avax.network/ext/bc/C/rpc";
else if (networkType === "polygon") return `https://polygon-mainnet.g.alchemy.com/v2/${alchemyApiKey}`;
else if (networkType === "arbitrum") return `https://arb-mainnet.g.alchemy.com/v2/${alchemyApiKey}`;
else if (networkType === "optimism") return `https://opt-mainnet.g.alchemy.com/v2/${alchemyApiKey}`;
else if (networkType === "fantom") return `https://rpc.ftm.tools/`;
=======
if (networkType === "avalanche")
return "https://api.avax.network/ext/bc/C/rpc";
else if (networkType === "polygon")
return `https://polygon-mainnet.g.alchemy.com/v2/${alchemyApiKey}`;
else if (networkType === "arbitrum")
return `https://arb-mainnet.g.alchemy.com/v2/${alchemyApiKey}`;
else if (networkType === "optimism")
return `https://opt-mainnet.g.alchemy.com/v2/${alchemyApiKey}`;
else if(networkType === "fantom")
return `https://rpc.ftm.tools/`
>>>>>>> 2a009cc8da9682a1e82ec3119909e6dbaf30f11e
else return `https://eth-mainnet.alchemyapi.io/v2/${alchemyApiKey}`;
}
@ -68,7 +88,12 @@ function getScanApiKey(networkType: string) {
if (networkType === "avalanche") return SNOWTRACE_API;
else if (networkType === "polygon") return POLYGONSCAN_API;
else if (networkType === "arbitrum") return ARBISCAN_API;
<<<<<<< HEAD
else if (networkType === "fantom") return FANTOMSCAN_API;
=======
else if(networkType === "fantom") return FANTOMSCAN_API;
else if (networkType === "optimism") return OPTIMISM_API;
>>>>>>> 2a009cc8da9682a1e82ec3119909e6dbaf30f11e
else return ETHERSCAN_API;
}
@ -113,7 +138,7 @@ const config: HardhatUserConfig = {
avalanche: createConfig("avalanche"),
arbitrum: createConfig("arbitrum"),
optimism: createConfig("optimism"),
fantom: createConfig("optimism")
fantom: createConfig("fantom"),
},
paths: {
artifacts: "./artifacts",

View File

@ -0,0 +1,731 @@
[
{
"constant": false,
"inputs": [],
"name": "resume",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "name",
"outputs": [{ "name": "", "type": "string" }],
"payable": false,
"stateMutability": "pure",
"type": "function"
},
{
"constant": false,
"inputs": [],
"name": "stop",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "hasInitialized",
"outputs": [{ "name": "", "type": "bool" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{ "name": "_spender", "type": "address" },
{ "name": "_amount", "type": "uint256" }
],
"name": "approve",
"outputs": [{ "name": "", "type": "bool" }],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{ "name": "depositContract", "type": "address" },
{ "name": "_oracle", "type": "address" },
{ "name": "_operators", "type": "address" },
{ "name": "_treasury", "type": "address" },
{ "name": "_insuranceFund", "type": "address" }
],
"name": "initialize",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getInsuranceFund",
"outputs": [{ "name": "", "type": "address" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "totalSupply",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [{ "name": "_ethAmount", "type": "uint256" }],
"name": "getSharesByPooledEth",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{ "name": "_sender", "type": "address" },
{ "name": "_recipient", "type": "address" },
{ "name": "_amount", "type": "uint256" }
],
"name": "transferFrom",
"outputs": [{ "name": "", "type": "bool" }],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getOperators",
"outputs": [{ "name": "", "type": "address" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [{ "name": "_script", "type": "bytes" }],
"name": "getEVMScriptExecutor",
"outputs": [{ "name": "", "type": "address" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "decimals",
"outputs": [{ "name": "", "type": "uint8" }],
"payable": false,
"stateMutability": "pure",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getRecoveryVault",
"outputs": [{ "name": "", "type": "address" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "DEPOSIT_ROLE",
"outputs": [{ "name": "", "type": "bytes32" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "DEPOSIT_SIZE",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getTotalPooledEther",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "PAUSE_ROLE",
"outputs": [{ "name": "", "type": "bytes32" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{ "name": "_spender", "type": "address" },
{ "name": "_addedValue", "type": "uint256" }
],
"name": "increaseAllowance",
"outputs": [{ "name": "", "type": "bool" }],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getTreasury",
"outputs": [{ "name": "", "type": "address" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "SET_ORACLE",
"outputs": [{ "name": "", "type": "bytes32" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "isStopped",
"outputs": [{ "name": "", "type": "bool" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "MANAGE_WITHDRAWAL_KEY",
"outputs": [{ "name": "", "type": "bytes32" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getBufferedEther",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "SIGNATURE_LENGTH",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getWithdrawalCredentials",
"outputs": [{ "name": "", "type": "bytes32" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [{ "name": "_account", "type": "address" }],
"name": "balanceOf",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getFeeDistribution",
"outputs": [
{ "name": "treasuryFeeBasisPoints", "type": "uint16" },
{ "name": "insuranceFeeBasisPoints", "type": "uint16" },
{ "name": "operatorsFeeBasisPoints", "type": "uint16" }
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [{ "name": "_sharesAmount", "type": "uint256" }],
"name": "getPooledEthByShares",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [{ "name": "_oracle", "type": "address" }],
"name": "setOracle",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [{ "name": "token", "type": "address" }],
"name": "allowRecoverability",
"outputs": [{ "name": "", "type": "bool" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "appId",
"outputs": [{ "name": "", "type": "bytes32" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getOracle",
"outputs": [{ "name": "", "type": "address" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getInitializationBlock",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{ "name": "_treasuryFeeBasisPoints", "type": "uint16" },
{ "name": "_insuranceFeeBasisPoints", "type": "uint16" },
{ "name": "_operatorsFeeBasisPoints", "type": "uint16" }
],
"name": "setFeeDistribution",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [{ "name": "_feeBasisPoints", "type": "uint16" }],
"name": "setFee",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [{ "name": "_maxDeposits", "type": "uint256" }],
"name": "depositBufferedEther",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "symbol",
"outputs": [{ "name": "", "type": "string" }],
"payable": false,
"stateMutability": "pure",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "MANAGE_FEE",
"outputs": [{ "name": "", "type": "bytes32" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [{ "name": "_token", "type": "address" }],
"name": "transferToVault",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "SET_TREASURY",
"outputs": [{ "name": "", "type": "bytes32" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [
{ "name": "_sender", "type": "address" },
{ "name": "_role", "type": "bytes32" },
{ "name": "_params", "type": "uint256[]" }
],
"name": "canPerform",
"outputs": [{ "name": "", "type": "bool" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [{ "name": "_referral", "type": "address" }],
"name": "submit",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": true,
"stateMutability": "payable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "WITHDRAWAL_CREDENTIALS_LENGTH",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{ "name": "_spender", "type": "address" },
{ "name": "_subtractedValue", "type": "uint256" }
],
"name": "decreaseAllowance",
"outputs": [{ "name": "", "type": "bool" }],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getEVMScriptRegistry",
"outputs": [{ "name": "", "type": "address" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "PUBKEY_LENGTH",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{ "name": "_amount", "type": "uint256" },
{ "name": "_pubkeyHash", "type": "bytes32" }
],
"name": "withdraw",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{ "name": "_recipient", "type": "address" },
{ "name": "_amount", "type": "uint256" }
],
"name": "transfer",
"outputs": [{ "name": "", "type": "bool" }],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getDepositContract",
"outputs": [{ "name": "", "type": "address" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getBeaconStat",
"outputs": [
{ "name": "depositedValidators", "type": "uint256" },
{ "name": "beaconValidators", "type": "uint256" },
{ "name": "beaconBalance", "type": "uint256" }
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "BURN_ROLE",
"outputs": [{ "name": "", "type": "bytes32" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [{ "name": "_insuranceFund", "type": "address" }],
"name": "setInsuranceFund",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getFee",
"outputs": [{ "name": "feeBasisPoints", "type": "uint16" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "SET_INSURANCE_FUND",
"outputs": [{ "name": "", "type": "bytes32" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "kernel",
"outputs": [{ "name": "", "type": "address" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getTotalShares",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [
{ "name": "_owner", "type": "address" },
{ "name": "_spender", "type": "address" }
],
"name": "allowance",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "isPetrified",
"outputs": [{ "name": "", "type": "bool" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [{ "name": "_withdrawalCredentials", "type": "bytes32" }],
"name": "setWithdrawalCredentials",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [],
"name": "depositBufferedEther",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{ "name": "_account", "type": "address" },
{ "name": "_sharesAmount", "type": "uint256" }
],
"name": "burnShares",
"outputs": [{ "name": "newTotalShares", "type": "uint256" }],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [{ "name": "_treasury", "type": "address" }],
"name": "setTreasury",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{ "name": "_beaconValidators", "type": "uint256" },
{ "name": "_beaconBalance", "type": "uint256" }
],
"name": "pushBeacon",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [{ "name": "_account", "type": "address" }],
"name": "sharesOf",
"outputs": [{ "name": "", "type": "uint256" }],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{ "payable": true, "stateMutability": "payable", "type": "fallback" },
{
"anonymous": false,
"inputs": [
{ "indexed": true, "name": "executor", "type": "address" },
{ "indexed": false, "name": "script", "type": "bytes" },
{ "indexed": false, "name": "input", "type": "bytes" },
{ "indexed": false, "name": "returnData", "type": "bytes" }
],
"name": "ScriptResult",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{ "indexed": true, "name": "vault", "type": "address" },
{ "indexed": true, "name": "token", "type": "address" },
{ "indexed": false, "name": "amount", "type": "uint256" }
],
"name": "RecoverToVault",
"type": "event"
},
{ "anonymous": false, "inputs": [], "name": "Stopped", "type": "event" },
{ "anonymous": false, "inputs": [], "name": "Resumed", "type": "event" },
{
"anonymous": false,
"inputs": [
{ "indexed": true, "name": "from", "type": "address" },
{ "indexed": true, "name": "to", "type": "address" },
{ "indexed": false, "name": "value", "type": "uint256" }
],
"name": "Transfer",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{ "indexed": true, "name": "owner", "type": "address" },
{ "indexed": true, "name": "spender", "type": "address" },
{ "indexed": false, "name": "value", "type": "uint256" }
],
"name": "Approval",
"type": "event"
},
{
"anonymous": false,
"inputs": [{ "indexed": false, "name": "feeBasisPoints", "type": "uint16" }],
"name": "FeeSet",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{ "indexed": false, "name": "treasuryFeeBasisPoints", "type": "uint16" },
{ "indexed": false, "name": "insuranceFeeBasisPoints", "type": "uint16" },
{ "indexed": false, "name": "operatorsFeeBasisPoints", "type": "uint16" }
],
"name": "FeeDistributionSet",
"type": "event"
},
{
"anonymous": false,
"inputs": [{ "indexed": false, "name": "withdrawalCredentials", "type": "bytes32" }],
"name": "WithdrawalCredentialsSet",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{ "indexed": true, "name": "sender", "type": "address" },
{ "indexed": false, "name": "amount", "type": "uint256" },
{ "indexed": false, "name": "referral", "type": "address" }
],
"name": "Submitted",
"type": "event"
},
{
"anonymous": false,
"inputs": [{ "indexed": false, "name": "amount", "type": "uint256" }],
"name": "Unbuffered",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{ "indexed": true, "name": "sender", "type": "address" },
{ "indexed": false, "name": "tokenAmount", "type": "uint256" },
{ "indexed": false, "name": "sentFromBuffer", "type": "uint256" },
{ "indexed": true, "name": "pubkeyHash", "type": "bytes32" },
{ "indexed": false, "name": "etherAmount", "type": "uint256" }
],
"name": "Withdrawal",
"type": "event"
}
]

View File

@ -0,0 +1,103 @@
import hre from "hardhat";
import axios from "axios";
import { expect } from "chai";
const { ethers } = hre; //check
import { BigNumber } from "bignumber.js";
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 { ConnectV2LidoStEth__factory } from "../../../typechain";
import lido_abi from "./abi.json";
import type { Signer, Contract } from "ethers";
describe("LidoStEth", function() {
const connectorName = "LidoStEth-test";
let dsaWallet0: Contract;
let wallet0: Signer, wallet1: Signer;
let masterSigner: Signer;
let instaConnectorsV2: Contract;
let connector: Contract;
before(async () => {
// await hre.network.provider.request({
// method: "hardhat_reset",
// params: [
// {
// forking: {
// // @ts-ignore
// jsonRpcUrl: hre.config.networks.hardhat.forking.url,
// blockNumber: 14334859
// },
// },
// ],
// });
[wallet0, wallet1] = await ethers.getSigners();
masterSigner = await getMasterSigner();
instaConnectorsV2 = await ethers.getContractAt(
abis.core.connectorsV2,
addresses.core.connectorsV2
);
connector = await deployAndEnableConnector({
connectorName,
contractArtifact: ConnectV2LidoStEth__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 stake the eth", async function() {
const _amt = ethers.utils.parseEther("1");
const stETHToken = await ethers.getContractAt(
lido_abi,
"0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"
);
const initialstEthBalance = await stETHToken.balanceOf(dsaWallet0.address)
const spells = [
{
connector: connectorName,
method: "deposit",
args: [_amt,0,0]
},
];
const tx = await dsaWallet0
.connect(wallet0)
.cast(...encodeSpells(spells), await wallet1.getAddress());
const receipt = await tx.wait();
const finalstEthBalance = await stETHToken.balanceOf(dsaWallet0.address)
expect(finalstEthBalance).to.be.gt(initialstEthBalance);
expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.lte(
ethers.utils.parseEther("9")
);
});
});
});