Peaq support (#644)

* running test against Agung Testnet * fix typo * testing deployment * create standard json * deploy against localhost fork of peaq * uncoment test fork * add batches * add placeholder * add peaq rpc * move place holder to framework * Clean up hardhat configs and networks * keep Root permision for the deployer * add peaq verification api * remove batches used for Agung * remove fork testing * Clean up and comments
aragon · Feb 26, 2025 · fb613d9 · fb613d9
1 parent 7451e8f
commit fb613d9
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 190 deletions.
diff --git a/packages/contracts/deploy/new/10_framework/53_deploy-placeholder.ts b/packages/contracts/deploy/new/10_framework/53_deploy-placeholder.ts
@@ -0,0 +1,22 @@
+import placeholderSetupArtifact from '../../../artifacts/src/framework/plugin/repo/placeholder/PlaceholderSetup.sol/PlaceholderSetup.json';
+import {DeployFunction} from 'hardhat-deploy/types';
+import {HardhatRuntimeEnvironment} from 'hardhat/types';
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const {deployments, ethers} = hre;
+  const {deploy} = deployments;
+  const [deployer] = await ethers.getSigners();
+
+  await deploy('PlaceholderSetup', {
+    contract: placeholderSetupArtifact,
+    from: deployer.address,
+    args: [],
+    log: true,
+  });
+
+  hre.aragonToVerifyContracts.push({
+    ...(await deployments.get('PlaceholderSetup')),
+  });
+};
+export default func;
+func.tags = ['New', 'PlaceholderSetup'];
diff --git a/packages/contracts/deploy/new/40_finalize-management-dao/40_revoke-permissions.ts b/packages/contracts/deploy/new/40_finalize-management-dao/40_revoke-permissions.ts
@@ -37,8 +37,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   );
 
   // Revoke `REGISTER_DAO_PERMISSION` from `Deployer`.
-  // Revoke `ROOT_PERMISSION` from `Deployer`.
   // Revoke `SET_METADATA_PERMISSION` from `Deployer`.
+  // Revoke `EXECUTE_PERMISSION` from `Deployer`.
+  // Note:  `ROOT_PERMISSION` is not revoked from `Deployer`
+  // because it is needed for installing multisig, and it will be revoked on that repo
   const revokePermissions = [
     {
       operation: Operation.Revoke,
@@ -50,13 +52,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       operation: Operation.Revoke,
       where: {name: 'ManagementDAOProxy', address: managementDAOAddress},
       who: {name: 'Deployer', address: deployer.address},
-      permission: 'ROOT_PERMISSION',
+      permission: 'SET_METADATA_PERMISSION',
     },
     {
       operation: Operation.Revoke,
       where: {name: 'ManagementDAOProxy', address: managementDAOAddress},
       who: {name: 'Deployer', address: deployer.address},
-      permission: 'SET_METADATA_PERMISSION',
+      permission: 'EXECUTE_PERMISSION',
     },
   ];
   await managePermissions(managementDaoContract, revokePermissions);

diff --git a/packages/contracts/deploy/new/40_finalize-management-dao/99_verify_step.ts b/packages/contracts/deploy/new/40_finalize-management-dao/99_verify_step.ts
@@ -29,7 +29,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   // On some chains - such as holesky - wait so
   // previous permission txs are fully applied and verified.
-  await delay(5000);
+  await delay(20000);
 
   // Check revoked permission.
   await checkPermission(managementDaoContract, {
@@ -54,14 +54,14 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   });
 
   await checkPermission(managementDaoContract, {
-    operation: Operation.Revoke,
+    operation: Operation.Grant,
     where: {name: 'ManagementDAOProxy', address: managementDAOAddress},
     who: {name: 'Deployer', address: deployer.address},
     permission: 'ROOT_PERMISSION',
   });
 
   await checkPermission(managementDaoContract, {
-    operation: Operation.Grant,
+    operation: Operation.Revoke,
     where: {name: 'ManagementDAOProxy', address: managementDAOAddress},
     who: {name: 'Deployer', address: deployer.address},
     permission: 'EXECUTE_PERMISSION',

diff --git a/packages/contracts/deployed_contracts_detailed.json b/packages/contracts/deployed_contracts_detailed.json
diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts
@@ -30,8 +30,20 @@ if (process.env.ALCHEMY_API_KEY) {
 }
 
 // add accounts to network configs
-const hardhatNetworks: {[index: string]: NetworkUserConfig} =
-  commonNetworkConfigs;
+const hardhatNetworks: {[index: string]: NetworkUserConfig} = {
+  ...commonNetworkConfigs,
+  agungTestnet: {
+    url: 'https://wss-async.agung.peaq.network',
+    chainId: 9990,
+    gasPrice: 40000000000,
+  },
+  peaq: {
+    url: 'https://erpc-mpfn1.peaq.network',
+    chainId: 3338,
+    gasPrice: 25000000000,
+  },
+};
+
 for (const network of Object.keys(hardhatNetworks) as SupportedNetworks[]) {
   if (network === SupportedNetworks.LOCAL) {
     continue;
@@ -95,6 +107,7 @@ const config: HardhatUserConfig = {
       },
     },
   },
+
   defaultNetwork: 'hardhat',
   networks: {
     hardhat: {
@@ -135,6 +148,7 @@ const config: HardhatUserConfig = {
       arbitrumSepolia: process.env.ARBISCAN_KEY || '',
       modeTestnet: 'modeTestnet',
       modeMainnet: 'modeMainnet',
+      peaq: '1', // It can be set to null. date: 26/Feb/2025
     },
     customChains: [
       {
@@ -195,6 +209,15 @@ const config: HardhatUserConfig = {
           browserURL: 'https://modescan.io',
         },
       },
+      {
+        network: 'peaq',
+        chainId: 3338,
+        urls: {
+          apiURL:
+            'https://peaq.api.subscan.io/api/scan/evm/contract/verifysource',
+          browserURL: 'https://peaq.subscan.io/',
+        },
+      },
     ],
   },
   namedAccounts: {

diff --git a/packages/contracts/networks.ts b/packages/contracts/networks.ts
@@ -33,4 +33,14 @@ export const networkExtensions: {[index: string]: NetworkExtension} = {
   zksyncSepolia: {
     deploy: ['./deploy'],
   },
+  agungTestnet: {
+    explorer: 'subscan',
+    deploy: ['./deploy/new', './deploy/verification'],
+  },
+  peaq: {
+    deploy: ['./deploy/new', './deploy/verification'],
+  },
+  localhost: {
+    deploy: ['./deploy/new'],
+  },
 };