From adb217ca9149ce52cda58d4522493ac7323c0c35 Mon Sep 17 00:00:00 2001 From: cody-wang-cb Date: Fri, 2 Feb 2024 13:43:14 -0500 Subject: [PATCH] [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 --- sepolia/2024-01-22-deploy-revshare/.env | 6 +- sepolia/2024-01-22-deploy-revshare/Makefile | 16 +- .../84532/run-1706826531.json | 85 +++++++++ .../84532/run-1706826537.json | 130 +++++++++++++ .../84532/run-1706827667.json | 175 ++++++++++++++++++ ...cipient.s.sol => DeployNewFeeVaults.s.sol} | 39 +--- .../script/UpgradeFeeVaultProxy.s.sol | 49 +++++ 7 files changed, 458 insertions(+), 42 deletions(-) create mode 100644 sepolia/2024-01-22-deploy-revshare/records/DeployNewFeeVaults.s.sol/84532/run-1706826531.json create mode 100644 sepolia/2024-01-22-deploy-revshare/records/DeployNewFeeVaults.s.sol/84532/run-1706826537.json create mode 100644 sepolia/2024-01-22-deploy-revshare/records/UpgradeFeeVaultProxy.s.sol/84532/run-1706827667.json rename sepolia/2024-01-22-deploy-revshare/script/{UpdateFeeVaultRecipient.s.sol => DeployNewFeeVaults.s.sol} (70%) create mode 100644 sepolia/2024-01-22-deploy-revshare/script/UpgradeFeeVaultProxy.s.sol diff --git a/sepolia/2024-01-22-deploy-revshare/.env b/sepolia/2024-01-22-deploy-revshare/.env index 0558c645..e4630106 100644 --- 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 index 7c9f63a3..58e51964 100644 --- 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()" diff --git a/sepolia/2024-01-22-deploy-revshare/records/DeployNewFeeVaults.s.sol/84532/run-1706826531.json b/sepolia/2024-01-22-deploy-revshare/records/DeployNewFeeVaults.s.sol/84532/run-1706826531.json new file mode 100644 index 00000000..3d2fbe5b --- /dev/null +++ b/sepolia/2024-01-22-deploy-revshare/records/DeployNewFeeVaults.s.sol/84532/run-1706826531.json @@ -0,0 +1,85 @@ +{ + "transactions": [ + { + "hash": "0x713dbc9097a6c9a8b98b68fad6f8b838e25e19f90dba64f2733bc84339dae7ee", + "transactionType": "CREATE", + "contractName": "SequencerFeeVault", + "contractAddress": "0xa6c30A3816abe69A61B64311EE743ce9B2C682A0", + "function": null, + "arguments": [ + "0x76355A67fCBCDE6F9a69409A8EAd5EaA9D8d875d", + "2000000000000000000", + "1" + ], + "transaction": { + "type": "0x02", + "from": "0x4672425c27a942bb27e7b9709c1b21ab89a3ca13", + "gas": "0x9fc25", + "value": "0x0", + "data": "0x60e0346100ac57601f6108f838819003918201601f19168301916001600160401b038311848410176100b1578084926060946040528339810103126100ac578051906001600160a01b03821682036100ac57604060208201519101519160028310156100ac5760a05260805260c05260405161083090816100c8823960805181818160c10152610271015260a0518181816102a60152610726015260c05181818161012001526103140152f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe60406080815260049081361015610020575b5050361561001e57600080fd5b005b600090813560e01c9283630d9019e1146106d25783633ccfd60b1461024057836354fd4d501461017f5750826384411d6514610146578263d0e12f90146100e8578263d3e5792b1461008d57505063d4ff921814610080575b3880610011565b6100886106da565b610079565b346100e457817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100e457602090517f00000000000000000000000000000000000000000000000000000000000000008152f35b5080fd5b346100e457817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100e45760209051610144817f00000000000000000000000000000000000000000000000000000000000000006107be565bf35b346100e457817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100e457602091549051908152f35b913461023d57807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261023d575080519080820182811067ffffffffffffffff82111761020f5761020b93508152600582527f312e342e3000000000000000000000000000000000000000000000000000000060208301525191829160208352602083019061074f565b0390f35b6041847f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b80fd5b346106ce57827ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126106ce57477f00000000000000000000000000000000000000000000000000000000000000001161062657478354811981116105fa57810184557f00000000000000000000000000000000000000000000000000000000000000009083518181527fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba606073ffffffffffffffffffffffffffffffffffffffff8516928360208201523388820152a17f00000000000000000000000000000000000000000000000000000000000000007f38e04cbeb8c10f8f568618aa75be0f10b6729b8b4237743b4de20cbcde2839ee60808751858152846020820152338982015261037360608201856107be565ba160028110156105ce576001036104ac575084809281928651915af13d156104a75767ffffffffffffffff3d81811161020f578451917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f81601f85011601168301908382109082111761047957855281528460203d92013e5b156103f7575051f35b602060849251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152603060248201527f4665655661756c743a206661696c656420746f2073656e642045544820746f2060448201527f4c322066656520726563697069656e74000000000000000000000000000000006064820152fd5b6041857f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b6103ee565b91508394935190602082019267ffffffffffffffff93838110858211176105a257875285835273420000000000000000000000000000000000001091823b1561059e579161054195949391879389518098819582947fe11013dd0000000000000000000000000000000000000000000000000000000084528a8401526188b8602484015260606044840152606483019061074f565b03925af1801561059457610557575b5050509051f35b821161056857508252828080610550565b8260416024927f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b85513d86823e3d90fd5b8680fd5b6024876041887f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024876021877f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024856011857f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b602060a49251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d207769746864726160648201527f77616c20616d6f756e74000000000000000000000000000000000000000000006084820152fd5b8280fd5b505050506100885b503461074a5760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261074a57602060405173ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152f35b600080fd5b91908251928382526000905b8482106107a65750601f84602094957fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09311610799575b0116010190565b6000858286010152610792565b9060209081808285010151908286010152019061075b565b9060028210156107cb5752565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fdfea26469706673582212204c85bf1289044304e0f69cad15906f30ee9b10d0cb6d5e61e3ba8339821da3a564736f6c634300080f003300000000000000000000000076355a67fcbcde6f9a69409a8ead5eaa9d8d875d0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000001", + "nonce": "0xb", + "accessList": [] + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0xc30b915b40160009f576c4f248566a81649ef5c5ac5b63bc5a6ce74150e8f8a8", + "transactionType": "CREATE", + "contractName": "L1FeeVault", + "contractAddress": "0x6a247B2b85ed05c83dB1C56E1891830f493C35D9", + "function": null, + "arguments": [ + "0x76355A67fCBCDE6F9a69409A8EAd5EaA9D8d875d", + "2000000000000000000", + "1" + ], + "transaction": { + "type": "0x02", + "from": "0x4672425c27a942bb27e7b9709c1b21ab89a3ca13", + "gas": "0x9d5e6", + "value": "0x0", + "data": "0x60e0346100ac57601f6108d538819003918201601f19168301916001600160401b038311848410176100b1578084926060946040528339810103126100ac578051906001600160a01b03821682036100ac57604060208201519101519160028310156100ac5760a05260805260c05260405161080d90816100c8823960805181818160a8015261025d015260a0518181816102920152610708015260c05181818161010801526103000152f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe6080604081815260049182361015610022575b505050361561002057600080fd5b005b600092833560e01c9182630d9019e1146106be575081633ccfd60b1461022a57816354fd4d50146101685750806384411d651461012e578063d0e12f90146100cf5763d3e5792b146100745780610012565b346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb57602090517f00000000000000000000000000000000000000000000000000000000000000008152f35b5080fd5b50346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb576020905161012c817f000000000000000000000000000000000000000000000000000000000000000061079b565bf35b50346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb57602091549051908152f35b82843461022757807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610227575080519080820182811067ffffffffffffffff8211176101f9576101f593508152600582527f312e342e3000000000000000000000000000000000000000000000000000000060208301525191829160208352602083019061072c565b0390f35b6041847f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b80fd5b9050346106ba57827ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126106ba57477f00000000000000000000000000000000000000000000000000000000000000001161061257478354811981116105e657810184557f00000000000000000000000000000000000000000000000000000000000000009083518181527fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba606073ffffffffffffffffffffffffffffffffffffffff8516928360208201523388820152a17f00000000000000000000000000000000000000000000000000000000000000007f38e04cbeb8c10f8f568618aa75be0f10b6729b8b4237743b4de20cbcde2839ee60808751858152846020820152338982015261035f606082018561079b565ba160028110156105ba57600103610498575084809281928651915af13d156104935767ffffffffffffffff3d8181116101f9578451917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f81601f85011601168301908382109082111761046557855281528460203d92013e5b156103e3575051f35b602060849251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152603060248201527f4665655661756c743a206661696c656420746f2073656e642045544820746f2060448201527f4c322066656520726563697069656e74000000000000000000000000000000006064820152fd5b6041857f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b6103da565b91508394935190602082019267ffffffffffffffff938381108582111761058e57875285835273420000000000000000000000000000000000001091823b1561058a579161052d95949391879389518098819582947fe11013dd0000000000000000000000000000000000000000000000000000000084528a8401526188b8602484015260606044840152606483019061072c565b03925af1801561058057610543575b5050509051f35b82116105545750825238808061053c565b8260416024927f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b85513d86823e3d90fd5b8680fd5b6024876041887f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024876021877f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024856011857f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b602060a49251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d207769746864726160648201527f77616c20616d6f756e74000000000000000000000000000000000000000000006084820152fd5b8280fd5b8490346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb5760209073ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152f35b91908251928382526000905b8482106107835750601f84602094957fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09311610776575b0116010190565b600085828601015261076f565b90602090818082850101519082860101520190610738565b9060028210156107a85752565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fdfea2646970667358221220e9bf01fb4d74a970f588233e9f7eac59c8567f6aa27d07713bbf2aef5aee12e064736f6c634300080f003300000000000000000000000076355a67fcbcde6f9a69409a8ead5eaa9d8d875d0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000001", + "nonce": "0xc", + "accessList": [] + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0xd1347ba27005bc619ca35e04cfd898f549f334076ff85829465eaf628ea05f18", + "transactionType": "CREATE", + "contractName": "BaseFeeVault", + "contractAddress": "0x682EA8eAB30943e53a7390401A0e1706928627F2", + "function": null, + "arguments": [ + "0x76355A67fCBCDE6F9a69409A8EAd5EaA9D8d875d", + "2000000000000000000", + "1" + ], + "transaction": { + "type": "0x02", + "from": "0x4672425c27a942bb27e7b9709c1b21ab89a3ca13", + "gas": "0x9d5e6", + "value": "0x0", + "data": "0x60e0346100ac57601f6108d538819003918201601f19168301916001600160401b038311848410176100b1578084926060946040528339810103126100ac578051906001600160a01b03821682036100ac57604060208201519101519160028310156100ac5760a05260805260c05260405161080d90816100c8823960805181818160a8015261025d015260a0518181816102920152610708015260c05181818161010801526103000152f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe6080604081815260049182361015610022575b505050361561002057600080fd5b005b600092833560e01c9182630d9019e1146106be575081633ccfd60b1461022a57816354fd4d50146101685750806384411d651461012e578063d0e12f90146100cf5763d3e5792b146100745780610012565b346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb57602090517f00000000000000000000000000000000000000000000000000000000000000008152f35b5080fd5b50346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb576020905161012c817f000000000000000000000000000000000000000000000000000000000000000061079b565bf35b50346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb57602091549051908152f35b82843461022757807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610227575080519080820182811067ffffffffffffffff8211176101f9576101f593508152600582527f312e342e3000000000000000000000000000000000000000000000000000000060208301525191829160208352602083019061072c565b0390f35b6041847f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b80fd5b9050346106ba57827ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126106ba57477f00000000000000000000000000000000000000000000000000000000000000001161061257478354811981116105e657810184557f00000000000000000000000000000000000000000000000000000000000000009083518181527fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba606073ffffffffffffffffffffffffffffffffffffffff8516928360208201523388820152a17f00000000000000000000000000000000000000000000000000000000000000007f38e04cbeb8c10f8f568618aa75be0f10b6729b8b4237743b4de20cbcde2839ee60808751858152846020820152338982015261035f606082018561079b565ba160028110156105ba57600103610498575084809281928651915af13d156104935767ffffffffffffffff3d8181116101f9578451917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f81601f85011601168301908382109082111761046557855281528460203d92013e5b156103e3575051f35b602060849251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152603060248201527f4665655661756c743a206661696c656420746f2073656e642045544820746f2060448201527f4c322066656520726563697069656e74000000000000000000000000000000006064820152fd5b6041857f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b6103da565b91508394935190602082019267ffffffffffffffff938381108582111761058e57875285835273420000000000000000000000000000000000001091823b1561058a579161052d95949391879389518098819582947fe11013dd0000000000000000000000000000000000000000000000000000000084528a8401526188b8602484015260606044840152606483019061072c565b03925af1801561058057610543575b5050509051f35b82116105545750825238808061053c565b8260416024927f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b85513d86823e3d90fd5b8680fd5b6024876041887f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024876021877f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024856011857f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b602060a49251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d207769746864726160648201527f77616c20616d6f756e74000000000000000000000000000000000000000000006084820152fd5b8280fd5b8490346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb5760209073ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152f35b91908251928382526000905b8482106107835750601f84602094957fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09311610776575b0116010190565b600085828601015261076f565b90602090818082850101519082860101520190610738565b9060028210156107a85752565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fdfea2646970667358221220f2c4e1b52d303b91ca799355d931950bfc17feab9b8734b5a7308ba15a3619e064736f6c634300080f003300000000000000000000000076355a67fcbcde6f9a69409a8ead5eaa9d8d875d0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000001", + "nonce": "0xd", + "accessList": [] + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [], + "libraries": [], + "pending": [ + "0x713dbc9097a6c9a8b98b68fad6f8b838e25e19f90dba64f2733bc84339dae7ee", + "0xc30b915b40160009f576c4f248566a81649ef5c5ac5b63bc5a6ce74150e8f8a8", + "0xd1347ba27005bc619ca35e04cfd898f549f334076ff85829465eaf628ea05f18" + ], + "returns": {}, + "timestamp": 1706826531, + "chain": 84532, + "multi": false, + "commit": "d136524" +} \ No newline at end of file diff --git a/sepolia/2024-01-22-deploy-revshare/records/DeployNewFeeVaults.s.sol/84532/run-1706826537.json b/sepolia/2024-01-22-deploy-revshare/records/DeployNewFeeVaults.s.sol/84532/run-1706826537.json new file mode 100644 index 00000000..b6317bf9 --- /dev/null +++ b/sepolia/2024-01-22-deploy-revshare/records/DeployNewFeeVaults.s.sol/84532/run-1706826537.json @@ -0,0 +1,130 @@ +{ + "transactions": [ + { + "hash": "0x713dbc9097a6c9a8b98b68fad6f8b838e25e19f90dba64f2733bc84339dae7ee", + "transactionType": "CREATE", + "contractName": "SequencerFeeVault", + "contractAddress": "0xa6c30A3816abe69A61B64311EE743ce9B2C682A0", + "function": null, + "arguments": [ + "0x76355A67fCBCDE6F9a69409A8EAd5EaA9D8d875d", + "2000000000000000000", + "1" + ], + "transaction": { + "type": "0x02", + "from": "0x4672425c27a942bb27e7b9709c1b21ab89a3ca13", + "gas": "0x9fc25", + "value": "0x0", + "data": "0x60e0346100ac57601f6108f838819003918201601f19168301916001600160401b038311848410176100b1578084926060946040528339810103126100ac578051906001600160a01b03821682036100ac57604060208201519101519160028310156100ac5760a05260805260c05260405161083090816100c8823960805181818160c10152610271015260a0518181816102a60152610726015260c05181818161012001526103140152f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe60406080815260049081361015610020575b5050361561001e57600080fd5b005b600090813560e01c9283630d9019e1146106d25783633ccfd60b1461024057836354fd4d501461017f5750826384411d6514610146578263d0e12f90146100e8578263d3e5792b1461008d57505063d4ff921814610080575b3880610011565b6100886106da565b610079565b346100e457817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100e457602090517f00000000000000000000000000000000000000000000000000000000000000008152f35b5080fd5b346100e457817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100e45760209051610144817f00000000000000000000000000000000000000000000000000000000000000006107be565bf35b346100e457817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100e457602091549051908152f35b913461023d57807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261023d575080519080820182811067ffffffffffffffff82111761020f5761020b93508152600582527f312e342e3000000000000000000000000000000000000000000000000000000060208301525191829160208352602083019061074f565b0390f35b6041847f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b80fd5b346106ce57827ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126106ce57477f00000000000000000000000000000000000000000000000000000000000000001161062657478354811981116105fa57810184557f00000000000000000000000000000000000000000000000000000000000000009083518181527fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba606073ffffffffffffffffffffffffffffffffffffffff8516928360208201523388820152a17f00000000000000000000000000000000000000000000000000000000000000007f38e04cbeb8c10f8f568618aa75be0f10b6729b8b4237743b4de20cbcde2839ee60808751858152846020820152338982015261037360608201856107be565ba160028110156105ce576001036104ac575084809281928651915af13d156104a75767ffffffffffffffff3d81811161020f578451917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f81601f85011601168301908382109082111761047957855281528460203d92013e5b156103f7575051f35b602060849251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152603060248201527f4665655661756c743a206661696c656420746f2073656e642045544820746f2060448201527f4c322066656520726563697069656e74000000000000000000000000000000006064820152fd5b6041857f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b6103ee565b91508394935190602082019267ffffffffffffffff93838110858211176105a257875285835273420000000000000000000000000000000000001091823b1561059e579161054195949391879389518098819582947fe11013dd0000000000000000000000000000000000000000000000000000000084528a8401526188b8602484015260606044840152606483019061074f565b03925af1801561059457610557575b5050509051f35b821161056857508252828080610550565b8260416024927f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b85513d86823e3d90fd5b8680fd5b6024876041887f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024876021877f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024856011857f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b602060a49251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d207769746864726160648201527f77616c20616d6f756e74000000000000000000000000000000000000000000006084820152fd5b8280fd5b505050506100885b503461074a5760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261074a57602060405173ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152f35b600080fd5b91908251928382526000905b8482106107a65750601f84602094957fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09311610799575b0116010190565b6000858286010152610792565b9060209081808285010151908286010152019061075b565b9060028210156107cb5752565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fdfea26469706673582212204c85bf1289044304e0f69cad15906f30ee9b10d0cb6d5e61e3ba8339821da3a564736f6c634300080f003300000000000000000000000076355a67fcbcde6f9a69409a8ead5eaa9d8d875d0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000001", + "nonce": "0xb", + "accessList": [] + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0xc30b915b40160009f576c4f248566a81649ef5c5ac5b63bc5a6ce74150e8f8a8", + "transactionType": "CREATE", + "contractName": "L1FeeVault", + "contractAddress": "0x6a247B2b85ed05c83dB1C56E1891830f493C35D9", + "function": null, + "arguments": [ + "0x76355A67fCBCDE6F9a69409A8EAd5EaA9D8d875d", + "2000000000000000000", + "1" + ], + "transaction": { + "type": "0x02", + "from": "0x4672425c27a942bb27e7b9709c1b21ab89a3ca13", + "gas": "0x9d5e6", + "value": "0x0", + "data": "0x60e0346100ac57601f6108d538819003918201601f19168301916001600160401b038311848410176100b1578084926060946040528339810103126100ac578051906001600160a01b03821682036100ac57604060208201519101519160028310156100ac5760a05260805260c05260405161080d90816100c8823960805181818160a8015261025d015260a0518181816102920152610708015260c05181818161010801526103000152f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe6080604081815260049182361015610022575b505050361561002057600080fd5b005b600092833560e01c9182630d9019e1146106be575081633ccfd60b1461022a57816354fd4d50146101685750806384411d651461012e578063d0e12f90146100cf5763d3e5792b146100745780610012565b346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb57602090517f00000000000000000000000000000000000000000000000000000000000000008152f35b5080fd5b50346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb576020905161012c817f000000000000000000000000000000000000000000000000000000000000000061079b565bf35b50346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb57602091549051908152f35b82843461022757807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610227575080519080820182811067ffffffffffffffff8211176101f9576101f593508152600582527f312e342e3000000000000000000000000000000000000000000000000000000060208301525191829160208352602083019061072c565b0390f35b6041847f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b80fd5b9050346106ba57827ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126106ba57477f00000000000000000000000000000000000000000000000000000000000000001161061257478354811981116105e657810184557f00000000000000000000000000000000000000000000000000000000000000009083518181527fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba606073ffffffffffffffffffffffffffffffffffffffff8516928360208201523388820152a17f00000000000000000000000000000000000000000000000000000000000000007f38e04cbeb8c10f8f568618aa75be0f10b6729b8b4237743b4de20cbcde2839ee60808751858152846020820152338982015261035f606082018561079b565ba160028110156105ba57600103610498575084809281928651915af13d156104935767ffffffffffffffff3d8181116101f9578451917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f81601f85011601168301908382109082111761046557855281528460203d92013e5b156103e3575051f35b602060849251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152603060248201527f4665655661756c743a206661696c656420746f2073656e642045544820746f2060448201527f4c322066656520726563697069656e74000000000000000000000000000000006064820152fd5b6041857f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b6103da565b91508394935190602082019267ffffffffffffffff938381108582111761058e57875285835273420000000000000000000000000000000000001091823b1561058a579161052d95949391879389518098819582947fe11013dd0000000000000000000000000000000000000000000000000000000084528a8401526188b8602484015260606044840152606483019061072c565b03925af1801561058057610543575b5050509051f35b82116105545750825238808061053c565b8260416024927f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b85513d86823e3d90fd5b8680fd5b6024876041887f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024876021877f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024856011857f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b602060a49251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d207769746864726160648201527f77616c20616d6f756e74000000000000000000000000000000000000000000006084820152fd5b8280fd5b8490346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb5760209073ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152f35b91908251928382526000905b8482106107835750601f84602094957fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09311610776575b0116010190565b600085828601015261076f565b90602090818082850101519082860101520190610738565b9060028210156107a85752565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fdfea2646970667358221220e9bf01fb4d74a970f588233e9f7eac59c8567f6aa27d07713bbf2aef5aee12e064736f6c634300080f003300000000000000000000000076355a67fcbcde6f9a69409a8ead5eaa9d8d875d0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000001", + "nonce": "0xc", + "accessList": [] + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0xd1347ba27005bc619ca35e04cfd898f549f334076ff85829465eaf628ea05f18", + "transactionType": "CREATE", + "contractName": "BaseFeeVault", + "contractAddress": "0x682EA8eAB30943e53a7390401A0e1706928627F2", + "function": null, + "arguments": [ + "0x76355A67fCBCDE6F9a69409A8EAd5EaA9D8d875d", + "2000000000000000000", + "1" + ], + "transaction": { + "type": "0x02", + "from": "0x4672425c27a942bb27e7b9709c1b21ab89a3ca13", + "gas": "0x9d5e6", + "value": "0x0", + "data": "0x60e0346100ac57601f6108d538819003918201601f19168301916001600160401b038311848410176100b1578084926060946040528339810103126100ac578051906001600160a01b03821682036100ac57604060208201519101519160028310156100ac5760a05260805260c05260405161080d90816100c8823960805181818160a8015261025d015260a0518181816102920152610708015260c05181818161010801526103000152f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe6080604081815260049182361015610022575b505050361561002057600080fd5b005b600092833560e01c9182630d9019e1146106be575081633ccfd60b1461022a57816354fd4d50146101685750806384411d651461012e578063d0e12f90146100cf5763d3e5792b146100745780610012565b346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb57602090517f00000000000000000000000000000000000000000000000000000000000000008152f35b5080fd5b50346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb576020905161012c817f000000000000000000000000000000000000000000000000000000000000000061079b565bf35b50346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb57602091549051908152f35b82843461022757807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610227575080519080820182811067ffffffffffffffff8211176101f9576101f593508152600582527f312e342e3000000000000000000000000000000000000000000000000000000060208301525191829160208352602083019061072c565b0390f35b6041847f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b80fd5b9050346106ba57827ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126106ba57477f00000000000000000000000000000000000000000000000000000000000000001161061257478354811981116105e657810184557f00000000000000000000000000000000000000000000000000000000000000009083518181527fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba606073ffffffffffffffffffffffffffffffffffffffff8516928360208201523388820152a17f00000000000000000000000000000000000000000000000000000000000000007f38e04cbeb8c10f8f568618aa75be0f10b6729b8b4237743b4de20cbcde2839ee60808751858152846020820152338982015261035f606082018561079b565ba160028110156105ba57600103610498575084809281928651915af13d156104935767ffffffffffffffff3d8181116101f9578451917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f81601f85011601168301908382109082111761046557855281528460203d92013e5b156103e3575051f35b602060849251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152603060248201527f4665655661756c743a206661696c656420746f2073656e642045544820746f2060448201527f4c322066656520726563697069656e74000000000000000000000000000000006064820152fd5b6041857f4e487b71000000000000000000000000000000000000000000000000000000006000525260246000fd5b6103da565b91508394935190602082019267ffffffffffffffff938381108582111761058e57875285835273420000000000000000000000000000000000001091823b1561058a579161052d95949391879389518098819582947fe11013dd0000000000000000000000000000000000000000000000000000000084528a8401526188b8602484015260606044840152606483019061072c565b03925af1801561058057610543575b5050509051f35b82116105545750825238808061053c565b8260416024927f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b85513d86823e3d90fd5b8680fd5b6024876041887f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024876021877f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b6024856011857f4e487b7100000000000000000000000000000000000000000000000000000000835252fd5b602060a49251917f08c379a0000000000000000000000000000000000000000000000000000000008352820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d207769746864726160648201527f77616c20616d6f756e74000000000000000000000000000000000000000000006084820152fd5b8280fd5b8490346100cb57817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100cb5760209073ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152f35b91908251928382526000905b8482106107835750601f84602094957fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09311610776575b0116010190565b600085828601015261076f565b90602090818082850101519082860101520190610738565b9060028210156107a85752565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fdfea2646970667358221220f2c4e1b52d303b91ca799355d931950bfc17feab9b8734b5a7308ba15a3619e064736f6c634300080f003300000000000000000000000076355a67fcbcde6f9a69409a8ead5eaa9d8d875d0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000001", + "nonce": "0xd", + "accessList": [] + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "transactionHash": "0x713dbc9097a6c9a8b98b68fad6f8b838e25e19f90dba64f2733bc84339dae7ee", + "transactionIndex": "0x1", + "blockHash": "0x1ab4f7be624034ba1d9e94296128401fd4204811a0896e0c3d81786b504aff04", + "blockNumber": "0x545e22", + "from": "0x4672425C27A942bB27e7b9709c1b21ab89a3cA13", + "to": null, + "cumulativeGasUsed": "0x8a8e7", + "gasUsed": "0x7aeda", + "contractAddress": "0xa6c30A3816abe69A61B64311EE743ce9B2C682A0", + "logs": [], + "status": "0x1", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "effectiveGasPrice": "0xb2d06039" + }, + { + "transactionHash": "0xc30b915b40160009f576c4f248566a81649ef5c5ac5b63bc5a6ce74150e8f8a8", + "transactionIndex": "0x2", + "blockHash": "0x1ab4f7be624034ba1d9e94296128401fd4204811a0896e0c3d81786b504aff04", + "blockNumber": "0x545e22", + "from": "0x4672425C27A942bB27e7b9709c1b21ab89a3cA13", + "to": null, + "cumulativeGasUsed": "0x103a54", + "gasUsed": "0x7916d", + "contractAddress": "0x6a247B2b85ed05c83dB1C56E1891830f493C35D9", + "logs": [], + "status": "0x1", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "effectiveGasPrice": "0xb2d06039" + }, + { + "transactionHash": "0xd1347ba27005bc619ca35e04cfd898f549f334076ff85829465eaf628ea05f18", + "transactionIndex": "0x3", + "blockHash": "0x1ab4f7be624034ba1d9e94296128401fd4204811a0896e0c3d81786b504aff04", + "blockNumber": "0x545e22", + "from": "0x4672425C27A942bB27e7b9709c1b21ab89a3cA13", + "to": null, + "cumulativeGasUsed": "0x17cbc1", + "gasUsed": "0x7916d", + "contractAddress": "0x682EA8eAB30943e53a7390401A0e1706928627F2", + "logs": [], + "status": "0x1", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "effectiveGasPrice": "0xb2d06039" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1706826537, + "chain": 84532, + "multi": false, + "commit": "d136524" +} \ No newline at end of file diff --git a/sepolia/2024-01-22-deploy-revshare/records/UpgradeFeeVaultProxy.s.sol/84532/run-1706827667.json b/sepolia/2024-01-22-deploy-revshare/records/UpgradeFeeVaultProxy.s.sol/84532/run-1706827667.json new file mode 100644 index 00000000..f6f51656 --- /dev/null +++ b/sepolia/2024-01-22-deploy-revshare/records/UpgradeFeeVaultProxy.s.sol/84532/run-1706827667.json @@ -0,0 +1,175 @@ +{ + "transactions": [ + { + "hash": "0x91662d6f236bf3d87aa57def922e33a9e343f5ac2fac526a43e33301ba60f977", + "transactionType": "CALL", + "contractName": null, + "contractAddress": "0x4200000000000000000000000000000000000018", + "function": "upgrade(address,address)", + "arguments": [ + "0x4200000000000000000000000000000000000011", + "0xa6c30A3816abe69A61B64311EE743ce9B2C682A0" + ], + "transaction": { + "type": "0x02", + "from": "0x8937037a0bb08658e5a178c182e60b12f14720ce", + "to": "0x4200000000000000000000000000000000000018", + "gas": "0xe766", + "value": "0x0", + "data": "0x99a88ec40000000000000000000000004200000000000000000000000000000000000011000000000000000000000000a6c30a3816abe69a61b64311ee743ce9b2c682a0", + "nonce": "0x6", + "accessList": [] + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x5bc6c3f3ee56519a14eb3763b84f939443a51cdd94d5bb7a4da3f1f184d96f4c", + "transactionType": "CALL", + "contractName": null, + "contractAddress": "0x4200000000000000000000000000000000000018", + "function": "upgrade(address,address)", + "arguments": [ + "0x420000000000000000000000000000000000001A", + "0x6a247B2b85ed05c83dB1C56E1891830f493C35D9" + ], + "transaction": { + "type": "0x02", + "from": "0x8937037a0bb08658e5a178c182e60b12f14720ce", + "to": "0x4200000000000000000000000000000000000018", + "gas": "0xe766", + "value": "0x0", + "data": "0x99a88ec4000000000000000000000000420000000000000000000000000000000000001a0000000000000000000000006a247b2b85ed05c83db1c56e1891830f493c35d9", + "nonce": "0x7", + "accessList": [] + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0xfadad7a8989496eb2f2ab1593e3039466876feac290c128432555b5801b1dcc9", + "transactionType": "CALL", + "contractName": null, + "contractAddress": "0x4200000000000000000000000000000000000018", + "function": "upgrade(address,address)", + "arguments": [ + "0x4200000000000000000000000000000000000019", + "0x682EA8eAB30943e53a7390401A0e1706928627F2" + ], + "transaction": { + "type": "0x02", + "from": "0x8937037a0bb08658e5a178c182e60b12f14720ce", + "to": "0x4200000000000000000000000000000000000018", + "gas": "0xe766", + "value": "0x0", + "data": "0x99a88ec40000000000000000000000004200000000000000000000000000000000000019000000000000000000000000682ea8eab30943e53a7390401a0e1706928627f2", + "nonce": "0x8", + "accessList": [] + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "transactionHash": "0x91662d6f236bf3d87aa57def922e33a9e343f5ac2fac526a43e33301ba60f977", + "transactionIndex": "0x1", + "blockHash": "0xba3977faf53474f64161037c599811f4ddb68eca85c7e8ce3e16b1be572b1b62", + "blockNumber": "0x546057", + "from": "0x8937037a0bB08658e5A178C182e60b12f14720ce", + "to": "0x4200000000000000000000000000000000000018", + "cumulativeGasUsed": "0x154f9", + "gasUsed": "0x9dc4", + "contractAddress": null, + "logs": [ + { + "address": "0x4200000000000000000000000000000000000011", + "topics": [ + "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b", + "0x000000000000000000000000a6c30a3816abe69a61b64311ee743ce9b2c682a0" + ], + "data": "0x", + "blockHash": "0xba3977faf53474f64161037c599811f4ddb68eca85c7e8ce3e16b1be572b1b62", + "blockNumber": "0x546057", + "transactionHash": "0x91662d6f236bf3d87aa57def922e33a9e343f5ac2fac526a43e33301ba60f977", + "transactionIndex": "0x1", + "logIndex": "0x0", + "removed": false + } + ], + "status": "0x1", + "logsBloom": "0x00000000000000000000000000000000400000000000000010000000000000000000000000000008000000000000000000000000000000000000000000000000000000000001000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000008000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000", + "type": "0x2", + "effectiveGasPrice": "0xb2d06671" + }, + { + "transactionHash": "0x5bc6c3f3ee56519a14eb3763b84f939443a51cdd94d5bb7a4da3f1f184d96f4c", + "transactionIndex": "0x2", + "blockHash": "0xba3977faf53474f64161037c599811f4ddb68eca85c7e8ce3e16b1be572b1b62", + "blockNumber": "0x546057", + "from": "0x8937037a0bB08658e5A178C182e60b12f14720ce", + "to": "0x4200000000000000000000000000000000000018", + "cumulativeGasUsed": "0x1fc81", + "gasUsed": "0xa788", + "contractAddress": null, + "logs": [ + { + "address": "0x420000000000000000000000000000000000001A", + "topics": [ + "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b", + "0x0000000000000000000000006a247b2b85ed05c83db1c56e1891830f493c35d9" + ], + "data": "0x", + "blockHash": "0xba3977faf53474f64161037c599811f4ddb68eca85c7e8ce3e16b1be572b1b62", + "blockNumber": "0x546057", + "transactionHash": "0x5bc6c3f3ee56519a14eb3763b84f939443a51cdd94d5bb7a4da3f1f184d96f4c", + "transactionIndex": "0x2", + "logIndex": "0x1", + "removed": false + } + ], + "status": "0x1", + "logsBloom": "0x00000000000000000000000000000000400000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000008002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000020000000000000000000000000000000000000000000010000000000000000000000000000000000000000000004000000000000000000000000000000", + "type": "0x2", + "effectiveGasPrice": "0xb2d06671" + }, + { + "transactionHash": "0xfadad7a8989496eb2f2ab1593e3039466876feac290c128432555b5801b1dcc9", + "transactionIndex": "0x3", + "blockHash": "0xba3977faf53474f64161037c599811f4ddb68eca85c7e8ce3e16b1be572b1b62", + "blockNumber": "0x546057", + "from": "0x8937037a0bB08658e5A178C182e60b12f14720ce", + "to": "0x4200000000000000000000000000000000000018", + "cumulativeGasUsed": "0x2a409", + "gasUsed": "0xa788", + "contractAddress": null, + "logs": [ + { + "address": "0x4200000000000000000000000000000000000019", + "topics": [ + "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b", + "0x000000000000000000000000682ea8eab30943e53a7390401a0e1706928627f2" + ], + "data": "0x", + "blockHash": "0xba3977faf53474f64161037c599811f4ddb68eca85c7e8ce3e16b1be572b1b62", + "blockNumber": "0x546057", + "transactionHash": "0xfadad7a8989496eb2f2ab1593e3039466876feac290c128432555b5801b1dcc9", + "transactionIndex": "0x3", + "logIndex": "0x2", + "removed": false + } + ], + "status": "0x1", + "logsBloom": "0x00000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000400000000000000000000004000020000000000000000000000000000000000000000040000000000000000000000000000000100000000000000000000000000000000000000000000000", + "type": "0x2", + "effectiveGasPrice": "0xb2d06671" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1706827667, + "chain": 84532, + "multi": false, + "commit": "b0fe03f" +} \ No newline at end of file diff --git a/sepolia/2024-01-22-deploy-revshare/script/UpdateFeeVaultRecipient.s.sol b/sepolia/2024-01-22-deploy-revshare/script/DeployNewFeeVaults.s.sol similarity index 70% rename from sepolia/2024-01-22-deploy-revshare/script/UpdateFeeVaultRecipient.s.sol rename to sepolia/2024-01-22-deploy-revshare/script/DeployNewFeeVaults.s.sol index 3bc5dfcc..7a68e1cd 100644 --- a/sepolia/2024-01-22-deploy-revshare/script/UpdateFeeVaultRecipient.s.sol +++ b/sepolia/2024-01-22-deploy-revshare/script/DeployNewFeeVaults.s.sol @@ -4,18 +4,16 @@ pragma solidity 0.8.15; import "forge-std/Script.sol"; import "@eth-optimism-bedrock/src/libraries/Predeploys.sol"; -import "@eth-optimism-bedrock/src/universal/ProxyAdmin.sol"; import {SequencerFeeVault, FeeVault} from "@eth-optimism-bedrock/src/L2/SequencerFeeVault.sol"; import {L1FeeVault} from "@eth-optimism-bedrock/src/L2/L1FeeVault.sol"; import {BaseFeeVault} from "@eth-optimism-bedrock/src/L2/BaseFeeVault.sol"; -contract UpdateFeeVaultRecipient is Script { +contract DeployNewFeeVaults is Script { address internal recipient = vm.envAddress("FEE_DISBURSER_PROXY"); error FeeVaultFailedToUpdate(string feeVaultType, string reason); function run() public { - ProxyAdmin proxyAdmin = ProxyAdmin(Predeploys.PROXY_ADMIN); address proxyAdminOwner = vm.envAddress("PROXY_ADMIN_OWNER"); address payable sfvProxy = payable(Predeploys.SEQUENCER_FEE_WALLET); @@ -26,53 +24,28 @@ contract UpdateFeeVaultRecipient is Script { L1FeeVault lfvOld = L1FeeVault(lfvProxy); BaseFeeVault bfvOld = BaseFeeVault(bfvProxy); - /// - // CREATE THE NEW FEE VAULTS - /// vm.startBroadcast(proxyAdminOwner); 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)); console.log("L1 Fee Vault Impl address: %s", address(lfvNew)); console.log("Base Fee Vault Impl address: %s", address(bfvNew)); - - /// - // UPDATE THE PROXY IMPLEMENTATIONS - /// - proxyAdmin.upgrade(sfvProxy, address(sfvNew)); - require( - proxyAdmin.getProxyImplementation(sfvProxy).codehash == - address(sfvNew).codehash, - "L1FeeVault not upgraded" - ); - proxyAdmin.upgrade(lfvProxy, address(lfvNew)); - require( - proxyAdmin.getProxyImplementation(address(lfvProxy)).codehash == - address(lfvNew).codehash, - "L1FeeVault not upgraded" - ); - proxyAdmin.upgrade(bfvProxy, address(bfvNew)); - require( - proxyAdmin.getProxyImplementation(address(bfvProxy)).codehash == - address(bfvNew).codehash, - "BaseFeeVault not upgraded" - ); vm.stopBroadcast(); } @@ -94,7 +67,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 +80,4 @@ contract UpdateFeeVaultRecipient is Script { }); } } -} +} \ No newline at end of file diff --git a/sepolia/2024-01-22-deploy-revshare/script/UpgradeFeeVaultProxy.s.sol b/sepolia/2024-01-22-deploy-revshare/script/UpgradeFeeVaultProxy.s.sol new file mode 100644 index 00000000..2735d45d --- /dev/null +++ b/sepolia/2024-01-22-deploy-revshare/script/UpgradeFeeVaultProxy.s.sol @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.15; + +import "forge-std/Script.sol"; + +import "@eth-optimism-bedrock/src/libraries/Predeploys.sol"; +import "@eth-optimism-bedrock/src/universal/ProxyAdmin.sol"; +import {SequencerFeeVault, FeeVault} from "@eth-optimism-bedrock/src/L2/SequencerFeeVault.sol"; +import {L1FeeVault} from "@eth-optimism-bedrock/src/L2/L1FeeVault.sol"; +import {BaseFeeVault} from "@eth-optimism-bedrock/src/L2/BaseFeeVault.sol"; + +contract UpgradeFeeVaultProxy is Script { + function run() public { + ProxyAdmin proxyAdmin = ProxyAdmin(Predeploys.PROXY_ADMIN); + address proxyAdminOwner = vm.envAddress("PROXY_ADMIN_OWNER"); + + address payable sfvProxy = payable(Predeploys.SEQUENCER_FEE_WALLET); + address payable lfvProxy = payable(Predeploys.L1_FEE_VAULT); + address payable bfvProxy = payable(Predeploys.BASE_FEE_VAULT); + + address sfvNew = vm.envAddress("SEQUENCER_FEE_VAULT_IMPL"); + address lfvNew = vm.envAddress("L1_FEE_VAULT_IMPL"); + address bfvNew = vm.envAddress("BASE_FEE_VAULT_IMPL"); + + vm.startBroadcast(proxyAdminOwner); + proxyAdmin.upgrade(sfvProxy, address(sfvNew)); + require( + proxyAdmin.getProxyImplementation(sfvProxy).codehash == + address(sfvNew).codehash, + "SequencerFeeVault proxy not upgraded" + ); + console.log("Upgraded Sequencer Fee Vault Impl."); + proxyAdmin.upgrade(lfvProxy, address(lfvNew)); + require( + proxyAdmin.getProxyImplementation(address(lfvProxy)).codehash == + address(lfvNew).codehash, + "L1FeeVault proxy not Upgraded" + ); + console.log("Upgraded L1 Fee Vault Impl."); + proxyAdmin.upgrade(bfvProxy, address(bfvNew)); + require( + proxyAdmin.getProxyImplementation(address(bfvProxy)).codehash == + address(bfvNew).codehash, + "BaseFeeVault proxy not upgraded" + ); + console.log("Upgraded Base Fee Vault Impl."); + vm.stopBroadcast(); + } +}