Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 2 additions & 9 deletions src/core/ElasticDAO.sol
Original file line number Diff line number Diff line change
Expand Up @@ -210,16 +210,9 @@ contract ElasticDAO is ReentryProtection {
* must be sent in the transaction by the calling address
* The token contract should be successfully be able to mint _deltaLambda
*/
function join()
external
payable
onlyAfterSummoning
onlyWhenOpen
preventReentry
{
function join() external payable onlyAfterSummoning onlyWhenOpen preventReentry {
Token.Instance memory token = _getToken();


ElasticGovernanceToken tokenContract = ElasticGovernanceToken(token.uuid);
uint256 capitalDelta =
ElasticMath.capitalDelta(
Expand Down Expand Up @@ -255,7 +248,7 @@ contract ElasticDAO is ReentryProtection {
require(success, 'ElasticDAO: Mint Shares Failed during Join');

// return extra ETH
if(success && msg.value > deltaE) {
if (success && msg.value > deltaE) {
(success, ) = msg.sender.call{ value: SafeMath.sub(msg.value, deltaE) }('');
require(success, 'ElasticDAO: TransactionFailed');
}
Expand Down
1 change: 0 additions & 1 deletion src/models/DAO.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ pragma experimental ABIEncoderV2;

import './Ecosystem.sol';
import './EternalModel.sol';
import '../libraries/SafeMath.sol';
import '../services/ReentryProtection.sol';

/**
Expand Down
1 change: 0 additions & 1 deletion src/models/Ecosystem.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ pragma solidity 0.7.2;
pragma experimental ABIEncoderV2;

import './EternalModel.sol';
import '../libraries/SafeMath.sol';
import '../services/ReentryProtection.sol';

/**
Expand Down
1 change: 0 additions & 1 deletion src/models/Token.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ pragma experimental ABIEncoderV2;

import './Ecosystem.sol';
import './EternalModel.sol';
import '../libraries/SafeMath.sol';
import '../services/ReentryProtection.sol';
import '../tokens/ElasticGovernanceToken.sol';

Expand Down
1 change: 0 additions & 1 deletion src/models/TokenHolder.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ pragma experimental ABIEncoderV2;
import './Ecosystem.sol';
import './EternalModel.sol';
import './Token.sol';
import '../libraries/SafeMath.sol';
import '../services/ReentryProtection.sol';

/**
Expand Down