From 4bd7361a4bf4e58e1a72dc0dd4645d577b5313c7 Mon Sep 17 00:00:00 2001 From: Morty Date: Wed, 9 Oct 2024 20:57:48 +0800 Subject: [PATCH] clean up --- scripts/deterministic/Configuration.sol | 4 ---- scripts/deterministic/GenerateConfigs.s.sol | 7 ++++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/deterministic/Configuration.sol b/scripts/deterministic/Configuration.sol index 693eee6..eed6e28 100644 --- a/scripts/deterministic/Configuration.sol +++ b/scripts/deterministic/Configuration.sol @@ -39,10 +39,6 @@ abstract contract Configuration is Script { uint256 internal L1_CONTRACT_DEPLOYMENT_BLOCK; bool internal ALTERNATIVE_GAS_TOKEN_ENABLED; - bool internal GAS_ORACLE_INCORPORATE_TOKEN_EXCHANGE_RATE_ENANBLED; - string internal EXCHANGE_RATE_UPDATE_MODE; - string internal FIXED_EXCHANGE_RATE; - string internal TOKEN_SYMBOL_PAIR; bool internal TEST_ENV_MOCK_FINALIZE_ENABLED; uint256 internal TEST_ENV_MOCK_FINALIZE_TIMEOUT_SEC; diff --git a/scripts/deterministic/GenerateConfigs.s.sol b/scripts/deterministic/GenerateConfigs.s.sol index d4ca0e6..8c452f3 100644 --- a/scripts/deterministic/GenerateConfigs.s.sol +++ b/scripts/deterministic/GenerateConfigs.s.sol @@ -58,21 +58,22 @@ contract GenerateRollupConfig is DeployScroll { // alternative gas token configuration for gas oracle if (ALTERNATIVE_GAS_TOKEN_ENABLED) { + bool GAS_ORACLE_INCORPORATE_TOKEN_EXCHANGE_RATE_ENANBLED; if (vm.keyExistsToml(cfg, ".gas-token.GAS_ORACLE_INCORPORATE_TOKEN_EXCHANGE_RATE_ENANBLED")) { GAS_ORACLE_INCORPORATE_TOKEN_EXCHANGE_RATE_ENANBLED = cfg.readBool(".gas-token.GAS_ORACLE_INCORPORATE_TOKEN_EXCHANGE_RATE_ENANBLED"); vm.writeJson(vm.toString(GAS_ORACLE_INCORPORATE_TOKEN_EXCHANGE_RATE_ENANBLED), ROLLUP_CONFIG_PATH, ".l1_config.relayer_config.gas_oracle_config.alternative_gas_token_config.enabled"); vm.writeJson(vm.toString(GAS_ORACLE_INCORPORATE_TOKEN_EXCHANGE_RATE_ENANBLED), ROLLUP_CONFIG_PATH, ".l2_config.relayer_config.gas_oracle_config.alternative_gas_token_config.enabled"); } if (GAS_ORACLE_INCORPORATE_TOKEN_EXCHANGE_RATE_ENANBLED) { - EXCHANGE_RATE_UPDATE_MODE = cfg.readString(".gas-token.EXCHANGE_RATE_UPDATE_MODE"); + string memory EXCHANGE_RATE_UPDATE_MODE = cfg.readString(".gas-token.EXCHANGE_RATE_UPDATE_MODE"); vm.writeJson(EXCHANGE_RATE_UPDATE_MODE, ROLLUP_CONFIG_PATH, ".l1_config.relayer_config.gas_oracle_config.alternative_gas_token_config.mode"); vm.writeJson(EXCHANGE_RATE_UPDATE_MODE, ROLLUP_CONFIG_PATH, ".l2_config.relayer_config.gas_oracle_config.alternative_gas_token_config.mode"); if (keccak256(abi.encodePacked(EXCHANGE_RATE_UPDATE_MODE)) == keccak256("Fixed")) { - FIXED_EXCHANGE_RATE = cfg.readString(".gas-token.FIXED_EXCHANGE_RATE"); + string memory FIXED_EXCHANGE_RATE = cfg.readString(".gas-token.FIXED_EXCHANGE_RATE"); vm.writeJson(FIXED_EXCHANGE_RATE, ROLLUP_CONFIG_PATH, ".l1_config.relayer_config.gas_oracle_config.alternative_gas_token_config.fixed_exchange_rate"); vm.writeJson(FIXED_EXCHANGE_RATE, ROLLUP_CONFIG_PATH, ".l2_config.relayer_config.gas_oracle_config.alternative_gas_token_config.fixed_exchange_rate"); } else if (keccak256(abi.encodePacked(EXCHANGE_RATE_UPDATE_MODE)) == keccak256("BinanceApi")) { - TOKEN_SYMBOL_PAIR = cfg.readString(".gas-token.TOKEN_SYMBOL_PAIR"); + string memory TOKEN_SYMBOL_PAIR = cfg.readString(".gas-token.TOKEN_SYMBOL_PAIR"); vm.writeJson(TOKEN_SYMBOL_PAIR, ROLLUP_CONFIG_PATH, ".l1_config.relayer_config.gas_oracle_config.alternative_gas_token_config.token_symbol_pair"); vm.writeJson(TOKEN_SYMBOL_PAIR, ROLLUP_CONFIG_PATH, ".l2_config.relayer_config.gas_oracle_config.alternative_gas_token_config.token_symbol_pair"); } else {