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

Fix gas airdrop #166

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

Fix gas airdrop #166

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa9aad6
chore: reduce code complexity by _doGasAirdrop()
ChiTimesChi Jun 21, 2022
7490e38
fix: enable gas airdrop on withdraw()
ChiTimesChi Jun 21, 2022
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
22 changes: 15 additions & 7 deletions contracts/bridge/SynapseBridge.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
emit TokenWithdraw(to, token, amount, fee, kappa);
token.safeTransfer(to, amount.sub(fee));
}
// Transfer gas airdrop
_doGasAirdrop(to);
}

/**
Expand All @@ -244,9 +246,8 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
emit TokenMint(to, token, amount.sub(fee), fee, kappa);
token.mint(address(this), amount);
IERC20(token).safeTransfer(to, amount.sub(fee));
if (chainGasAmount != 0 && address(this).balance > chainGasAmount) {
to.call.value(chainGasAmount)("");
}
// Transfer gas airdrop
_doGasAirdrop(to);
}

/**
Expand Down Expand Up @@ -353,10 +354,6 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
require(!kappaMap[kappa], "Kappa is already present");
kappaMap[kappa] = true;
fees[address(token)] = fees[address(token)].add(fee);
// Transfer gas airdrop
if (chainGasAmount != 0 && address(this).balance > chainGasAmount) {
to.call.value(chainGasAmount)("");
}
// first check to make sure more will be given than min amount required
uint256 expectedOutput = ISwap(pool).calculateSwap(tokenIndexFrom, tokenIndexTo, amount.sub(fee));

Expand Down Expand Up @@ -431,6 +428,8 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
kappa
);
}
// Transfer gas airdrop
_doGasAirdrop(to);
}

/**
Expand Down Expand Up @@ -511,6 +510,7 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
kappa
);
}
// withdrawAndRemove() happens only on Mainnet, where gas airdrop is disabled
}

// BRIDGE FUNCTIONS TO HANDLE DIFF ADDRESSES
Expand All @@ -530,4 +530,12 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
emit TokenRedeemV2(to, chainId, token, amount);
token.burnFrom(msg.sender, amount);
}

function _doGasAirdrop(address to) internal returns (uint256 airdroppedAmount) {
uint256 airdropValue = chainGasAmount;
if (airdropValue > 0 && address(this).balance >= airdropValue) {
(bool success, ) = to.call{value: airdropValue}("");
if (success) airdroppedAmount = airdropValue;
}
}
}