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

Jump to bottom

Remove owner transfer of baseTokens on sellDT #778

Merged
merged 3 commits into from
Nov 14, 2023
Merged

Remove owner transfer of baseTokens on sellDT #778

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
5d084c2
remove transferFrom owners
alexcos20 Jul 27, 2023
aa56d1e
fix tests
alexcos20 Aug 29, 2023
bda9fd5
fix tests
alexcos20 Aug 29, 2023
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
45 changes: 14 additions & 31 deletions contracts/pools/fixedRate/FixedRateExchange.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ contract FixedRateExchange is ReentrancyGuard, IFixedRateExchange {
* If you construct your own template, please make sure to change the hardcoded value
*/
function getId() pure public returns (uint8) {
return 1;
return 2;
}

function getOPCFee(address baseTokenAddress) public view returns (uint) {
Expand Down Expand Up @@ -457,16 +457,14 @@ contract FixedRateExchange is ReentrancyGuard, IFixedRateExchange {
);

if (datatokenAmount > exchanges[exchangeId].dtBalance) {
//first, let's try to mint
//let's try to mint
if(exchanges[exchangeId].withMint
&& IERC20Template(exchanges[exchangeId].datatoken).isMinter(address(this)))
{
IERC20Template(exchanges[exchangeId].datatoken).mint(msg.sender,datatokenAmount);
}
else{
_pullUnderlying(exchanges[exchangeId].datatoken,exchanges[exchangeId].exchangeOwner,
msg.sender,
datatokenAmount);
revert("FixedRateExchange: No available datatokens");
}
} else {
exchanges[exchangeId].dtBalance = (exchanges[exchangeId].dtBalance)
Expand Down Expand Up @@ -544,27 +542,24 @@ contract FixedRateExchange is ReentrancyGuard, IFixedRateExchange {
.add(fee.publishMarketFeeAmount);
uint256 baseTokenAmountWithFees = fee.baseTokenAmount.add(fee.oceanFeeAmount)
.add(fee.publishMarketFeeAmount).add(fee.consumeMarketFeeAmount);
if (baseTokenAmountWithFees > exchanges[exchangeId].btBalance) {
// not enough baseTokens in fre, bail out
revert("FixedRateExchange: Not enough base tokens");
}
_pullUnderlying(exchanges[exchangeId].datatoken,msg.sender,
address(this),
datatokenAmount);
exchanges[exchangeId].dtBalance = (exchanges[exchangeId].dtBalance).add(
datatokenAmount
);
if (baseTokenAmountWithFees > exchanges[exchangeId].btBalance) {
_pullUnderlying(exchanges[exchangeId].baseToken,exchanges[exchangeId].exchangeOwner,
address(this),
baseTokenAmountWithFees);
IERC20(exchanges[exchangeId].baseToken).safeTransfer(
msg.sender,
fee.baseTokenAmount);
} else {
exchanges[exchangeId].btBalance = (exchanges[exchangeId].btBalance)

exchanges[exchangeId].btBalance = (exchanges[exchangeId].btBalance)
.sub(baseTokenAmountWithFees);
IERC20(exchanges[exchangeId].baseToken).safeTransfer(
IERC20(exchanges[exchangeId].baseToken).safeTransfer(
msg.sender,
fee.baseTokenAmount
);
}
);

if(consumeMarketAddress!= address(0) && fee.consumeMarketFeeAmount>0){
IERC20(exchanges[exchangeId].baseToken).safeTransfer(consumeMarketAddress, fee.consumeMarketFeeAmount);
emit ConsumeMarketFee(
Expand Down Expand Up @@ -842,13 +837,7 @@ contract FixedRateExchange is ReentrancyGuard, IFixedRateExchange {
- IERC20Template(exchanges[exchangeId].datatoken).totalSupply();
}
else {
uint256 balance = IERC20Template(exchanges[exchangeId].datatoken)
.balanceOf(exchanges[exchangeId].exchangeOwner);
uint256 allowance = IERC20Template(exchanges[exchangeId].datatoken)
.allowance(exchanges[exchangeId].exchangeOwner, address(this));
if (balance < allowance)
supply = balance.add(exchanges[exchangeId].dtBalance);
else supply = allowance.add(exchanges[exchangeId].dtBalance);
supply = exchanges[exchangeId].dtBalance;
}
}

Expand All @@ -866,13 +855,7 @@ contract FixedRateExchange is ReentrancyGuard, IFixedRateExchange {
{
if (exchanges[exchangeId].active == false) supply = 0;
else {
uint256 balance = IERC20Template(exchanges[exchangeId].baseToken)
.balanceOf(exchanges[exchangeId].exchangeOwner);
uint256 allowance = IERC20Template(exchanges[exchangeId].baseToken)
.allowance(exchanges[exchangeId].exchangeOwner, address(this));
if (balance < allowance)
supply = balance.add(exchanges[exchangeId].btBalance);
else supply = allowance.add(exchanges[exchangeId].btBalance);
supply = exchanges[exchangeId].btBalance;
}
}

Expand Down
Loading
Loading