make isCurie configurable

scroll-tech · yiweichi · Jul 9, 2024 · Jul 10, 2024 · Jul 10, 2024 · Jul 17, 2024
commit 0277a66e7ff8bcd9b8bc65f8ab567bdf109cfdf2
diff --git a/scripts/deterministic/DeployScroll.s.sol b/scripts/deterministic/DeployScroll.s.sol
@@ -621,7 +621,7 @@ contract DeployScroll is DeterminsticDeployment {
     }
 
     function deployL1GasPriceOracle() private {
-        bytes memory args = abi.encode(DEPLOYER_ADDR);
+        bytes memory args = abi.encode(DEPLOYER_ADDR, true);
         L1_GAS_PRICE_ORACLE_ADDR = deploy("L1_GAS_PRICE_ORACLE", type(L1GasPriceOracle).creationCode, args);
     }
 

diff --git a/scripts/deterministic/GenerateGenesis.s.sol b/scripts/deterministic/GenerateGenesis.s.sol
@@ -85,7 +85,7 @@ contract GenerateGenesis is DeployScroll {
         }
 
         // set code
-        L1GasPriceOracle _oracle = new L1GasPriceOracle(OWNER_ADDR);
+        L1GasPriceOracle _oracle = new L1GasPriceOracle(OWNER_ADDR, true);
         vm.etch(predeployAddr, address(_oracle).code);
 
         // set storage

diff --git a/scripts/foundry/DeployL2BridgeContracts.s.sol b/scripts/foundry/DeployL2BridgeContracts.s.sol
@@ -92,7 +92,7 @@ contract DeployL2BridgeContracts is Script {
         }
 
         address owner = vm.addr(L2_DEPLOYER_PRIVATE_KEY);
-        oracle = new L1GasPriceOracle(owner);
+        oracle = new L1GasPriceOracle(owner, true);
 
         logAddress("L1_GAS_PRICE_ORACLE_ADDR", address(oracle));
     }

diff --git a/src/L2/predeploys/L1GasPriceOracle.sol b/src/L2/predeploys/L1GasPriceOracle.sol
@@ -111,11 +111,10 @@ contract L1GasPriceOracle is OwnableBase, IL1GasPriceOracle {
      * Constructor *
      ***************/
 
-    constructor(address _owner) {
+    constructor(address _owner, bool _isCurie) {
         _transferOwnership(_owner);
 
-        // by default we enable Curie from genesis
-        isCurie = true;
+        isCurie = _isCurie;
     }
 
     /*************************

diff --git a/src/test/L1GasPriceOracle.t.sol b/src/test/L1GasPriceOracle.t.sol
@@ -19,7 +19,7 @@ contract L1GasPriceOracleTest is DSTestPlus {
 
     function setUp() public {
         whitelist = new Whitelist(address(this));
-        oracle = new L1GasPriceOracle(address(this));
+        oracle = new L1GasPriceOracle(address(this), false);
         oracle.updateWhitelist(address(whitelist));
 
         address[] memory _accounts = new address[](1);

diff --git a/src/test/L2GatewayTestBase.t.sol b/src/test/L2GatewayTestBase.t.sol
@@ -69,7 +69,7 @@ abstract contract L2GatewayTestBase is DSTestPlus {
         whitelist = new Whitelist(address(this));
         l1BlockContainer = new L1BlockContainer(address(this));
         l2MessageQueue = new L2MessageQueue(address(this));
-        l1GasOracle = new L1GasPriceOracle(address(this));
+        l1GasOracle = new L1GasPriceOracle(address(this), false);
         l2Messenger = L2ScrollMessenger(payable(_deployProxy(address(0))));
 
         // Upgrade the L2ScrollMessenger implementation and initialize

diff --git a/src/test/L2ScrollMessenger.t.sol b/src/test/L2ScrollMessenger.t.sol
@@ -34,7 +34,7 @@ contract L2ScrollMessengerTest is DSTestPlus {
         whitelist = new Whitelist(address(this));
         l1BlockContainer = new L1BlockContainer(address(this));
         l2MessageQueue = new L2MessageQueue(address(this));
-        l1GasOracle = new L1GasPriceOracle(address(this));
+        l1GasOracle = new L1GasPriceOracle(address(this), false);
         l2Messenger = L2ScrollMessenger(
             payable(
                 new ERC1967Proxy(