fix withdrawl network

base-org · Feb 1, 2024 · 0ee6aed · 0ee6aed
1 parent 63994a5
commit 0ee6aed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/sepolia/2024-01-22-deploy-revshare/.env b/sepolia/2024-01-22-deploy-revshare/.env
@@ -28,11 +28,11 @@ FEE_DISBURSER_IMPL=0xCA9be02F8e417D20f33551BA22ddf3f7623FB345
 
 # Fee vaults upgrade deployer
 PROXY_ADMIN_OWNER=0x8937037a0bb08658e5a178c182e60b12f14720ce
-SEQUENCER_FEE_VAULT_IMPL=0xD82e08F9Fc01627418061Bc6c2B90b30b7975702
-L1_FEE_VAULT_IMPL=0xfBa224A64C664C5fD320c9Fd3Ced4C18405952D1
-BASE_FEE_VAULT_IMPL=0xb4BE1Ce574B27A340322fE70d5634E2aEC0eD09A
+SEQUENCER_FEE_VAULT_IMPL=0x7ce53CAa10ae0090ce28276086eFaeADc15F71Df
+L1_FEE_VAULT_IMPL=0x9A33D2cac3cef6dC2F3e61c20417e78326d4Bdb7
+BASE_FEE_VAULT_IMPL=0x8C39078aEa04dEE6C8e2487BCfdB2b00d094b56C
 
 # Verification
 VERIFIER=etherscan
 L1_VERIFIER_URL=https://api-sepolia.etherscan.io/api
-L2_VERIFIER_URL=https://api-sepolia.basescan.org/api
+L2_VERIFIER_URL=https://api-sepolia.basescan.org/api
diff --git a/sepolia/2024-01-22-deploy-revshare/Makefile b/sepolia/2024-01-22-deploy-revshare/Makefile
@@ -29,6 +29,6 @@ update-fee-vaults:
 
 .PHONY: verify-fee-vaults
 verify-fee-vaults:
-	ETHERSCAN_API_KEY=$(L2_ETHERSCAN_API_KEY) forge verify-contract ${SEQUENCER_FEE_VAULT_IMPL} SequencerFeeVault --constructor-args $(shell cast abi-encode "constructor(address,uint256,uint8)" ${FEE_DISBURSER_PROXY} 2000000000000000000 0) --verifier ${VERIFIER} --verifier-url ${L2_VERIFIER_URL} --chain-id ${L2_CHAIN_ID} --optimizer-runs=999999 --retries=1 --watch 
-	ETHERSCAN_API_KEY=$(L2_ETHERSCAN_API_KEY) forge verify-contract ${L1_FEE_VAULT_IMPL} L1FeeVault --constructor-args $(shell cast abi-encode "constructor(address,uint256,uint8)" ${FEE_DISBURSER_PROXY} 2000000000000000000 0) --verifier ${VERIFIER} --verifier-url ${L2_VERIFIER_URL} --chain-id ${L2_CHAIN_ID} --optimizer-runs=999999 --retries=1 --watch 
-	ETHERSCAN_API_KEY=$(L2_ETHERSCAN_API_KEY) forge verify-contract ${BASE_FEE_VAULT_IMPL} BaseFeeVault --constructor-args $(shell cast abi-encode "constructor(address,uint256,uint8)" ${FEE_DISBURSER_PROXY} 2000000000000000000 0) --verifier ${VERIFIER} --verifier-url ${L2_VERIFIER_URL} --chain-id ${L2_CHAIN_ID} --optimizer-runs=999999 --retries=1 --watch 
+	ETHERSCAN_API_KEY=$(L2_ETHERSCAN_API_KEY) forge verify-contract ${SEQUENCER_FEE_VAULT_IMPL} SequencerFeeVault --constructor-args $(shell cast abi-encode "constructor(address,uint256,uint8)" ${FEE_DISBURSER_PROXY} 2000000000000000000 1) --verifier ${VERIFIER} --verifier-url ${L2_VERIFIER_URL} --chain-id ${L2_CHAIN_ID} --optimizer-runs=999999 --retries=1 --watch 
+	ETHERSCAN_API_KEY=$(L2_ETHERSCAN_API_KEY) forge verify-contract ${L1_FEE_VAULT_IMPL} L1FeeVault --constructor-args $(shell cast abi-encode "constructor(address,uint256,uint8)" ${FEE_DISBURSER_PROXY} 2000000000000000000 1) --verifier ${VERIFIER} --verifier-url ${L2_VERIFIER_URL} --chain-id ${L2_CHAIN_ID} --optimizer-runs=999999 --retries=1 --watch 
+	ETHERSCAN_API_KEY=$(L2_ETHERSCAN_API_KEY) forge verify-contract ${BASE_FEE_VAULT_IMPL} BaseFeeVault --constructor-args $(shell cast abi-encode "constructor(address,uint256,uint8)" ${FEE_DISBURSER_PROXY} 2000000000000000000 1) --verifier ${VERIFIER} --verifier-url ${L2_VERIFIER_URL} --chain-id ${L2_CHAIN_ID} --optimizer-runs=999999 --retries=1 --watch 
diff --git a/sepolia/2024-01-22-deploy-revshare/script/UpdateFeeVaultRecipient.s.sol b/sepolia/2024-01-22-deploy-revshare/script/UpdateFeeVaultRecipient.s.sol
@@ -33,19 +33,19 @@ contract UpdateFeeVaultRecipient is Script {
         SequencerFeeVault sfvNew = new SequencerFeeVault(
             recipient,
             sfvOld.MIN_WITHDRAWAL_AMOUNT(),
-            sfvOld.WITHDRAWAL_NETWORK()
+            FeeVault.WithdrawalNetwork.L2
         );
         _checks(sfvOld, sfvNew, "SequencerFeeVault");
         L1FeeVault lfvNew = new L1FeeVault(
             recipient,
             lfvOld.MIN_WITHDRAWAL_AMOUNT(),
-            lfvOld.WITHDRAWAL_NETWORK()
+            FeeVault.WithdrawalNetwork.L2
         );
         _checks(lfvOld, lfvNew, "L1FeeVault");
         BaseFeeVault bfvNew = new BaseFeeVault(
             recipient,
             bfvOld.MIN_WITHDRAWAL_AMOUNT(),
-            bfvOld.WITHDRAWAL_NETWORK()
+            FeeVault.WithdrawalNetwork.L2
         );
         _checks(bfvOld, bfvNew, "BaseFeeVault");
         console.log("Sequencer Fee Vault Impl address: %s", address(sfvNew));
@@ -94,7 +94,7 @@ contract UpdateFeeVaultRecipient is Script {
                 reason: "MIN_WITHDRAWAL_AMOUNT mismatch."
             });
         }
-        if (_newFV.WITHDRAWAL_NETWORK() != _oldFV.WITHDRAWAL_NETWORK()) {
+        if (_newFV.WITHDRAWAL_NETWORK() != FeeVault.WithdrawalNetwork.L2) {
             revert FeeVaultFailedToUpdate({
                 feeVaultType: typeOfVault,
                 reason: "WITHDRAWAL_NETWORK mismatch."
@@ -107,4 +107,4 @@ contract UpdateFeeVaultRecipient is Script {
             });
         }
     }
-}
+}