[Sepolia] Fix withdrawal network for fee vaults (#122)

* fix withdrawl network * fix env * separate deploy and upgrade * update impl address * Add upgrade record file --------- Co-authored-by: Michael de Hoog <[email protected]>
base-org · Feb 2, 2024 · adb217c · adb217c
1 parent 63994a5
commit adb217c
Show file tree

Hide file tree

Showing 7 changed files with 458 additions and 42 deletions.
diff --git a/sepolia/2024-01-22-deploy-revshare/.env b/sepolia/2024-01-22-deploy-revshare/.env
@@ -28,9 +28,9 @@ 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=0xa6c30A3816abe69A61B64311EE743ce9B2C682A0
+L1_FEE_VAULT_IMPL=0x6a247B2b85ed05c83dB1C56E1891830f493C35D9
+BASE_FEE_VAULT_IMPL=0x682EA8eAB30943e53a7390401A0e1706928627F2
 
 # Verification
 VERIFIER=etherscan

diff --git a/sepolia/2024-01-22-deploy-revshare/Makefile b/sepolia/2024-01-22-deploy-revshare/Makefile
@@ -23,12 +23,16 @@ verify-fee-disburser:
  ETHERSCAN_API_KEY=$(L2_ETHERSCAN_API_KEY) forge verify-contract ${FEE_DISBURSER_IMPL} ./lib/base-contracts/src/revenue-share/FeeDisburser.sol:FeeDisburser --constructor-args $(shell cast abi-encode "constructor(address,address,uint256)" ${OPTIMISM_WALLET} ${BALANCE_TRACKER_PROXY} ${FEE_DISBURSEMENT_INTERVAL}) --verifier ${VERIFIER} --verifier-url ${L2_VERIFIER_URL} --chain-id ${L2_CHAIN_ID} --optimizer-runs=999999 --retries=1 --compiler-version v0.8.15+commit.e14f2714 --watch 
  ETHERSCAN_API_KEY=$(L2_ETHERSCAN_API_KEY) forge verify-contract ${FEE_DISBURSER_PROXY} Proxy --constructor-args $(shell cast abi-encode "constructor(address)" ${FEE_DISBURSER_DEPLOYER}) --verifier ${VERIFIER} --verifier-url ${L2_VERIFIER_URL} --chain-id ${L2_CHAIN_ID} --num-of-optimizations=99999 --retries=1 --compiler-version v0.8.15+commit.e14f2714 --watch
 
-.PHONY: update-fee-vaults
-update-fee-vaults:
- forge script UpdateFeeVaultRecipient --rpc-url $(L2_RPC_URL) --sig "run()"
+.PHONY: deploy-new-fee-vaults
+deploy-new-fee-vaults:
+ forge script DeployNewFeeVaults --rpc-url $(L2_RPC_URL) --sig "run()"
 
 .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 
+
+.PHONY: upgrade-fee-vault-proxy
+upgrade-fee-vault-proxy:
+ forge script UpgradeFeeVaultProxy --rpc-url $(L2_RPC_URL) --sig "run()"