Skip to content

solve the issue : Time weighted distribution algorithm. #5

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

Open
microlumens wants to merge 3 commits into
base: master
Choose a base branch
from
Open

solve the issue : Time weighted distribution algorithm. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4472b54
add dUSD pool
Oct 24, 2020
e591be4
A Add new staking contract.
Skyge Oct 25, 2020
d5fd40c
update: disable stake btn
mrrobot2003 Aug 17, 2021
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
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<td> 0x308777dDEC61F5000D8394626d55dbB0312fe874 </td>
</tr>
<tr>
<td> GOLDx-DF Staking </td>
<td> GOLDx-USDx Staking </td>
<td> 0xdC7A844a45Ef936497FB916f1c2Ddb80F59a8aDc </td>
</tr>
<tr>
Expand All @@ -35,4 +35,8 @@
<td> dUSDT Staking </td>
<td> 0x324EebDAa45829c6A8eE903aFBc7B61AF48538df </td>
</tr>
<tr>
<td> dUSD Staking </td>
<td> 0xD26033b5CEEDce6d8cdDF532c6Cd1eBc2f0ccadf </td>
</tr>
</table>
1 change: 1 addition & 0 deletions web-front/src/assets/dUSD.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion web-front/src/components/dashboard/dashboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ class DashBoard extends Component {
"GOLDx/USDx": GOLDx_logo,
"USDx/USDC":USDx_USDC_logo
};
const dashboardData = rewardPools.map((rp) => ({
let dashboardData = rewardPools.map((rp) =>
// 判断是 dUSD-SFG/DF 逻辑 则不展示 数据
(rp.id !== 'dUSD') && ({
poolUrlParam: rp.id,
rp,
logo: svgLogo[rp.id],
Expand All @@ -46,6 +48,8 @@ class DashBoard extends Component {
AvailableToClaim: "...",
rewardsAvailable: "...",
}));
dashboardData = dashboardData.filter(item=> item !==false)
// 判断是 dUSD-SFG/DF 逻辑 则不展示 数据
this.state = {
rewardPools,
loading: !account,
Expand Down Expand Up @@ -132,6 +136,7 @@ class DashBoard extends Component {
this.setState(() => ({
modalOpen: false,
}));
console.log(dashboardData)
const web3 = new Web3(store.getStore("web3context").library.provider);
let bn = web3.utils.toBN;
const poolsContract = await Promise.all(
Expand Down
8 changes: 4 additions & 4 deletions web-front/src/components/header/header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ export default class App extends React.Component {
<div className={'header__overlay'}>
<div className={"menuItem"}>
<a rel="noopener noreferrer" href="https://trade.dforce.network/" className={'header__overlay_item'}>
<span>dForce Swap</span>
<span><FormattedMessage id='dForceTrade' /></span>
<label>
<FormattedMessage id='Instant_Swap_of_Stable_Assets' />
<FormattedMessage id='slogon' />
</label>
</a>
</div>
Expand Down Expand Up @@ -243,10 +243,10 @@ export default class App extends React.Component {
<div className={this.state.meun3 ? 'meun1' : 'only1px'}>
<div className='m-item'>
<a href='https://trade.dforce.network/' rel="noopener noreferrer">
<span className='title1'>dForce Swap</span>
<span className='title1'><FormattedMessage id='dForceTrade' /></span>
</a>
<span className='details'>
<FormattedMessage id='Instant_Swap_of_Stable_Assets' />
<FormattedMessage id='slogon' />
</span>
</div>
</div>
Expand Down
109 changes: 71 additions & 38 deletions web-front/src/components/rewardPools/rewardPools.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,21 +198,21 @@ const styles = theme => ({
display:'flex',
justifyContent:'center',
alignItems:'center',
'& a':{
color:'rgba(67,73,118,1)',
textDecoration:'underline',
// display:'block',
// width:'10px',
// height:'10px',
// margin:'0 0 12px 14px',
// backgroundImage:'url('+require('../../assets/pool-link-icon.svg')+')',
// backgroundSize:'auto',
// backgroundRepeat:'no-repeat',
'&:hover':{
color:'#BA59FF'
// backgroundImage:'url('+require('../../assets/pool-linked-icon.svg')+')',
}
},
// '& a':{
// color:'rgba(67,73,118,1)',
// textDecoration:'underline',
// // display:'block',
// // width:'10px',
// // height:'10px',
// // margin:'0 0 12px 14px',
// // backgroundImage:'url('+require('../../assets/pool-link-icon.svg')+')',
// // backgroundSize:'auto',
// // backgroundRepeat:'no-repeat',
// '&:hover':{
// color:'#BA59FF'
// // backgroundImage:'url('+require('../../assets/pool-linked-icon.svg')+')',
// }
// },
},
poolName: {
height: '25px',
Expand All @@ -222,6 +222,13 @@ const styles = theme => ({
lineHeight: '19px',
marginBottom: '8px'
},
underLine:{
color:'rgba(67,73,118,1)',
textDecoration:'underline',
'&:hover':{
color:'#BA59FF'
}
},
tokensList: {
color: '#A4A7BE',
marginBottom: '10px',
Expand Down Expand Up @@ -349,6 +356,14 @@ const styles = theme => ({
margin: '20px auto 15px'
}
},
svgCenterdUSD: {
width: '80px',
height: '80px',
margin: '20px auto 20px',
[theme.breakpoints.down('md')]: {
margin: '20px auto 20px'
}
},
// poolAPY
poolApy:{
width:'874px',
Expand Down Expand Up @@ -567,12 +582,14 @@ class RewardPools extends Component {
</tr>
</>
:
rp.id !== 'dUSD'?
<tr className={classes.DFrow} key={rp.id}>
<td align="left"><FormattedMessage id={`${rp.tokens[0].Rush_type}_APY`}/></td>
<td align="right">{ROI[rp.id] ? this.formatAPYNumber(ROI[rp.id]*100)+'%' : '...'}</td>
<td align="right">0.00%</td>
<td align="right">{ROI[rp.id] ? this.formatAPYNumber(ROI[rp.id]*100)+'%' : '...'}</td>
</tr>
:<></>
))
}
<tr className={classes.subHead}><td colSpan="4"><FormattedMessage id='DF_APY'/></td></tr>
Expand Down Expand Up @@ -663,7 +680,7 @@ class RewardPools extends Component {
{
rewardPool.map(rp=>(
<div className={classes.DFpoolDiv} key={rp.id}>
<Typography variant='h3' className={classes.poolName}><a href={rp.link} rel="noopener noreferrer" target="_blank">Uniswap&nbsp;{rp.id}</a></Typography>
<Typography variant='h3' className={classes.poolName}><a className={classes.underLine} href={rp.link} rel="noopener noreferrer" target="_blank">Uniswap&nbsp;{rp.id}</a></Typography>
{/* <a className={classes.linkA} href={rp.link} rel="noopener noreferrer" target="_blank"></a> */}
</div>
))
Expand Down Expand Up @@ -691,28 +708,44 @@ class RewardPools extends Component {

return (<div className={classes.rewardPoolContainer} key={rewardPool.id} >
{/* <div className={classes.svgTitle}><img src={rewardPool.icon} alt="" /></div> */}
<Typography variant='h3' className={classes.poolName}>Uniswap&nbsp;{rewardPool.id}</Typography>
<Typography variant='h5' className={classes.poolWebsiteH5}><a className={classes.poolWebsite} href={rewardPool.link} target="_blank">{rewardPool.website}</a></Typography>
<div className={classes.svgCenter}><img src={rewardPool.logo} alt="" /></div>
<Typography varian='h4' className={classes.tokensList} align='center'>
{/* <FormattedMessage id='tips_stake' /> */}
{/* <b className={classes.B}><FormattedMessage id='dToken' /></b> */}
<b className={classes.B}><FormattedMessage id={`DF_${rewardPool.tokens[0].Rush_type}`} /></b>
{/* <FormattedMessage id='tips_earn' /> */}
{/* <b className={classes.B}><FormattedMessage id='tips_DF' /></b> */}
{/* {rewardPool.tokens.length > 0 && "Supported Tokens: " + tokensList}
{rewardPool.tokens.length == 0 && "No supported tokens currently"} */}
</Typography>
{/* <div className={classes.dTokenDataBox}>
{
<div className={classes.dTokenData}>
<b>
{ROI[rewardPool.tokens[0].ROI] ? this.formatAPYNumber(ROI[rewardPool.tokens[0].ROI]*100)+'%' : '...'}
</b>
</div>
}
</div> */}
<div className={classes.Btn} onClick={() => { if (rewardPool.tokens.length > 0) { this.navigateStake(rewardPool) } }}><b><FormattedMessage id='open' /></b></div>
{/* {
rewardPool.id === 'dUSD'?
<>
<Typography variant='h3' className={classes.poolName}><a className={classes.underLine} href={rewardPool.link} rel="noopener noreferrer" target="_blank">{rewardPool.id}</a></Typography>
<Typography variant='h5' className={classes.poolWebsiteH5}><a className={classes.poolWebsite} href={rewardPool.link} target="_blank">{rewardPool.website}</a></Typography>
<div className={classes.svgCenterdUSD}><img src={rewardPool.logo} alt="" /></div>
<Typography varian='h4' className={classes.tokensList} align='center'>
<b className={classes.B}><FormattedMessage id={`DF_${rewardPool.tokens[0].Rush_type}`} /></b>
</Typography>
<div className={classes.Btn} onClick={() => { if (rewardPool.tokens.length > 0) { this.navigateStake(rewardPool) } }}><b><FormattedMessage id='open' /></b>
</div>
</>
:
<> */}
<Typography variant='h3' className={classes.poolName}>{rewardPool.id}</Typography>
<Typography variant='h5' className={classes.poolWebsiteH5}><a className={classes.poolWebsite} href={rewardPool.link} target="_blank">{rewardPool.website}</a></Typography>
<div className={rewardPool.id==='dUSD'?classes.svgCenterdUSD:classes.svgCenter}><img src={rewardPool.logo} alt="" /></div>
<Typography varian='h4' className={classes.tokensList} align='center'>
{/* <FormattedMessage id='tips_stake' /> */}
{/* <b className={classes.B}><FormattedMessage id='dToken' /></b> */}
<b className={classes.B}><FormattedMessage id={`DF_${rewardPool.tokens[0].Rush_type}`} /></b>
{/* <FormattedMessage id='tips_earn' /> */}
{/* <b className={classes.B}><FormattedMessage id='tips_DF' /></b> */}
{/* {rewardPool.tokens.length > 0 && "Supported Tokens: " + tokensList}
{rewardPool.tokens.length == 0 && "No supported tokens currently"} */}
</Typography>
{/* <div className={classes.dTokenDataBox}>
{
<div className={classes.dTokenData}>
<b>
{ROI[rewardPool.tokens[0].ROI] ? this.formatAPYNumber(ROI[rewardPool.tokens[0].ROI]*100)+'%' : '...'}
</b>
</div>
}
</div> */}
<div className={classes.Btn} onClick={() => { if (rewardPool.tokens.length > 0) { this.navigateStake(rewardPool) } }}><b><FormattedMessage id='open' /></b></div>
{/* </>
} */}
</div>)
}
}
Expand Down
Loading