Merge pull request #123 from bancorprotocol/pol-eth-to-bnt

carbon pol eth conversion - minor fix
bancorprotocol · Nov 28, 2023 · c5cee7d · c5cee7d
2 parents cb56770 + 49b1aa1
commit c5cee7d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/contracts/pol/CarbonPOL.sol b/contracts/pol/CarbonPOL.sol
@@ -179,7 +179,7 @@ contract CarbonPOL is ICarbonPOL, Upgradeable, ReentrancyGuardUpgradeable, Utils
         }
         _tradingStartTimes[token] = uint32(block.timestamp);
         _initialPrice[token] = price;
-        emit TradingEnabled(token, price);
+        emit TradingEnabled({ token: token, price: price });
     }
 
     /**
@@ -193,7 +193,7 @@ contract CarbonPOL is ICarbonPOL, Upgradeable, ReentrancyGuardUpgradeable, Utils
         _tradingStartTimes[NATIVE_TOKEN] = uint32(block.timestamp);
         _initialPrice[NATIVE_TOKEN] = price;
         _ethSaleAmount.current = Math.min(address(this).balance, _ethSaleAmount.initial).toUint128();
-        emit TradingEnabled(NATIVE_TOKEN, price);
+        emit TradingEnabled({ token: NATIVE_TOKEN, price: price });
     }
 
     /**
@@ -308,7 +308,7 @@ contract CarbonPOL is ICarbonPOL, Upgradeable, ReentrancyGuardUpgradeable, Utils
         } else {
             inputAmount = _sellTokenForETH(token, amount);
         }
-        emit TokenTraded(msg.sender, token, amount, inputAmount);
+        emit TokenTraded({ caller: msg.sender, token: token, inputAmount: inputAmount, outputAmount: amount });
     }
 
     function _sellTokenForETH(Token token, uint128 amount) private returns (uint128) {
@@ -356,7 +356,7 @@ contract CarbonPOL is ICarbonPOL, Upgradeable, ReentrancyGuardUpgradeable, Utils
             _initialPrice[NATIVE_TOKEN] = price;
             _tradingStartTimes[NATIVE_TOKEN] = uint32(block.timestamp);
             // emit price updated event
-            emit PriceUpdated(NATIVE_TOKEN, price);
+            emit PriceUpdated({ token: NATIVE_TOKEN, price: price });
         }
 
         return bntRequired;
@@ -375,7 +375,10 @@ contract CarbonPOL is ICarbonPOL, Upgradeable, ReentrancyGuardUpgradeable, Utils
 
         _marketPriceMultiply = newMarketPriceMultiply;
 
-        emit MarketPriceMultiplyUpdated(prevMarketPriceMultiply, newMarketPriceMultiply);
+        emit MarketPriceMultiplyUpdated({
+            prevMarketPriceMultiply: prevMarketPriceMultiply,
+            newMarketPriceMultiply: newMarketPriceMultiply
+        });
     }
 
     /**
@@ -391,7 +394,10 @@ contract CarbonPOL is ICarbonPOL, Upgradeable, ReentrancyGuardUpgradeable, Utils
 
         _priceDecayHalfLife = newPriceDecayHalfLife;
 
-        emit PriceDecayHalfLifeUpdated(prevPriceDecayHalfLife, newPriceDecayHalfLife);
+        emit PriceDecayHalfLifeUpdated({
+            prevPriceDecayHalfLife: prevPriceDecayHalfLife,
+            newPriceDecayHalfLife: newPriceDecayHalfLife
+        });
     }
 
     /**
@@ -412,7 +418,7 @@ contract CarbonPOL is ICarbonPOL, Upgradeable, ReentrancyGuardUpgradeable, Utils
             _ethSaleAmount.current = Math.min(address(this).balance, _ethSaleAmount.initial).toUint128();
         }
 
-        emit EthSaleAmountUpdated(prevEthSaleAmount, newEthSaleAmount);
+        emit EthSaleAmountUpdated({ prevEthSaleAmount: prevEthSaleAmount, newEthSaleAmount: newEthSaleAmount });
     }
 
     /**
@@ -428,7 +434,10 @@ contract CarbonPOL is ICarbonPOL, Upgradeable, ReentrancyGuardUpgradeable, Utils
 
         _minEthSaleAmount = newMinEthSaleAmount;
 
-        emit MinEthSaleAmountUpdated(prevMinEthSaleAmount, newMinEthSaleAmount);
+        emit MinEthSaleAmountUpdated({
+            prevMinEthSaleAmount: prevMinEthSaleAmount,
+            newMinEthSaleAmount: newMinEthSaleAmount
+        });
     }
 
     /**

diff --git a/test/forge/CarbonPOL.t.sol b/test/forge/CarbonPOL.t.sol
@@ -619,7 +619,7 @@ contract CarbonPOLTest is TestFixture {
 
         // trade
         vm.expectEmit();
-        emit TokenTraded(user1, token, tradeAmount, expectedTradeInput);
+        emit TokenTraded(user1, token, expectedTradeInput, tradeAmount);
         carbonPOL.trade{ value: expectedTradeInput }(token, tradeAmount);
 
         vm.stopPrank();
@@ -648,7 +648,7 @@ contract CarbonPOLTest is TestFixture {
 
         // trade
         vm.expectEmit();
-        emit TokenTraded(user1, token, tradeAmount, expectedTradeInput);
+        emit TokenTraded(user1, token, expectedTradeInput, tradeAmount);
         carbonPOL.trade(token, tradeAmount);
 
         vm.stopPrank();