diff --git a/addresses.json b/addresses.json index ba003ca..1540232 100644 --- a/addresses.json +++ b/addresses.json @@ -5,7 +5,7 @@ "network": "polygon", "LensProfilesGuardianTimelock": 604800, "LensHandlesGuardianTimelock": 86400, - "LensHubProxy": "0xdb46d1dc155634fbc732f92e853b10b288ad5a1d", + "LensHub": "0xdb46d1dc155634fbc732f92e853b10b288ad5a1d", "ModuleGlobals": "0x3Df697FF746a60CBe9ee8D47555c88CB66f03BB9", "ProfileCreator": "0xe7Af8325aA443F7678B651d4f0De23663E818691", "LensPeriphery": "0xeff187b4190E551FC25a7fA4dFC6cf7fDeF7194f", @@ -222,7 +222,7 @@ "ModuleRegistry": "0x9E81eD8099dF82004D298144138C12AbB959DF1E", "FollowNFT": "0x3CA67DAfe181AAd74Ad026Cc098E248869f50Ff1", "LensHubImpl": "0x68b2751C4113BbACca7c024a030355fE3989Bda7", - "LensHubProxy": "0xA2574D9DdB6A325Ad2Be838Bd854228B80215148", + "LensHub": "0xA2574D9DdB6A325Ad2Be838Bd854228B80215148", "LensHandlesImpl": "0x33b7C0692DD8267f936936C0A0f7079144d78B92", "LensHandles": "0xf6fDD7932219D64f267E4BfaF8d19774526d31D9", "TokenHandleRegistryImpl": "0x33E2b04f6060BbfD9f2d45EeC53787040B7DE049", diff --git a/script/DeployCore.s.sol b/script/DeployCore.s.sol index 730b527..67cc893 100644 --- a/script/DeployCore.s.sol +++ b/script/DeployCore.s.sol @@ -99,7 +99,7 @@ contract DeployCore is Script, ForkManagement { } function loadBaseAddresses() internal override { - lensHub = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHubProxy'))); + lensHub = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHub'))); vm.label(lensHub, 'LensHub'); console.log('Lens Hub Proxy: %s', lensHub); diff --git a/script/DeployFreshLensV2.s.sol b/script/DeployFreshLensV2.s.sol index 60d5cba..2d5e087 100644 --- a/script/DeployFreshLensV2.s.sol +++ b/script/DeployFreshLensV2.s.sol @@ -255,7 +255,7 @@ contract DeployFreshLensV2 is Script, ForkManagement, ArrayHelpers { ) }); hub = ILensHub(address(hubProxy)); - _logDeployedAddress(address(hub), 'LensHubProxy'); + _logDeployedAddress(address(hub), 'LensHub'); handlesImpl = new LensHandles({ owner: governance.owner, diff --git a/script/DeployLensHub.s.sol b/script/DeployLensHub.s.sol index ae702d7..d7bb1d4 100644 --- a/script/DeployLensHub.s.sol +++ b/script/DeployLensHub.s.sol @@ -99,7 +99,7 @@ contract DeployLensHub is Script, ForkManagement { } function loadBaseAddresses() internal override { - lensHub = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHubProxy'))); + lensHub = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHub'))); vm.label(lensHub, 'LensHub'); console.log('Lens Hub Proxy: %s', lensHub); diff --git a/script/DeployPermissionlessCreator.s.sol b/script/DeployPermissionlessCreator.s.sol index da41ca3..456c468 100644 --- a/script/DeployPermissionlessCreator.s.sol +++ b/script/DeployPermissionlessCreator.s.sol @@ -95,7 +95,7 @@ contract DeployPermissionlessCreator is Script, ForkManagement { } function loadBaseAddresses() internal override { - lensHub = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHubProxy'))); + lensHub = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHub'))); vm.label(lensHub, 'LensHub'); console.log('Lens Hub Proxy: %s', lensHub); diff --git a/script/S01_DeployLensV2Upgrade.s.sol b/script/S01_DeployLensV2Upgrade.s.sol index 9c6943e..704aee4 100644 --- a/script/S01_DeployLensV2Upgrade.s.sol +++ b/script/S01_DeployLensV2Upgrade.s.sol @@ -77,7 +77,7 @@ contract S01_DeployLensV2Upgrade is Script, ForkManagement, ArrayHelpers { ProxyAdmin proxyAdminContract; function loadBaseAddresses() internal override { - lensHub = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHubProxy'))); + lensHub = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHub'))); legacyLensHub = ILensGovernable(lensHub); vm.label(lensHub, 'LensHub'); console.log('Lens Hub Proxy: %s', address(legacyLensHub)); diff --git a/script/S02_DeployLensV2Periphery.s.sol b/script/S02_DeployLensV2Periphery.s.sol index 69d6eb2..4a0fdf2 100644 --- a/script/S02_DeployLensV2Periphery.s.sol +++ b/script/S02_DeployLensV2Periphery.s.sol @@ -183,7 +183,7 @@ contract S02_DeployLensV2Periphery is Script, ForkManagement, ArrayHelpers { vm.label(proxyAdminContractAdmin, 'ProxyAdminContractAdmin'); console.log('ProxyAdminContractAdmin: %s', proxyAdminContractAdmin); - hub = ILensHub(json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHubProxy')))); + hub = ILensHub(json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHub')))); vm.label(address(hub), 'LensHub'); console.log('Lens Hub Proxy: %s', address(hub)); diff --git a/script/S03_ChangeLensV1Admins.s.sol b/script/S03_ChangeLensV1Admins.s.sol index 529996f..e7be751 100644 --- a/script/S03_ChangeLensV1Admins.s.sol +++ b/script/S03_ChangeLensV1Admins.s.sol @@ -24,7 +24,7 @@ contract S03_ChangeLensV1Admins is Script, ForkManagement { ProxyAdmin proxyAdminContract; function loadBaseAddresses() internal override { - address lensHubProxyAddress = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHubProxy'))); + address lensHubProxyAddress = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHub'))); legacyLensHub = ILensGovernable(lensHubProxyAddress); vm.label(lensHubProxyAddress, 'LensHub'); console.log('Legacy Lens Hub: %s', address(legacyLensHub)); diff --git a/script/S04_PerformV2Upgrade.s.sol b/script/S04_PerformV2Upgrade.s.sol index 5705905..181cbb3 100644 --- a/script/S04_PerformV2Upgrade.s.sol +++ b/script/S04_PerformV2Upgrade.s.sol @@ -38,7 +38,7 @@ contract S04_PerformV2Upgrade is Script, ForkManagement { ProxyAdmin proxyAdminContract; function loadBaseAddresses() internal override { - address lensHubProxyAddress = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHubProxy'))); + address lensHubProxyAddress = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHub'))); legacyLensHub = ILensGovernable(lensHubProxyAddress); vm.label(lensHubProxyAddress, 'LensHub'); console.log('Lens Hub Proxy: %s', address(legacyLensHub)); diff --git a/script/S05_GovernanceActions.s.sol b/script/S05_GovernanceActions.s.sol index f443fd5..cf15cd1 100644 --- a/script/S05_GovernanceActions.s.sol +++ b/script/S05_GovernanceActions.s.sol @@ -251,7 +251,7 @@ contract S05_GovernanceActions is Script, ForkManagement, ArrayHelpers { vm.label(proxyAdminContractAdmin, 'ProxyAdminContractAdmin'); console.log('ProxyAdminContractAdmin: %s', proxyAdminContractAdmin); - hub = ILensHub(json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHubProxy')))); + hub = ILensHub(json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHub')))); vm.label(address(hub), 'LensHub'); console.log('Lens Hub Proxy: %s', address(hub)); diff --git a/script/S06_InteractWithLensV2.s.sol b/script/S06_InteractWithLensV2.s.sol index 39a6254..fe046b8 100644 --- a/script/S06_InteractWithLensV2.s.sol +++ b/script/S06_InteractWithLensV2.s.sol @@ -205,7 +205,7 @@ contract S06_InteractWithLensV2 is Script, ForkManagement, ArrayHelpers { vm.label(proxyAdminContractAdmin, 'ProxyAdminContractAdmin'); console.log('ProxyAdminContractAdmin: %s', proxyAdminContractAdmin); - hub = ILensHub(json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHubProxy')))); + hub = ILensHub(json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHub')))); vm.label(address(hub), 'LensHub'); console.log('Lens Hub Proxy: %s', address(hub)); diff --git a/script/forkUpgradeLensHub.sh b/script/forkUpgradeLensHub.sh index e403724..f6d550d 100644 --- a/script/forkUpgradeLensHub.sh +++ b/script/forkUpgradeLensHub.sh @@ -14,7 +14,7 @@ echo "Using target: $TARGET" IMPLEMENTATION_SLOT="0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc" -LENSHUB=$(node script/helpers/readAddress.js $TARGET LensHubProxy) +LENSHUB=$(node script/helpers/readAddress.js $TARGET LensHub) echo "LensHub Proxy: $LENSHUB" LENSHUB_NEW_IMPL=$(node script/helpers/readAddress.js $TARGET LensHubV2Impl) diff --git a/script/helpers/envGen.js b/script/helpers/envGen.js index ebc5ded..7db318b 100644 --- a/script/helpers/envGen.js +++ b/script/helpers/envGen.js @@ -37,7 +37,7 @@ fs.writeFileSync(`./backendEnv_${targetEnv}.txt`, ''); const str = fs.createWriteStream(`./backendEnv_${targetEnv}.txt`, { flags: 'a' }); str.write(`# Hub\n`); -str.write(`LENS_HUB_PROXY=${addresses['LensHubProxy']}\n`); +str.write(`LENS_HUB_PROXY=${addresses['LensHub']}\n`); str.write(`\n# LensHandles\n`); str.write(`LENS_HANDLE_PROXY=${addresses['LensHandles']}\n`); diff --git a/script/verifyStorageSlots.sh b/script/verifyStorageSlots.sh index 407cde5..8a124e9 100644 --- a/script/verifyStorageSlots.sh +++ b/script/verifyStorageSlots.sh @@ -26,11 +26,11 @@ if [[ $1 == "" ]] echo " verifyStorageSlots.sh [targetDeployment] [contractName] [proxyNameInAddresses] [newImplNameInAddresses]" echo " e.g. target (required): mainnet/testnet/sandbox" echo " e.g. contractName (optional): LensHubInitializable (default)" - echo " e.g. proxyNameInAddresses (optional): LensHubProxy (default)" + echo " e.g. proxyNameInAddresses (optional): LensHub (default)" echo " e.g. newImplNameInAddresses (optional): LensHubV2Impl (default)" echo "" echo "Example:" - echo " verifyStorageSlots.sh mainnet LensHub LensHubProxy LensHubV2Impl" + echo " verifyStorageSlots.sh mainnet LensHubInitializable LensHub LensHubV2Impl" exit 1 fi @@ -48,7 +48,7 @@ fi if [[ $3 == "" ]] then - PROXY_NAME="LensHubProxy" + PROXY_NAME="LensHub" else PROXY_NAME=$3 fi diff --git a/test/base/TestSetup.t.sol b/test/base/TestSetup.t.sol index ff50bd7..ca71f00 100644 --- a/test/base/TestSetup.t.sol +++ b/test/base/TestSetup.t.sol @@ -110,7 +110,7 @@ contract TestSetup is Test, ContractAddressesLoaderDeployer, ArrayHelpers { lensVersion = forkVersion; - hubProxyAddr = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHubProxy'))); + hubProxyAddr = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHub'))); vm.label(hubProxyAddr, 'LENS_HUB'); console.log('hubProxyAddr:', hubProxyAddr);