Remove FeeCurrencyWhitelist

...and the BRIDGED_ETH address. The BridgedETH contract has already been
removed earlier when switching to OP-stack's custom gas currency
feature.

op-service/predeploys/addresses.go

@@ -43,7 +43,6 @@ const (
 	CeloRegistry                      = "0x000000000000000000000000000000000000ce10"
 	GoldToken                         = "0x471ece3750da237f93b8e339c536989b8978a438"
 	FeeHandler                        = "0xcd437749e43a154c07f3553504c68fbfd56b8778"
-	FeeCurrencyWhitelist              = "0xbb024e9cdcb2f9e34d893630d19611b8a5381b3c"
 	MentoFeeHandlerSeller             = "0x4efa274b7e33476c961065000d58ee09f7921a74"
 	UniswapFeeHandlerSeller           = "0xd3aee28548dbb65df03981f0dc0713bfcbd10a97"
 	SortedOracles                     = "0xefb84935239dacdecf7c5ba76d8de40b077b7b33"
@@ -92,7 +91,6 @@ var (
 	CeloRegistryAddr                      = common.HexToAddress(CeloRegistry)
 	GoldTokenAddr                         = common.HexToAddress(GoldToken)
 	FeeHandlerAddr                        = common.HexToAddress(FeeHandler)
-	FeeCurrencyWhitelistAddr              = common.HexToAddress(FeeCurrencyWhitelist)
 	MentoFeeHandlerSellerAddr             = common.HexToAddress(MentoFeeHandlerSeller)
 	UniswapFeeHandlerSellerAddr           = common.HexToAddress(UniswapFeeHandlerSeller)
 	SortedOraclesAddr                     = common.HexToAddress(SortedOracles)
@@ -185,7 +183,6 @@ func init() {
 	CeloPredeploys["CeloRegistry"] = &Predeploy{Address: CeloRegistryAddr}
 	CeloPredeploys["GoldToken"] = &Predeploy{Address: GoldTokenAddr}
 	CeloPredeploys["FeeHandler"] = &Predeploy{Address: FeeHandlerAddr}
-	CeloPredeploys["FeeCurrencyWhitelist"] = &Predeploy{Address: FeeCurrencyWhitelistAddr}
 	CeloPredeploys["MentoFeeHandlerSeller"] = &Predeploy{Address: MentoFeeHandlerSellerAddr}
 	CeloPredeploys["UniswapFeeHandlerSeller"] = &Predeploy{Address: UniswapFeeHandlerSellerAddr}
 	CeloPredeploys["SortedOracles"] = &Predeploy{Address: SortedOraclesAddr}

packages/contracts-bedrock/scripts/L2Genesis.s.sol

@@ -32,7 +32,6 @@ import { GoldToken } from "src/celo/GoldToken.sol";
 import { CeloPredeploys } from "src/celo/CeloPredeploys.sol";
 import { CeloRegistry } from "src/celo/CeloRegistry.sol";
 import { FeeHandler } from "src/celo/FeeHandler.sol";
-import { FeeCurrencyWhitelist } from "src/celo/FeeCurrencyWhitelist.sol";
 import { MentoFeeHandlerSeller } from "src/celo/MentoFeeHandlerSeller.sol";
 import { UniswapFeeHandlerSeller } from "src/celo/UniswapFeeHandlerSeller.sol";
 import { SortedOracles } from "src/celo/stability/SortedOracles.sol";
@@ -635,7 +634,6 @@ contract L2Genesis is Deployer {
         setCeloRegistry();
         setCeloGoldToken();
         setCeloFeeHandler();
-        setCeloFeeCurrencyWhitelist();
         setCeloMentoFeeHandlerSeller();
         setCeloUniswapFeeHandlerSeller();
         // setCeloSortedOracles();
@@ -696,17 +694,6 @@ contract L2Genesis is Deployer {
         _setupProxy(precompile, address(kontract));
     }
 
-    function setCeloFeeCurrencyWhitelist() internal {
-        FeeCurrencyWhitelist kontract = new FeeCurrencyWhitelist({ test: false });
-
-        address precompile = CeloPredeploys.FEE_CURRENCY_WHITELIST;
-        string memory cname = CeloPredeploys.getName(precompile);
-        console.log("Deploying %s implementation at: %s", cname, address(kontract));
-
-        vm.resetNonce(address(kontract));
-        _setupProxy(precompile, address(kontract));
-    }
-
     function setCeloMentoFeeHandlerSeller() internal {
         MentoFeeHandlerSeller kontract = new MentoFeeHandlerSeller({ test: false });
 

packages/contracts-bedrock/src/celo/CeloPredeploys.sol

@@ -9,13 +9,11 @@ library CeloPredeploys {
     address internal constant CELO_REGISTRY = 0x000000000000000000000000000000000000ce10;
     address internal constant GOLD_TOKEN = 0x471EcE3750Da237f93B8E339c536989b8978a438;
     address internal constant FEE_HANDLER = 0xcD437749E43A154C07F3553504c68fBfD56B8778;
-    address internal constant FEE_CURRENCY_WHITELIST = 0xBB024E9cdCB2f9E34d893630D19611B8A5381b3c;
     address internal constant MENTO_FEE_HANDLER_SELLER = 0x4eFa274B7e33476C961065000D58ee09F7921A74;
     address internal constant UNISWAP_FEE_HANDLER_SELLER = 0xD3aeE28548Dbb65DF03981f0dC0713BfCBd10a97;
     address internal constant SORTED_ORACLES = 0xefB84935239dAcdecF7c5bA76d8dE40b077B7b33;
     address internal constant ADDRESS_SORTED_LINKED_LIST_WITH_MEDIAN = 0xED477A99035d0c1e11369F1D7A4e587893cc002B;
     address internal constant FEE_CURRENCY = 0x4200000000000000000000000000000000001022;
-    address internal constant BRIDGED_ETH = 0x4200000000000000000000000000000000001023;
     address internal constant FEE_CURRENCY_DIRECTORY = 0x71FFbD48E34bdD5a87c3c683E866dc63b8B2a685;
     address internal constant cUSD = 0x765DE816845861e75A25fCA122bb6898B8B1282a;
 
@@ -26,13 +24,11 @@ library CeloPredeploys {
         if (_addr == CELO_REGISTRY) return "CeloRegistry";
         if (_addr == GOLD_TOKEN) return "GoldToken";
         if (_addr == FEE_HANDLER) return "FeeHandler";
-        if (_addr == FEE_CURRENCY_WHITELIST) return "FeeCurrencyWhitelist";
         if (_addr == MENTO_FEE_HANDLER_SELLER) return "MentoFeeHandlerSeller";
         if (_addr == UNISWAP_FEE_HANDLER_SELLER) return "UniswapFeeHandlerSeller";
         if (_addr == SORTED_ORACLES) return "SortedOracles";
         if (_addr == ADDRESS_SORTED_LINKED_LIST_WITH_MEDIAN) return "AddressSortedLinkedListWithMedian";
         if (_addr == FEE_CURRENCY) return "FeeCurrency";
-        if (_addr == BRIDGED_ETH) return "BridgedEth";
         if (_addr == FEE_CURRENCY_DIRECTORY) return "FeeCurrencyDirectory";
         if (_addr == cUSD) return "cUSD";