fix: updated typings in HRE declaration and type errors in helpers

packages/contracts/deploy/helpers.ts

@@ -137,7 +137,9 @@ export function getLatestContractAddress(
 
   const latestNetworkDeployment = getLatestNetworkDeployment(osxNetworkName);
   if (latestNetworkDeployment && contractName in latestNetworkDeployment) {
-    return latestNetworkDeployment[contractName].address;
+    // safe cast due to conditional above, but we return the fallback string anyhow
+    const key = contractName as keyof typeof latestNetworkDeployment;
+    return latestNetworkDeployment[key]?.address ?? '';
   }
   return '';
 }

packages/contracts/hardhat.config.ts

@@ -1,6 +1,7 @@
 import networks, {ContractsNetworkConfig} from './networks';
 import {AragonPluginRepos, TestingFork} from './types/hardhat';
 import {NetworkConfigs} from '@aragon/osx-commons-configs';
+import {SupportedNetworks} from '@aragon/osx-commons-configs';
 import '@nomicfoundation/hardhat-chai-matchers';
 import '@nomicfoundation/hardhat-network-helpers';
 import '@nomicfoundation/hardhat-verify';
@@ -9,7 +10,6 @@ import * as dotenv from 'dotenv';
 import 'hardhat-deploy';
 import 'hardhat-gas-reporter';
 import {extendEnvironment, HardhatUserConfig} from 'hardhat/config';
-import {HardhatRuntimeEnvironment} from 'hardhat/types';
 import 'solidity-coverage';
 import 'solidity-docgen';
 
@@ -25,11 +25,11 @@ const accounts = ETH_KEY ? ETH_KEY.split(',') : [];
 // add accounts to network configs
 const hardhatNetworks: NetworkConfigs<HardhatNetworksExtension> = networks;
 for (const network of Object.keys(networks)) {
-  hardhatNetworks[network].accounts = accounts;
+  hardhatNetworks[network as SupportedNetworks].accounts = accounts;
 }
 
 // Extend HardhatRuntimeEnvironment
-extendEnvironment((hre: HardhatRuntimeEnvironment) => {
+extendEnvironment(hre => {
   const aragonPluginRepos: AragonPluginRepos = {
     AddresslistVotingRepoProxy: '',
     TokenVotingRepoProxy: '',

packages/contracts/networks.ts

@@ -37,8 +37,12 @@ const networkExtensions: NetworkConfigs<ContractsNetworkConfig> = {
     ...networks.arbitrum,
     deploy: ['./deploy/new', './deploy/verification'],
   },
-  arbitrumGoerli: {
-    ...networks.arbitrumGoerli,
+  baseSepolia: {
+    ...networks.baseSepolia,
+    deploy: ['./deploy/new', './deploy/verification'],
+  },
+  arbitrumSepolia: {
+    ...networks.arbitrumSepolia,
     deploy: ['./deploy/new', './deploy/verification'],
   },
 };

packages/contracts/types/hardhat.d.ts

@@ -1,12 +1,10 @@
 import {BigNumberish, BytesLike} from 'ethers';
 
 export type AragonPluginRepos = {
-  'address-list-voting': string;
-  'token-voting': string;
-  // prettier-ignore
-  'admin': string;
-  // prettier-ignore
-  'multisig': string;
+  AddresslistVotingRepoProxy: string;
+  TokenVotingRepoProxy: string;
+  AdminRepoProxy: string;
+  MultisigRepoProxy: string;
   [index: string]: string;
 };
 
@@ -28,8 +26,7 @@ export type TestingFork = {
   activeContracts: any;
 };
 
-
-declare module 'hardhat/types' {
+declare module 'hardhat/types/runtime' {
   interface HardhatRuntimeEnvironment {
     aragonPluginRepos: AragonPluginRepos;
     aragonToVerifyContracts: AragonVerifyEntry[];