move ADDRESSES to typescript

Author: mohandast52

apps/autonolas-registry/common-util/Contracts/addresses.jsx apps/autonolas-registry/common-util/Contracts/addresses.tsx

@@ -1,10 +1,28 @@
+import { Address } from 'viem';
 import {
   LOCAL_FORK_ID,
   LOCAL_FORK_ID_GNOSIS,
   LOCAL_FORK_ID_POLYGON,
-} from 'util/constants';
+} from '../../util/constants';
 
-const MAINNET_ADDRESSES = {
+type Addresses = {
+  serviceManagerToken: Address;
+  serviceRegistryL2: Address;
+  serviceRegistryTokenUtility: Address;
+  operatorWhitelist: Address;
+};
+
+type L1Addresses = {
+  agentRegistry: Address;
+  componentRegistry: Address;
+  registriesManager: Address;
+  serviceManagerToken: Address;
+  serviceRegistry: Address;
+  serviceRegistryTokenUtility: Address;
+  operatorWhitelist: Address;
+};
+
+const MAINNET_ADDRESSES: L1Addresses = {
   agentRegistry: '0x2F1f7D38e4772884b88f3eCd8B6b9faCdC319112',
   componentRegistry: '0x15bd56669F57192a97dF41A2aa8f4403e9491776',
   registriesManager: '0x9eC9156dEF5C613B2a7D4c46C383F9B58DfcD6fE',
@@ -14,14 +32,14 @@ const MAINNET_ADDRESSES = {
   operatorWhitelist: '0x42042799B0DE38AdD2a70dc996f69f98E1a85260',
 };
 
-const GNOSIS_ADDRESSES = {
+const GNOSIS_ADDRESSES: Addresses = {
   serviceManagerToken: '0x04b0007b2aFb398015B76e5f22993a1fddF83644',
   serviceRegistryL2: '0x9338b5153AE39BB89f50468E608eD9d764B755fD',
   serviceRegistryTokenUtility: '0xa45E64d13A30a51b91ae0eb182e88a40e9b18eD8',
   operatorWhitelist: '0x526E064cB694E8f5B7DB299158e17F33055B3943',
 };
 
-const POLYGON_ADDRESSES = {
+const POLYGON_ADDRESSES: Addresses = {
   serviceManagerToken: '0x04b0007b2aFb398015B76e5f22993a1fddF83644',
   serviceRegistryL2: '0xE3607b00E75f6405248323A9417ff6b39B244b50',
   serviceRegistryTokenUtility: '0xa45E64d13A30a51b91ae0eb182e88a40e9b18eD8',
@@ -35,7 +53,7 @@ const POLYGON_ADDRESSES = {
  * - optimistic
  * - celo
  */
-const COMMON_TEST_ADDRESSES = {
+const COMMON_TEST_ADDRESSES: Addresses = {
   serviceManagerToken: '0x5BA58970c2Ae16Cf6218783018100aF2dCcFc915',
   serviceRegistryL2: '0x31D3202d8744B16A120117A053459DDFAE93c855',
   serviceRegistryTokenUtility: '0xeB49bE5DF00F74bd240DE4535DDe6Bc89CEfb994',
@@ -44,8 +62,10 @@ const COMMON_TEST_ADDRESSES = {
 
 // TODO: add testcases for all networks
 // get addresses from scripts/deployment folder in autonolas-registries repo
-export const ADDRESSES = {
-  1: MAINNET_ADDRESSES,
+export const ADDRESSES: {
+  [chainId: string]: L1Addresses | Addresses;
+} = {
+  '1': MAINNET_ADDRESSES,
   // goerli
   5: {
     agentRegistry: '0xEB5638eefE289691EcE01943f768EDBF96258a80',
@@ -110,31 +130,25 @@ export const ADDRESSES = {
   11155420: COMMON_TEST_ADDRESSES,
   // celo alfajores - testnet for celo
   44787: COMMON_TEST_ADDRESSES,
-  // local
-  31337: {
-    agentRegistry: '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512',
-    componentRegistry: '0x5FbDB2315678afecb367f032d93F642f64180aa3',
-    registriesManager: '0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0',
-    serviceRegistry: '0x998abeb3E57409262aE5b751f60747921B33613E',
-    serviceManager: '0x4c5859f0F772848b2D91F1D83E2Fe57935348029',
-    serviceRegistryTokenUtility: '0x36C02dA8a0983159322a80FFE9F24b1acfF8B570',
-    operatorWhitelist: '0x809d550fca64d94Bd9F66E60752A544199cfAC3D',
-    // used for testing - service creation/update token address
-    ERC20Token: '0x1291Be112d480055DaFd8a610b7d1e203891C274',
-  },
   [LOCAL_FORK_ID]: MAINNET_ADDRESSES,
   [LOCAL_FORK_ID_GNOSIS]: GNOSIS_ADDRESSES,
   [LOCAL_FORK_ID_POLYGON]: POLYGON_ADDRESSES,
-};
+} as const;
 
+type ChainIds = keyof typeof ADDRESSES;
+
+type MultisigAddress = {
+  [chainId in ChainIds]: Address[];
+};
 // TODO: add testcases for all networks
 /**
  * check addresses here - GnosisSafeMultisig
  * Addresses: https://github.com/valory-xyz/autonolas-registries/blob/main/docs/configuration.json
  */
-export const multisigAddresses = {
+export const multisigAddresses: MultisigAddress = {
   1: ['0x46C0D07F55d4F9B5Eed2Fc9680B5953e5fd7b461'],
   5: ['0x65dD51b02049ad1B6FF7fa9Ea3322E1D2CAb1176'],
+  10: ['0xE43d4F4103b623B61E095E8bEA34e1bc8979e168'],
   100: ['0x3C1fF68f5aa342D296d4DEe4Bb1cACCA912D95fE'],
   137: ['0x3d77596beb0f130a4415df3D2D8232B3d3D31e44'],
   8453: ['0xBb7e1D6Cb6F243D6bdE81CE92a9f2aFF7Fbe7eac'],
@@ -152,14 +166,14 @@ export const multisigAddresses = {
   [LOCAL_FORK_ID_POLYGON]: ['0x3d77596beb0f130a4415df3D2D8232B3d3D31e44'],
 };
 
-// TODO: add testcases for all networks
 /**
  * check addresses here - GnosisSafeSameAddressMultisig
  * Addresses: https://github.com/valory-xyz/autonolas-registries/blob/main/docs/configuration.json
  */
-export const multisigSameAddresses = {
+export const multisigSameAddresses: MultisigAddress = {
   1: ['0xfa517d01DaA100cB1932FA4345F68874f7E7eF46'],
   5: ['0x06467Cb835da623384a22aa902647784C1c9f5Ae'],
+  10: ['0xb09CcF0Dbf0C178806Aaee28956c74bd66d21f73'],
   100: ['0x6e7f594f680f7aBad18b7a63de50F0FeE47dfD06'],
   137: ['0xd8BCC126ff31d2582018715d5291A508530587b0'],
   10200: ['0xE16adc7777B7C2a0d35033bd3504C028AB28EE8b'],
@@ -177,14 +191,14 @@ export const multisigSameAddresses = {
   [LOCAL_FORK_ID_POLYGON]: ['0xd8BCC126ff31d2582018715d5291A508530587b0'],
 };
 
-// TODO: add testcases for all networks
 /**
  * check addresses here - MultiSendCallOnly
  * https://github.com/safe-global/safe-deployments/blob/main/src/assets/v1.3.0/multi_send_call_only.json
  */
-export const safeMultiSend = {
+export const safeMultiSend: MultisigAddress = {
   1: ['0x40A2aCCbd92BCA938b02010E17A5b8929b49130D'],
   5: ['0x40A2aCCbd92BCA938b02010E17A5b8929b49130D'],
+  10: ['0xA1dabEF33b3B82c7814B6D82A79e50F4AC44102B'],
   100: ['0x40A2aCCbd92BCA938b02010E17A5b8929b49130D'],
   137: ['0x40A2aCCbd92BCA938b02010E17A5b8929b49130D'],
   8453: ['0xA1dabEF33b3B82c7814B6D82A79e50F4AC44102B'],
@@ -202,14 +216,16 @@ export const safeMultiSend = {
   [LOCAL_FORK_ID_POLYGON]: ['0x40A2aCCbd92BCA938b02010E17A5b8929b49130D'],
 };
 
-// TODO: add testcases for all networks
 /**
  * check addresses here
  * https://github.com/safe-global/safe-deployments/blob/main/src/assets/v1.3.0/compatibility_fallback_handler.json
  */
-export const FALLBACK_HANDLER = {
+export const FALLBACK_HANDLER: {
+  [chainId in ChainIds]: Address;
+} = {
   1: '0xf48f2B2d2a534e402487b3ee7C18c33Aec0Fe5e4',
   5: '0xf48f2B2d2a534e402487b3ee7C18c33Aec0Fe5e4',
+  10: '0x017062a1dE2FE6b99BE3d9d37841FeD19F573804',
   100: '0xf48f2B2d2a534e402487b3ee7C18c33Aec0Fe5e4',
   137: '0xf48f2B2d2a534e402487b3ee7C18c33Aec0Fe5e4',
   8453: '0x017062a1dE2FE6b99BE3d9d37841FeD19F573804',

apps/autonolas-registry/tests/test-chains/TestChains.test.tsx

@@ -111,12 +111,4 @@ describe('test-chains/TestChains.jsx', () => {
     },
     2 * 60 * 1000,
   );
-
-  it('should have the ALL addresses for ALL the chains listed in ADDRESSES object', () => {
-    // const chains = Object.keys(ADDRESSES);
-    // it.each(chains)('should have the addresses for %s', (chain) => {
-    //   const addresses = ADDRESSES[chain];
-    //   expect(Object.keys(addresses).length).toBeGreaterThan(0);
-    // });
-  });
 });