Feat/syn bridge unified [SYN-91]

.github/workflows/coveralls.yaml

@@ -31,7 +31,7 @@ jobs:
           node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:

.github/workflows/test.yaml

@@ -51,7 +51,7 @@ jobs:
           submodules: recursive
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -82,7 +82,7 @@ jobs:
           submodules: recursive
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:

contracts/bridge/SynapseBridge.sol

@@ -29,11 +29,17 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
     mapping(address => uint256) private fees;
 
     uint256 public startBlockNumber;
-    uint256 public constant bridgeVersion = 6;
+    uint256 public constant bridgeVersion = 8;
     uint256 public chainGasAmount;
     address payable public WETH_ADDRESS;
 
     mapping(bytes32 => bool) private kappaMap;
+    bool public isLegacySendDisabled;
+
+    modifier legacySendEnabled() {
+        require(!isLegacySendDisabled, "Legacy send is disabled");
+        _;
+    }
 
     receive() external payable {}
 
@@ -48,6 +54,17 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
         chainGasAmount = amount;
     }
 
+    function withdrawChainGas() external {
+        require(hasRole(GOVERNANCE_ROLE, msg.sender), "Not governance");
+        (bool success, ) = msg.sender.call{value: address(this).balance}("");
+        require(success, "ETH_TRANSFER_FAILED");
+    }
+
+    function setLegacySendDisabled(bool _isLegacySendDisabled) external {
+        require(hasRole(GOVERNANCE_ROLE, msg.sender), "Not governance");
+        isLegacySendDisabled = _isLegacySendDisabled;
+    }
+
     function setWethAddress(address payable _wethAddress) external {
         require(hasRole(DEFAULT_ADMIN_ROLE, msg.sender), "Not admin");
         WETH_ADDRESS = _wethAddress;
@@ -167,7 +184,7 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
         uint256 chainId,
         IERC20 token,
         uint256 amount
-    ) external nonReentrant whenNotPaused {
+    ) external nonReentrant whenNotPaused legacySendEnabled {
         emit TokenDeposit(to, chainId, token, amount);
         token.safeTransferFrom(msg.sender, address(this), amount);
     }
@@ -184,7 +201,7 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
         uint256 chainId,
         ERC20Burnable token,
         uint256 amount
-    ) external nonReentrant whenNotPaused {
+    ) external nonReentrant whenNotPaused legacySendEnabled {
         emit TokenRedeem(to, chainId, token, amount);
         token.burnFrom(msg.sender, amount);
     }
@@ -244,9 +261,6 @@ 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)("");
-        }
     }
 
     /**
@@ -269,7 +283,7 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
         uint8 tokenIndexTo,
         uint256 minDy,
         uint256 deadline
-    ) external nonReentrant whenNotPaused {
+    ) external nonReentrant whenNotPaused legacySendEnabled {
         emit TokenDepositAndSwap(to, chainId, token, amount, tokenIndexFrom, tokenIndexTo, minDy, deadline);
         token.safeTransferFrom(msg.sender, address(this), amount);
     }
@@ -294,7 +308,7 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
         uint8 tokenIndexTo,
         uint256 minDy,
         uint256 deadline
-    ) external nonReentrant whenNotPaused {
+    ) external nonReentrant whenNotPaused legacySendEnabled {
         emit TokenRedeemAndSwap(to, chainId, token, amount, tokenIndexFrom, tokenIndexTo, minDy, deadline);
         token.burnFrom(msg.sender, amount);
     }
@@ -317,7 +331,7 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
         uint8 swapTokenIndex,
         uint256 swapMinAmount,
         uint256 swapDeadline
-    ) external nonReentrant whenNotPaused {
+    ) external nonReentrant whenNotPaused legacySendEnabled {
         emit TokenRedeemAndRemove(to, chainId, token, amount, swapTokenIndex, swapMinAmount, swapDeadline);
         token.burnFrom(msg.sender, amount);
     }
@@ -353,10 +367,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));
 
@@ -526,7 +536,7 @@ contract SynapseBridge is Initializable, AccessControlUpgradeable, ReentrancyGua
         uint256 chainId,
         ERC20Burnable token,
         uint256 amount
-    ) external nonReentrant whenNotPaused {
+    ) external nonReentrant whenNotPaused legacySendEnabled {
         emit TokenRedeemV2(to, chainId, token, amount);
         token.burnFrom(msg.sender, amount);
     }