Merge pull request #161 from bancorprotocol/carbon-vortex-2.0

Carbon vortex - add maxInput
bancorprotocol · Aug 19, 2024 · c7480fb · c7480fb
2 parents 7fad3e8 + ba4f733
commit c7480fb
Show file tree

Hide file tree

Showing 7 changed files with 7,243 additions and 5,730 deletions.
diff --git a/contracts/helpers/TestReenterCarbonVortex.sol b/contracts/helpers/TestReenterCarbonVortex.sol
@@ -25,7 +25,7 @@ contract TestReenterCarbonVortex {
         _carbonVortex.execute(tokens);
     }
 
-    function tryReenterCarbonVortexTrade(Token token, uint128 targetAmount) external payable {
-        _carbonVortex.trade{ value: msg.value }(token, targetAmount);
+    function tryReenterCarbonVortexTrade(Token token, uint128 targetAmount, uint128 maxInput) external payable {
+        _carbonVortex.trade{ value: msg.value }(token, targetAmount, maxInput);
     }
 }
diff --git a/contracts/vortex/CarbonVortex.sol b/contracts/vortex/CarbonVortex.sol
@@ -614,23 +614,28 @@ contract CarbonVortex is ICarbonVortex, Upgradeable, ReentrancyGuardUpgradeable,
      */
     function trade(
         Token token,
-        uint128 targetAmount
+        uint128 targetAmount,
+        uint128 maxInput
     ) external payable nonReentrant validToken(token) greaterThanZero(targetAmount) {
         uint128 sourceAmount;
         if (token == _targetToken) {
-            sourceAmount = _sellTargetForFinalTarget(targetAmount);
+            sourceAmount = _sellTargetForFinalTarget(targetAmount, maxInput);
         } else {
-            sourceAmount = _sellTokenForTargetToken(token, targetAmount);
+            sourceAmount = _sellTokenForTargetToken(token, targetAmount, maxInput);
         }
         emit TokenTraded({ caller: msg.sender, token: token, sourceAmount: sourceAmount, targetAmount: targetAmount });
     }
 
-    function _sellTokenForTargetToken(Token token, uint128 targetAmount) private returns (uint128) {
+    function _sellTokenForTargetToken(Token token, uint128 targetAmount, uint128 maxInput) private returns (uint128) {
         uint128 sourceAmount = expectedTradeInput(token, targetAmount);
         // revert if trade requires 0 target token
         if (sourceAmount == 0) {
             revert InvalidTrade();
         }
+        // revert if trade requires more than maxInput
+        if (sourceAmount > maxInput) {
+            revert GreaterThanMaxInput();
+        }
         // revert if unnecessary native token is received
         if (_targetToken != NATIVE_TOKEN && msg.value > 0) {
             revert UnnecessaryNativeTokenReceived();
@@ -673,12 +678,16 @@ contract CarbonVortex is ICarbonVortex, Upgradeable, ReentrancyGuardUpgradeable,
         return sourceAmount;
     }
 
-    function _sellTargetForFinalTarget(uint128 targetAmount) private returns (uint128) {
+    function _sellTargetForFinalTarget(uint128 targetAmount, uint128 maxInput) private returns (uint128) {
         uint128 sourceAmount = expectedTradeInput(_targetToken, targetAmount);
         // revert if trade requires 0 finalTarget tokens
         if (sourceAmount == 0) {
             revert InvalidTrade();
         }
+        // revert if trade requires more than maxInput
+        if (sourceAmount > maxInput) {
+            revert GreaterThanMaxInput();
+        }
 
         // check enough final target token (if final target token is native) has been sent for the trade
         if (_finalTargetToken == NATIVE_TOKEN) {

diff --git a/contracts/vortex/interfaces/ICarbonVortex.sol b/contracts/vortex/interfaces/ICarbonVortex.sol
@@ -16,6 +16,7 @@ interface ICarbonVortex is IUpgradeable {
     error InvalidTrade();
     error TradingDisabled();
     error PairDisabled();
+    error GreaterThanMaxInput();
     error InsufficientNativeTokenSent();
     error InsufficientAmountForTrading();
     error UnnecessaryNativeTokenReceived();
@@ -196,8 +197,9 @@ interface ICarbonVortex is IUpgradeable {
      * @notice trades *targetToken* for *targetAmount* of *token* based on the current token price (trade by target amount)
      * @notice if token == *targetToken*, trades *finalTargetToken* for amount of *targetToken* and also
      * @notice resets the current token sale amount if it's below the min amount after a trade
+     * @notice reverts if source amount required is greater than maxInput
      */
-    function trade(Token token, uint128 targetAmount) external payable;
+    function trade(Token token, uint128 targetAmount, uint128 maxInput) external payable;
 
     /**
      * @notice withdraws the fees of the provided token from Carbon and

diff --git a/deployments/run-testnet.sh b/deployments/run-testnet.sh
@@ -27,11 +27,16 @@ if [ -z "$network_id" ] || [ "$network_id" == "null" ]; then
     network_id=${TENDERLY_NETWORK_ID:-"1"}
 fi
 
+# Ensure network_id is a number
+network_id=$((network_id + 0))
+
 echo "Creating a $network_name Tenderly Testnet with Chain Id $network_id... "
 echo
 
 # API Endpoint for creating a testnet
-TENDERLY_TESTNET_API="https://api.tenderly.co/api/v1/account/${username}/project/${project}/testnet/container"
+TENDERLY_TESTNET_API="https://api.tenderly.co/api/v1/account/${username}/project/${project}/vnets"
+# Get the current timestamp to use as a unique testnet slug
+timestamp=$(date +"%s")
 
 # Setup cleanup function
 cleanup() {
@@ -50,23 +55,24 @@ trap cleanup TERM EXIT
 response=$(curl -sX POST "$TENDERLY_TESTNET_API" \
     -H "Content-Type: application/json" -H "X-Access-Key: ${TENDERLY_ACCESS_KEY}" \
     -d '{
-        "displayName": "Carbon Contracts Testnet",
-        "description": "",
-        "visibility": "TEAM",
-        "tags": {
-            "purpose": "development"
+        "slug": "carbon-contracts-testnet-'${timestamp}'",
+        "display_name": "Carbon Contracts Testnet",
+        "fork_config": {
+            "network_id": '"${network_id}"',
+            "block_number": "latest"
         },
-        "networkConfig": {
-            "networkId": "'${network_id}'",
-            "blockNumber": "latest",
-            "baseFeePerGas": "1"
+        "virtual_network_config": {
+            "chain_config": {
+                "chain_id": '"${network_id}"'
+            }
         },
-        "private": true,
-        "syncState": false
+        "sync_state_config": {
+            "enabled": false
+        }
     }')
 
-testnet_id=$(echo "$response" | jq -r '.container.id')
-provider_url=$(echo "$response" | jq -r '.container.connectivityConfig.endpoints[0].uri')
+testnet_id=$(echo "$response" | jq -r '.id')
+provider_url=$(echo "$response" | jq -r '.rpcs[0].url')
 
 echo "Created Tenderly Testnet ${testnet_id} at ${username}/${project}..."
 echo

diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "clean": "rm -rf artifacts cache coverage typechain-types"
   },
   "dependencies": {
-    "hardhat": "2.15.0"
+    "hardhat": "2.22.8"
   },
   "devDependencies": {
     "@anders-t/ethers-ledger": "^1.0.4",