some naming issues

matter-labs · Apr 3, 2024 · 4d6f7f3 · 4d6f7f3
1 parent 0a29701
commit 4d6f7f3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/l1-contracts/contracts/state-transition/IStateTransitionManager.sol b/l1-contracts/contracts/state-transition/IStateTransitionManager.sol
@@ -25,7 +25,7 @@ struct StateTransitionManagerInitializeData {
 
 interface IStateTransitionManager {
     // when a new Chain is added
-    event StateTransitionNewChain(uint256 indexed _chainId, address indexed _stateTransitionContract);
+    event NewHyperchain(uint256 indexed _chainId, address indexed _stateTransitionContract);
 
     event SetChainIdUpgrade(
         address indexed _stateTransitionChain,

diff --git a/l1-contracts/contracts/state-transition/StateTransitionManager.sol b/l1-contracts/contracts/state-transition/StateTransitionManager.sol
@@ -232,7 +232,7 @@ contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Own
         address _stateTransitionContract
     ) external onlyOwner {
         stateTransition[_chainId] = _stateTransitionContract;
-        emit StateTransitionNewChain(_chainId, _stateTransitionContract);
+        emit NewHyperchain(_chainId, _stateTransitionContract);
     }
 
     /// @notice called by Bridgehub when a chain registers
@@ -284,6 +284,6 @@ contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Own
         // set chainId in VM
         _setChainIdUpgrade(_chainId, stateTransitionAddress);
 
-        emit StateTransitionNewChain(_chainId, stateTransitionAddress);
+        emit NewHyperchain(_chainId, stateTransitionAddress);
     }
 }
diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol
@@ -86,10 +86,10 @@ contract AdminFacet is ZkSyncStateTransitionBase, IAdmin {
         emit NewBaseTokenMultiplier(oldNominator, oldDenominator, _nominator, _denominator);
     }
 
-    function setPubdataPricingMode(PubdataPricingMode _validiumMode) external onlyAdmin {
+    function setPubdataPricingMode(PubdataPricingMode _pricingMode) external onlyAdmin {
         require(s.totalBatchesCommitted == 0, "AdminFacet: set validium only after genesis"); // Validium mode can be set only before the first batch is committed
-        s.feeParams.pubdataPricingMode = _validiumMode;
-        emit ValidiumModeStatusUpdate(_validiumMode);
+        s.feeParams.pubdataPricingMode = _pricingMode;
+        emit ValidiumModeStatusUpdate(_pricingMode);
     }
 
     /*//////////////////////////////////////////////////////////////

diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol
@@ -40,7 +40,7 @@ interface IAdmin is IZkSyncStateTransitionBase {
     function setTokenMultiplier(uint128 _nominator, uint128 _denominator) external;
 
     /// @notice Used to set to validium mode directly after genesis (rollup is default)
-    function setPubdataPricingMode(PubdataPricingMode _validiumMode) external;
+    function setPubdataPricingMode(PubdataPricingMode _pricingMode) external;
 
     function upgradeChainFromVersion(uint256 _protocolVersion, Diamond.DiamondCutData calldata _cutData) external;
 

diff --git a/l1-contracts/src.ts/deploy.ts b/l1-contracts/src.ts/deploy.ts
@@ -664,7 +664,7 @@ export class Deployer {
       const diamondProxyAddress =
         "0x" +
         receipt.logs
-          .find((log) => log.topics[0] == stateTransitionManager.interface.getEventTopic("StateTransitionNewChain"))
+          .find((log) => log.topics[0] == stateTransitionManager.interface.getEventTopic("NewHyperchain"))
           .topics[2].slice(26);
       this.addresses.StateTransition.DiamondProxy = diamondProxyAddress;
       if (this.verbose) {