Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge StETH and Lido into the one contract #225

Merged
merged 39 commits into from
Dec 8, 2020
Merged

Merge StETH and Lido into the one contract #225

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
d99d367
Move shares to Lido WIP
ujenjt Dec 3, 2020
8b1b7c3
Merge Lido and stETH token
ujenjt Dec 4, 2020
6665910
Fix transfer event after minting
ujenjt Dec 4, 2020
2c4a575
Fix test WIP
ujenjt Dec 4, 2020
23a5573
Add token proxy
ujenjt Dec 4, 2020
0d9cb83
Fix docs
ujenjt Dec 4, 2020
985a27d
Remove name, symbol and decimals from base token contract
ujenjt Dec 4, 2020
32bc5dc
Fix ownable
ujenjt Dec 4, 2020
421f52f
Refactor stETH
ujenjt Dec 4, 2020
a3d5212
Remove proxy token
ujenjt Dec 4, 2020
4440f35
Refactor emitting Transfer events after mints, add docs
ujenjt Dec 4, 2020
370efb8
Revert all changes in CstETH
ujenjt Dec 4, 2020
d0cc3be
Fix the rest tests
ujenjt Dec 4, 2020
2bf1af4
Update ABIs
ujenjt Dec 4, 2020
a7ae032
docs: little tweaks for StETH inline docs
kadmil Dec 4, 2020
f4b0781
docs: whitespaces
kadmil Dec 4, 2020
16fd6cb
docs: StETH doc tweaks
kadmil Dec 4, 2020
59fc770
Remove unused imports
ujenjt Dec 4, 2020
4e3d93e
Remove unused role
ujenjt Dec 4, 2020
cf6e356
fix: transfer function typo
kadmil Dec 4, 2020
f38da37
put Pausable back
kadmil Dec 4, 2020
a9a44db
sol double quotes
kadmil Dec 4, 2020
d46257a
fix: newlines and minor things
kadmil Dec 5, 2020
13a8bca
Add extra line
ujenjt Dec 5, 2020
2adb630
StETH polishing along with tests
ujenjt Dec 6, 2020
87a50ce
Remove StETH from apps, add BURN_ROLE to the Lido's arapp.json
ujenjt Dec 6, 2020
19d431c
docs: add note to modify happy path tests a bit
kadmil Dec 7, 2020
95594ea
chore: add more realistic test scenario
kadmil Dec 7, 2020
3386e24
Rename stETH mock to bypass name conflict
ujenjt Dec 7, 2020
f3812cc
Temporary disable tests because of a bug that fixed in diffeent branch
ujenjt Dec 7, 2020
4b4cd1b
Fix and update lido tests
ujenjt Dec 7, 2020
9e6cfaa
StETH typos
ujenjt Dec 7, 2020
38a207f
Fix scenario deploy
ujenjt Dec 7, 2020
bf2cb31
Update Lido abi
ujenjt Dec 7, 2020
6002693
Add BURN_ROLE permission for Lido to the template
ujenjt Dec 7, 2020
814fe46
improve stETH docs
skozin Dec 7, 2020
57031f6
stETH: use underscores in argument names
skozin Dec 7, 2020
5694d4d
stETH: rename `getSharesOf -> sharesOf` by analogy with `balanceOf`
skozin Dec 7, 2020
7938055
update Yarn lockfile reflecting the removal of steth app
skozin Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename stETH mock to bypass name conflict
  • Loading branch information
@ujenjt
ujenjt committed Dec 7, 2020
commit 3386e245a1a41bc2a583235d5d0e8411eaa97444
4 changes: 2 additions & 2 deletions contracts/0.6.12/mocks/StETHMock.sol → contracts/0.6.12/mocks/StETHMockERC20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ pragma solidity 0.6.12; // latest available for using OZ
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import "@openzeppelin/contracts/token/ERC20/ERC20Burnable.sol";


contract StETHMock is ERC20, ERC20Burnable {
//TODO: use StETHMock from 0.4.24 instead of this ERC20 based impl
contract StETHMockERC20 is ERC20, ERC20Burnable {
constructor() public ERC20("Liquid staked Lido Ether", "StETH") {}

uint256 public totalShares;
Expand Down
2 changes: 1 addition & 1 deletion test/0.6.12/csteth.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { ZERO_ADDRESS } = constants
const { shouldBehaveLikeERC20 } = require('./helpers/ERC20.behavior')

const CstETH = artifacts.require('CstETHMock')
const StETH = artifacts.require('StETHMock')
const StETH = artifacts.require('StETHMockERC20')

contract('CstETH', function ([deployer, initialHolder, recipient, anotherAccount, ...otherAccounts]) {
beforeEach(async function () {
Expand Down