misc: fixes after merging branches

lens-protocol · Jan 4, 2025 · 9533c22 · 9533c22
1 parent 9961155
commit 9533c22
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 91 deletions.
diff --git a/contracts/dashboard/factories/AppFactory.sol b/contracts/dashboard/factories/AppFactory.sol
@@ -13,11 +13,11 @@ contract AppFactory {
     event Lens_AppFactory_Deployment(address indexed app, string metadataURI, KeyValue[] extraData);
 
     address internal immutable _beacon;
-    address internal immutable _proxyAdminLock;
+    address internal immutable _lock;
 
-    constructor(address beacon, address proxyAdminLock) {
+    constructor(address beacon, address lock) {
         _beacon = beacon;
-        _proxyAdminLock = proxyAdminLock;
+        _lock = lock;
     }
 
     function deployApp(
@@ -28,7 +28,7 @@ contract AppFactory {
         AppInitialProperties calldata initialProperties,
         KeyValue[] calldata extraData
     ) external returns (address) {
-        address proxyAdmin = address(new ProxyAdmin(proxyAdminOwner, _proxyAdminLock));
+        address proxyAdmin = address(new ProxyAdmin(proxyAdminOwner, _lock));
         App app = App(address(new BeaconProxy(proxyAdmin, _beacon)));
         app.initialize(metadataURI, sourceStampVerificationEnabled, accessControl, initialProperties, extraData);
         emit Lens_AppFactory_Deployment(address(app), metadataURI, extraData);

diff --git a/contracts/dashboard/factories/FeedFactory.sol b/contracts/dashboard/factories/FeedFactory.sol
@@ -15,12 +15,12 @@ contract FeedFactory {
 
     IAccessControl internal immutable _factoryOwnedAccessControl;
     address internal immutable _beacon;
-    address internal immutable _proxyAdminLock;
+    address internal immutable _lock;
 
-    constructor(address beacon, address proxyAdminLock) {
+    constructor(address beacon, address lock) {
         _factoryOwnedAccessControl = new RoleBasedAccessControl({owner: address(this)});
         _beacon = beacon;
-        _proxyAdminLock = proxyAdminLock;
+        _lock = lock;
     }
 
     function deployFeed(
@@ -30,7 +30,7 @@ contract FeedFactory {
         RuleChange[] calldata ruleChanges,
         KeyValue[] calldata extraData
     ) external returns (address) {
-        address proxyAdmin = address(new ProxyAdmin(proxyAdminOwner, _proxyAdminLock));
+        address proxyAdmin = address(new ProxyAdmin(proxyAdminOwner, _lock));
         Feed feed = Feed(address(new BeaconProxy(proxyAdmin, _beacon)));
         feed.initialize(metadataURI, _factoryOwnedAccessControl);
         feed.changeFeedRules(ruleChanges);

diff --git a/deploy/deployAux.ts b/deploy/deployAux.ts
@@ -110,100 +110,104 @@ async function deployLensAccount(lensFactory: ethers.Contract): Promise<string>
 
 async function deployLensFeed(lensFactory: ethers.Contract): Promise<string> {
   const contractName = 'Feed';
-  const existingContract = loadContractFromAddressBook(contractName);
+  const name = "LensGlobal" + contractName;
+  const existingContract = loadContractFromAddressBook(name);
   if (existingContract && existingContract.address) {
-    console.log(`${contractName} already deployed at ${existingContract.address}. Skipping...`);
+    console.log(`${name} already deployed at ${existingContract.address}. Skipping...`);
     return existingContract.address;
   }
 
-  console.log('Deploying Feed');
+  console.log('Deploying ' + name);
   const transaction = await lensFactory.deployFeed(metadataURI, getWallet().address, [], [], []);
 
   const txReceipt = (await transaction.wait()) as ethers.TransactionReceipt;
   const events = parseLensContractDeployedEventsFromReceipt(txReceipt);
-  const feedAddress = getAddressFromEvents(events, 'feed');
-  const accessControlAddress = getAddressFromEvents(events, 'access-control');
+  const primitiveAddress = getAddressFromEvents(events, contractName.toLowerCase());
+  // const accessControlAddress = getAddressFromEvents(events, 'access-control');
 
-  await verifyPrimitive('Feed', feedAddress, [metadataURI, accessControlAddress]);
+  // await verifyPrimitive(contractName, primitiveAddress, [metadataURI, accessControlAddress]);
 
   saveContractToAddressBook({
-    name: 'LensGlobalFeed',
-    contractName: 'Feed',
+    name: name,
+    contractName: contractName,
     contractType: ContractType.Primitive,
-    address: feedAddress
+    address: primitiveAddress
   });
 
-  return feedAddress;
+  return primitiveAddress;
 }
 
 async function deployLensGroup(lensFactory: ethers.Contract): Promise<string> {
   const contractName = 'Group';
-  const existingContract = loadContractFromAddressBook(contractName);
+  const name = "LensGlobal" + contractName;
+  const existingContract = loadContractFromAddressBook(name);
   if (existingContract && existingContract.address) {
-    console.log(`${contractName} already deployed at ${existingContract.address}. Skipping...`);
+    console.log(`${name} already deployed at ${existingContract.address}. Skipping...`);
     return existingContract.address;
   }
 
-  console.log('Deploying Group');
+  console.log('Deploying ' + name);
   const transaction = await lensFactory.deployGroup(metadataURI, getWallet().address, [], [], []);
 
   const txReceipt = (await transaction.wait()) as ethers.TransactionReceipt;
   const events = parseLensContractDeployedEventsFromReceipt(txReceipt);
-  const groupAddress = getAddressFromEvents(events, 'group');
-  const accessControlAddress = getAddressFromEvents(events, 'access-control');
+  const primitiveAddress = getAddressFromEvents(events, contractName.toLowerCase());
+  // const accessControlAddress = getAddressFromEvents(events, 'access-control');
 
-  await verifyPrimitive('Group', groupAddress, [metadataURI, accessControlAddress]);
+  // await verifyPrimitive(contractName, primitiveAddress, [metadataURI, accessControlAddress]);
 
   saveContractToAddressBook({
-    name: 'LensGlobalGroup',
-    contractName: 'Group',
+    name: name,
+    contractName: contractName,
     contractType: ContractType.Primitive,
-    address: groupAddress
+    address: primitiveAddress
   });
 
-  return groupAddress;
+  return primitiveAddress;
 }
 
 async function deployLensGraph(lensFactory: ethers.Contract): Promise<string> {
   const contractName = 'Graph';
-  const existingContract = loadContractFromAddressBook(contractName);
+  const name = "LensGlobal" + contractName;
+  const existingContract = loadContractFromAddressBook(name);
   if (existingContract && existingContract.address) {
-    console.log(`${contractName} already deployed at ${existingContract.address}. Skipping...`);
+    console.log(`${name} already deployed at ${existingContract.address}. Skipping...`);
     return existingContract.address;
   }
 
-  console.log('Deploying Graph');
+  console.log('Deploying ' + name);
   const transaction = await lensFactory.deployGraph(metadataURI, getWallet().address, [], [], []);
 
   const txReceipt = (await transaction.wait()) as ethers.TransactionReceipt;
   const events = parseLensContractDeployedEventsFromReceipt(txReceipt);
-  const graphAddress = getAddressFromEvents(events, 'graph');
-  const accessControlAddress = getAddressFromEvents(events, 'access-control');
+  const primitiveAddress = getAddressFromEvents(events, contractName.toLowerCase());
+  // const accessControlAddress = getAddressFromEvents(events, 'access-control');
 
-    await verifyPrimitive('Graph', graphAddress, [metadataURI, accessControlAddress]);
+  // await verifyPrimitive(contractName, primitiveAddress, [metadataURI, accessControlAddress]);
 
   saveContractToAddressBook({
-    name: 'LensGlobalGraph',
-    contractName: 'Graph',
+    name: name,
+    contractName: contractName,
     contractType: ContractType.Primitive,
-    address: graphAddress
+    address: primitiveAddress
   });
 
-  return graphAddress;
+  return primitiveAddress;
 }
 
 export async function deployLensNamespace(
   lensFactory: ethers.Contract,
   noVerify: Boolean = false
 ): Promise<string> {
   const contractName = 'Namespace';
-  const existingContract = loadContractFromAddressBook(contractName);
+  const name = "LensGlobal" + contractName;
+  const existingContract = loadContractFromAddressBook(name);
   if (existingContract && existingContract.address) {
-    console.log(`${contractName} already deployed at ${existingContract.address}. Skipping...`);
+    console.log(`${name} already deployed at ${existingContract.address}. Skipping...`);
     return existingContract.address;
   }
 
-  console.log('Deploying Namespace');
+  console.log('Deploying ' + name);
   const namespace = 'lens';
   const nftName = 'nftName';
   const nftSymbol = 'nftSymbol';
@@ -221,46 +225,45 @@ export async function deployLensNamespace(
 
   const txReceipt = (await transaction.wait()) as ethers.TransactionReceipt;
   const events = parseLensContractDeployedEventsFromReceipt(txReceipt);
-  const namespaceAddress = getAddressFromEvents(events, 'namespace');
-  const accessControlAddress = getAddressFromEvents(events, 'access-control');
-  const lensUsernameTokenURIProviderAddress = getAddressFromEvents(
-    events,
-    'username-token-uri-provider'
-  );
-
-  if (!noVerify) {
-    await verifyPrimitive('Namespace', namespaceAddress, [
-      namespace,
-      metadataURI,
-      accessControlAddress,
-      nftName,
-      nftSymbol,
-      lensUsernameTokenURIProviderAddress,
-    ]);
-  }
+  const primitiveAddress = getAddressFromEvents(events, contractName.toLowerCase());
+  // const accessControlAddress = getAddressFromEvents(events, 'access-control');
+  // const lensUsernameTokenURIProviderAddress = getAddressFromEvents(
+  //   events,
+  //   'username-token-uri-provider'
+  // );
+
+  // await verifyPrimitive('Namespace', primitiveAddress, [
+  //   namespace,
+  //   metadataURI,
+  //   accessControlAddress,
+  //   nftName,
+  //   nftSymbol,
+  //   lensUsernameTokenURIProviderAddress,
+  // ]);
 
   saveContractToAddressBook({
-    name: 'LensGlobalNamespace',
-    contractName: 'Namespace',
+    name: name,
+    contractName: contractName,
     contractType: ContractType.Primitive,
-    address: namespaceAddress
+    address: primitiveAddress
   });
 
-  return namespaceAddress;
+  return primitiveAddress;
 }
 
 export async function deployLensApp(
   lensFactory: ethers.Contract,
   initialProperties: AppInitialProperties
 ): Promise<string> {
   const contractName = 'App';
-  const existingContract = loadContractFromAddressBook(contractName);
+  const name = "LensGlobal" + contractName;
+  const existingContract = loadContractFromAddressBook(name);
   if (existingContract && existingContract.address) {
-    console.log(`${contractName} already deployed at ${existingContract.address}. Skipping...`);
+    console.log(`${name} already deployed at ${existingContract.address}. Skipping...`);
     return existingContract.address;
   }
 
-  console.log('Deploying App');
+  console.log('Deploying ' + name);
   console.log('Using the following initial properties:');
   console.log(initialProperties);
   const transaction = await lensFactory.deployApp(
@@ -275,25 +278,25 @@ export async function deployLensApp(
   const txReceipt = (await transaction.wait()) as ethers.TransactionReceipt;
 
   const events = parseLensContractDeployedEventsFromReceipt(txReceipt);
-  const appAddress = getAddressFromEvents(events, 'app');
-  const accessControlAddress = getAddressFromEvents(events, 'access-control');
+  const primitiveAddress = getAddressFromEvents(events, contractName.toLowerCase());
+  // const accessControlAddress = getAddressFromEvents(events, 'access-control');
 
-  await verifyPrimitive('App', appAddress, [
-    metadataURI,
-    false,
-    accessControlAddress,
-    initialProperties,
-    [],
-  ]);
+  // await verifyPrimitive('App', appAddress, [
+  //   metadataURI,
+  //   false,
+  //   accessControlAddress,
+  //   initialProperties,
+  //   [],
+  // ]);
 
   saveContractToAddressBook({
-    name: 'LensGlobalApp',
-    contractName: 'App',
-    contractType: ContractType.Misc,
-    address: appAddress
+    name: name,
+    contractName: contractName,
+    contractType: ContractType.Primitive,
+    address: primitiveAddress
   });
 
-  return appAddress;
+  return primitiveAddress;
 }
 
 export async function deployLensAccessControl() {

diff --git a/deploy/deployFactories.ts b/deploy/deployFactories.ts
@@ -17,39 +17,39 @@ export default async function deployFactories(): Promise<void> {
       contractType: ContractType.Factory,
       constructorArguments: [
         loadContractAddressFromAddressBook('AppBeacon'),
-        loadContractAddressFromAddressBook('ProxyAdminLock'),
+        loadContractAddressFromAddressBook('Lock'),
       ],
     },
     {
       contractName: 'FeedFactory',
       contractType: ContractType.Factory,
       constructorArguments: [
         loadContractAddressFromAddressBook('FeedBeacon'),
-        loadContractAddressFromAddressBook('ProxyAdminLock'),
+        loadContractAddressFromAddressBook('Lock'),
       ],
     },
     {
       contractName: 'GraphFactory',
       contractType: ContractType.Factory,
       constructorArguments: [
         loadContractAddressFromAddressBook('GraphBeacon'),
-        loadContractAddressFromAddressBook('ProxyAdminLock'),
+        loadContractAddressFromAddressBook('Lock'),
       ],
     },
     {
       contractName: 'GroupFactory',
       contractType: ContractType.Factory,
       constructorArguments: [
         loadContractAddressFromAddressBook('GroupBeacon'),
-        loadContractAddressFromAddressBook('ProxyAdminLock'),
+        loadContractAddressFromAddressBook('Lock'),
       ],
     },
     {
       contractName: 'NamespaceFactory',
       contractType: ContractType.Factory,
       constructorArguments: [
         loadContractAddressFromAddressBook('NamespaceBeacon'),
-        loadContractAddressFromAddressBook('ProxyAdminLock'),
+        loadContractAddressFromAddressBook('Lock'),
       ],
     },
     {

diff --git a/deploy/deployProxyStuff.ts b/deploy/deployProxyStuff.ts
@@ -2,7 +2,7 @@ import { deployLensContract, ContractType, ContractInfo, loadContractAddressFrom
 
 export async function deployProxyAdminLock(lockOwner: string): Promise<void> {
   const proxyAdminLock = await deployLensContract({
-    contractName: 'ProxyAdminLock',
+    contractName: 'Lock',
     contractType: ContractType.Aux,
     constructorArguments: [lockOwner, true],
   });

diff --git a/deploy/utils.ts b/deploy/utils.ts
@@ -55,6 +55,11 @@ export const verifyContract = async (data: {
   constructorArguments: string;
   bytecode: string;
 }) => {
+  // Skip verification for local networks
+  if (hre.network.name === 'inMemoryNode') {
+    console.log('Skipping contract verification on local network');
+    return 0;
+  }
   const verificationRequestId: number = await hre.run('verify:verify', {
     ...data,
     noCompile: true,

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "license": "UNLICENSED. Copyright (C) 2024 Lens Labs. All Rights Reserved.",
   "scripts": {
     "deploy": "hardhat deploy-zksync --script deploy.ts",
-    "deploy:local": "anvil-zksync && hardhat deploy-zksync --script deploy.ts --network inMemoryNode",
+    "deploy:local": "hardhat deploy-zksync --script deploy.ts --network inMemoryNode",
     "interact": "hardhat deploy-zksync --script interact.ts",
     "compile": "hardhat compile",
     "clean": "hardhat clean",

diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -27,7 +27,7 @@ import {GroupFactory} from "./../contracts/dashboard/factories/GroupFactory.sol"
 import {NamespaceFactory} from "./../contracts/dashboard/factories/NamespaceFactory.sol";
 import {LensFactory} from "./../contracts/dashboard/factories/LensFactory.sol";
 
-import {ProxyAdminLock} from "./../contracts/core/upgradeability/ProxyAdminLock.sol";
+import {Lock} from "./../contracts/core/upgradeability/Lock.sol";
 import {Beacon} from "./../contracts/core/upgradeability/Beacon.sol";
 
 import {AccountBlockingRule} from "./../contracts/rules/base/AccountBlockingRule.sol";
@@ -63,7 +63,7 @@ contract MyScript is Script {
     address groupGatedFeedRule;
 
     function run() external {
-        proxyAdminLock = address(new ProxyAdminLock(lockOwner, true));
+        proxyAdminLock = address(new Lock(lockOwner, true));
         _deployImplementations();
         _deployBeacons();
         _deployFactories();

diff --git a/test/factories/lens-factory.test.ts b/test/factories/lens-factory.test.ts
@@ -31,7 +31,7 @@ describe('Account', function () {
 
     // Proxy stuff
 
-    const proxyAdminLock = await deployContract('ProxyAdminLock', [await ownerWallet.getAddress(), true], { wallet: ownerWallet, silent: true });
+    const proxyAdminLock = await deployContract('Lock', [await ownerWallet.getAddress(), true], { wallet: ownerWallet, silent: true });
 
     const appImplementation = await deployContract('App', [], { wallet: ownerWallet, silent: true });
     const feedImplementation = await deployContract('Feed', [], { wallet: ownerWallet, silent: true });