Merge branch 'main' into gas-optimisations

catalystdao · Feb 29, 2024 · 3564831 · 3564831
2 parents 6b76e10 + fab0ba6
commit 3564831
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/evm/script/config/config_contracts.json b/evm/script/config/config_contracts.json
@@ -5,7 +5,6 @@
     "factory": "0x0f169fa42b47651E1F95f7cE9F2Ae1E44DA2671d",
     "volatile_mathlib": "0xBFEDF53f4FEfB0f520E5570355e732bc4c4C428e",
     "volatile_template": "0x463788aC702F3e000EB917417d8b49a972533854"
-  },
   "registry": {
     "describer": "0x02a52682aa3634734535bf761800492C9b05A6B0",
     "describer_registry": "0x85f7279F9434Ad9c0111042769d661D150b15452",

diff --git a/evm/src/CatalystVaultCommon.sol b/evm/src/CatalystVaultCommon.sol
@@ -544,15 +544,20 @@ abstract contract CatalystVaultCommon is
         // This call provides re-entry protection against re-entering this call. Otherwise, this call can always be called.
         address fallbackAddress = _releaseAssetEscrow(sendAssetHash, escrowAmount, escrowToken); // Only reverts for missing escrow,
 
+        // We are going to make a low-level call. It may revert (see comment below) but it should not revert if it runs out of gas (that should be raised). As such, get the current gas in the contract.
+        uint256 gasLeftBeforeCall = gasleft();
+
         // Make a low level call such that the transfer never fails. This is important for tokens
         // that use block lists.
         // This also implies that if you get blacklisted between when you initiated the swap and the swap failed, you
         // would lose the tokens.
         bytes memory payload = abi.encodeWithSignature("transfer(address,uint256)", fallbackAddress, escrowAmount);
         assembly ("memory-safe") {
-            let success := call(gas(), escrowToken, 0,  add(payload, 0x20), mload(payload), 0, 0)
+            let success := call(0x8000000000000000000000000000000000000000000000000000000000000000, escrowToken, 0,  add(payload, 0x20), mload(payload), 0, 0)
             // SafeTransferLib.safeTransferFrom(escrowToken, fallbackAddress, escrowAmount);
         }
+        // Check that the call didn't use all of its gas.
+        if(gasleft() < gasLeftBeforeCall * 1 / 63) revert NotEnoughGas();
 
         emit SendAssetFailure( // Never reverts.
             channelId,

diff --git a/evm/src/interfaces/ICatalystV1VaultErrors.sol b/evm/src/interfaces/ICatalystV1VaultErrors.sol
@@ -6,4 +6,5 @@ error ReturnInsufficient(uint256 result, uint256 minimum);  // 24557f0
 error VaultNotConnected();  // 2c64c1b
 error WithdrawRatioNotZero();  // b8003bf
 error UnusedUnitsAfterWithdrawal(uint256 Units);  // 0289311
-error EscrowAlreadyExists();  // ed77877
+error EscrowAlreadyExists();  // ed77877
+error NotEnoughGas(); // dd629f86