Merge pull request #516 from HausDAO/develop

Deploy without Goerli
HausDAO · Jun 29, 2024 · 4bc3a4a · 4bc3a4a
2 parents 5a936d3 + 4dfced6
commit 4bc3a4a
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 87 deletions.
diff --git a/apps/summon-safe/src/utils/chain.ts b/apps/summon-safe/src/utils/chain.ts
@@ -2,9 +2,10 @@ import { ValidNetwork } from '@daohaus/keychain-utils';
 
 export const VALID_NETWORKS: { [key: number]: ValidNetwork } = {
   1: '0x1',
-  5: '0x5',
   100: '0x64',
   10: '0xa',
   137: '0x89',
   42161: '0xa4b1',
+  11155111: '0xaa36a7',
+  8453: '0x2105',
 };
diff --git a/apps/summon-safe/src/utils/modules.ts b/apps/summon-safe/src/utils/modules.ts
@@ -24,12 +24,6 @@ export const MODULES: Record<string, ModuleTemplate> = {
     },
     chain: {
       '0x1': {},
-      '0x5': {
-        moduleFactory: {
-          address: '0x8f60853B55847d91331106acc303F4A8676efc8B',
-          singletonAddress: '0x30b3Ac0e403e5102c9f0097E9c65f09E5AaF810c',
-        },
-      },
       '0x64': {
         moduleFactory: {
           address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
@@ -165,12 +159,6 @@ export const MODULES: Record<string, ModuleTemplate> = {
     },
     chain: {
       '0x1': {},
-      '0x5': {
-        moduleFactory: {
-          address: '0x8f60853B55847d91331106acc303F4A8676efc8B',
-          singletonAddress: '0x6a2580B166b7132042cCcABa1Fe554fd67440597',
-        },
-      },
       '0x64': {
         moduleFactory: {
           address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
@@ -257,12 +245,6 @@ export const MODULES: Record<string, ModuleTemplate> = {
     },
     chain: {
       '0x1': {},
-      '0x5': {
-        moduleFactory: {
-          address: '0x8f60853B55847d91331106acc303F4A8676efc8B',
-          singletonAddress: '0xf3219beFA8d7ae465fbb0DD227F706972943a84E',
-        },
-      },
       '0x64': {
         moduleFactory: {
           address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
@@ -342,12 +324,6 @@ export const MODULES: Record<string, ModuleTemplate> = {
     },
     chain: {
       '0x1': {},
-      '0x5': {
-        moduleFactory: {
-          address: '0x8f60853B55847d91331106acc303F4A8676efc8B',
-          singletonAddress: '0x92c82e6DFd97e54c5f22bE866b863Ce71f26373f',
-        },
-      },
       '0x64': {
         moduleFactory: {
           address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',
@@ -423,12 +399,6 @@ export const MODULES: Record<string, ModuleTemplate> = {
     },
     chain: {
       '0x1': {},
-      '0x5': {
-        moduleFactory: {
-          address: '0x8f60853B55847d91331106acc303F4A8676efc8B',
-          singletonAddress: '0x5BeFFF7186811b49d29B5565B161Ea7e3d890CC8',
-        },
-      },
       '0x64': {
         moduleFactory: {
           address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45',

diff --git a/apps/summon/src/app/constants.ts b/apps/summon/src/app/constants.ts
@@ -8,12 +8,4 @@ export const limitedNetworkTest = {
     rpc: `https://${process.env.NX_RIVET_KEY}.eth.rpc.rivet.cloud/`,
     explorer: 'https://etherscan.io',
   },
-  '0x5': {
-    chainId: '0x5',
-    networkId: 5,
-    name: 'Goerli',
-    symbol: 'ETH',
-    rpc: `https://${process.env.NX_RIVET_KEY}.goerli.rpc.rivet.cloud/`,
-    explorer: 'https://goerli.etherscan.io',
-  },
 };
diff --git a/libs/contract-utils/README.md b/libs/contract-utils/README.md
@@ -43,7 +43,7 @@ Dao summoning argument explainer [here]
 import { MolochV3AdvTokenSummonerContract } from '@daohaus/contract-utils';
 
 const molochV3AdvSummoner = MolochV3AdvTokenSummonerContract.create({
-  networkIs: '0x5',
+  networkIs: '0x1',
   provider: new ethers.providers.JsonRpcProvider('https:///someProviderUrl.com'),
 });
 

diff --git a/libs/contract-utils/test/addresses.spec.ts b/libs/contract-utils/test/addresses.spec.ts
@@ -7,10 +7,10 @@ describe('baal contract loads', () => {
   beforeAll(() => {
     /* prettier-ignore */
     contracts = {
-      posterAddress: getContractAddressesForChain('POSTER', '0x5'),
-      gnosisMultisendAddress: getContractAddressesForChain('GNOSIS_MULTISEND','0x5'),
-      baalSummonerAddress: getContractAddressesForChain('V3_FACTORY_ADV_TOKEN', '0x5'),
-      tributeMinionAddress: getContractAddressesForChain('TRIBUTE_MINION','0x5'),
+      posterAddress: getContractAddressesForChain('POSTER', '0x64'),
+      gnosisMultisendAddress: getContractAddressesForChain('GNOSIS_MULTISEND','0x64'),
+      baalSummonerAddress: getContractAddressesForChain('V3_FACTORY_ADV_TOKEN', '0x64'),
+      tributeMinionAddress: getContractAddressesForChain('TRIBUTE_MINION','0x64'),
     }
   });
 

diff --git a/libs/contract-utils/test/summoner.spec.ts b/libs/contract-utils/test/summoner.spec.ts
@@ -9,7 +9,7 @@ describe('baal contract loads', () => {
       `https://12345.goerli.rpc.rivet.cloud`
     );
     summoner = await MolochV3SummonerContract.create({
-      networkId: '0x5',
+      networkId: '0x1',
       provider,
     });
   });

diff --git a/libs/form-builder/README.md b/libs/form-builder/README.md
@@ -30,7 +30,7 @@ import { BASIC_PROPOSAL_FORMS } from '@daohaus/moloch-v3-legos';
 import { TARGET_DAO } from '../targetDao';
 
 export const FormPage = () => {
-  return <FormBuilder form={BASIC_PROPOSAL_FORMS.TRANSFER_ERC20} targetNetwork={'0x5'} customFields={MolochFields} />;
+  return <FormBuilder form={BASIC_PROPOSAL_FORMS.TRANSFER_ERC20} targetNetwork={'0x1'} customFields={MolochFields} />;
 };
 ```
 

diff --git a/libs/keychain-utils/README.md b/libs/keychain-utils/README.md
@@ -21,7 +21,7 @@ import { generateExplorerLink } from '@daohaus/keychain-utils';
 
 const contractLink = generateExplorerLink({ chainId: '0x1', address: '0x0address', type: 'address' });
 
-const txLink = generateExplorerLink({ chainId: '0x5', address: '0x0TxHash', type: 'tx' });
+const txLink = generateExplorerLink({ chainId: '0x64', address: '0x0TxHash', type: 'tx' });
 ```
 
 **How to get contract addresses for each supported network**

diff --git a/libs/keychain-utils/src/contractKeychains.ts b/libs/keychain-utils/src/contractKeychains.ts
@@ -3,7 +3,6 @@ import { Keychain } from './types';
 export const CONTRACT_KEYCHAINS: Record<string, Keychain> = {
   V3_FACTORY_ADV_TOKEN: {
     '0x1': '0x8a4A9E36106Ee290811B89e06e2faFE913507965',
-    '0x5': '0xb0c5c96c3d21c1d58B98a5366dF0Af7AfcD94F95',
     '0xaa36a7': '0xD69e5B8F6FA0E5d94B93848700655A78DF24e387',
     '0x64': '0x8a4A9E36106Ee290811B89e06e2faFE913507965',
     '0x89': '0x8a4A9E36106Ee290811B89e06e2faFE913507965',
@@ -13,7 +12,6 @@ export const CONTRACT_KEYCHAINS: Record<string, Keychain> = {
   },
   V3_FACTORY_ORIGINAL: {
     '0x1': '0x7e988A9db2F8597735fc68D21060Daed948a3e8C',
-    '0x5': '0x7e988A9db2F8597735fc68D21060Daed948a3e8C',
     '0xaa36a7': '0xB2B3909661552942AE1115E9Fc99dF0BC93d71d0',
     '0x64': '0x7e988A9db2F8597735fc68D21060Daed948a3e8C',
     '0x89': '0x7e988A9db2F8597735fc68D21060Daed948a3e8C',
@@ -23,7 +21,6 @@ export const CONTRACT_KEYCHAINS: Record<string, Keychain> = {
   },
   LOOT_SINGLETON: {
     '0x1': '0x0444AE984b9563C8480244693ED65F25B3C64a4E',
-    '0x5': '0x0444AE984b9563C8480244693ED65F25B3C64a4E',
     '0xaa36a7': '0x00768B047f73D88b6e9c14bcA97221d6E179d468',
     '0x64': '0x0444AE984b9563C8480244693ED65F25B3C64a4E',
     '0x89': '0x0444AE984b9563C8480244693ED65F25B3C64a4E',
@@ -33,7 +30,6 @@ export const CONTRACT_KEYCHAINS: Record<string, Keychain> = {
   },
   SHARES_SINGLETON: {
     '0x1': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb',
-    '0x5': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb',
     '0xaa36a7': '0x52acf023d38A31f7e7bC92cCe5E68d36cC9752d6',
     '0x64': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb',
     '0x89': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb',
@@ -43,7 +39,6 @@ export const CONTRACT_KEYCHAINS: Record<string, Keychain> = {
   },
   BAAL_SINGLETON: {
     '0x1': '0x5DcE1044A7E2E35D6524001796cee47252f18411',
-    '0x5': '0x5DcE1044A7E2E35D6524001796cee47252f18411',
     '0xaa36a7': '0xc650B598b095613cCddF0f49570FfA475175A5D5',
     '0x64': '0x5DcE1044A7E2E35D6524001796cee47252f18411',
     '0x89': '0x5DcE1044A7E2E35D6524001796cee47252f18411',
@@ -53,7 +48,6 @@ export const CONTRACT_KEYCHAINS: Record<string, Keychain> = {
   },
   GNOSIS_MULTISEND: {
     '0x1': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-    '0x5': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
     '0xaa36a7': '0x998739BFdAAdde7C933B942a68053933098f9EDa',
     '0x64': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
     '0x89': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
@@ -63,7 +57,6 @@ export const CONTRACT_KEYCHAINS: Record<string, Keychain> = {
   },
   GNOSIS_SIGNLIB: {
     '0x1': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2',
-    '0x5': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2',
     '0xaa36a7': '0x98FFBBF51bb33A056B08ddf711f289936AafF717',
     '0x64': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2',
     '0x89': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2',
@@ -73,7 +66,6 @@ export const CONTRACT_KEYCHAINS: Record<string, Keychain> = {
   },
   TRIBUTE_MINION: {
     '0x1': '0x5c17BFBaB751C5ddF1Ff267acF8fF919537F39Cf',
-    '0x5': '0x5c17BFBaB751C5ddF1Ff267acF8fF919537F39Cf',
     '0xaa36a7': '0xdb4D89F2199b9Cf451B7Ff4bdC94b1c96De4bdD0',
     '0x64': '0x5c17BFBaB751C5ddF1Ff267acF8fF919537F39Cf',
     '0x89': '0x51498dDdd2A8cdeC82932E08A37eBaF346C38EFd',
@@ -83,7 +75,6 @@ export const CONTRACT_KEYCHAINS: Record<string, Keychain> = {
   },
   POSTER: {
     '0x1': '0x000000000000cd17345801aa8147b8d3950260ff',
-    '0x5': '0x000000000000cd17345801aa8147b8d3950260ff',
     '0xaa36a7': '0x000000000000cd17345801aa8147b8D3950260FF',
     '0x64': '0x000000000000cd17345801aa8147b8d3950260ff',
     '0x89': '0x000000000000cd17345801aa8147b8d3950260ff',
@@ -93,7 +84,6 @@ export const CONTRACT_KEYCHAINS: Record<string, Keychain> = {
   },
   VAULT_SUMMONER: {
     '0x1': '0x594E630efbe8dbd810c168e3878817a4094bB312',
-    '0x5': '0x594E630efbe8dbd810c168e3878817a4094bB312',
     '0xaa36a7': '0x763f5c2E59f997A6cC48Bf1228aBf61325244702',
     '0x64': '0x594E630efbe8dbd810c168e3878817a4094bB312',
     '0x89': '0x594E630efbe8dbd810c168e3878817a4094bB312',
@@ -103,7 +93,6 @@ export const CONTRACT_KEYCHAINS: Record<string, Keychain> = {
   },
   ZODIAC_FACTORY: {
     '0x1': '0x00000000000DC7F163742Eb4aBEf650037b1f588',
-    '0x5': '0x00000000000DC7F163742Eb4aBEf650037b1f588',
     '0xaa36a7': '0x000000000000aDdB49795b0f9bA5BC298cDda236',
     '0x64': '0x00000000000DC7F163742Eb4aBEf650037b1f588',
     '0x89': '0x00000000000DC7F163742Eb4aBEf650037b1f588',

diff --git a/libs/keychain-utils/src/endpoints.ts b/libs/keychain-utils/src/endpoints.ts
@@ -4,7 +4,6 @@ export const ENDPOINTS: KeychainList = {
   V3_SUBGRAPH: {
     '0x1':
       'https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/HouDe2pTdyKM9CTG1aodnPPPhm7U148BCH7eJ4HHwpdQ',
-    '0x5': 'https://api.thegraph.com/subgraphs/name/hausdao/daohaus-v3-goerli',
     '0x64':
       'https://gateway-arbitrum.network.thegraph.com/api/[api-key]/subgraphs/id/6x9FK3iuhVFaH9sZ39m8bKB5eckax8sjxooBPNKWWK8r',
     '0x89':
@@ -20,7 +19,6 @@ export const ENDPOINTS: KeychainList = {
   },
   EXPLORER: {
     '0x1': 'https://etherscan.io',
-    '0x5': 'https://goerli.etherscan.io',
     '0x64': 'https://gnosisscan.io',
     '0x89': 'https://polygonscan.com',
     '0xa': 'https://optimistic.etherscan.io',
@@ -30,7 +28,6 @@ export const ENDPOINTS: KeychainList = {
   },
   GNOSIS_API: {
     '0x1': 'https://safe-transaction-mainnet.safe.global/api/v1',
-    '0x5': 'https://safe-transaction-goerli.safe.global/api/v1',
     '0x64': 'https://safe-transaction-gnosis-chain.safe.global/api/v1',
     '0x89': 'https://safe-transaction-polygon.safe.global/api/v1',
     '0xa': 'https://safe-transaction-optimism.safe.global/api/v1',
@@ -40,7 +37,6 @@ export const ENDPOINTS: KeychainList = {
   },
   GNOSIS_SAFE_UI: {
     '0x1': 'https://app.safe.global/eth',
-    '0x5': 'https://app.safe.global/gor',
     '0x64': 'https://app.safe.global/gno',
     '0x89': 'https://app.safe.global/matic',
     '0xa': 'https://app.safe.global/oeth',
@@ -49,7 +45,7 @@ export const ENDPOINTS: KeychainList = {
     '0x2105': 'https://app.safe.global/base',
   },
   TABULA_GRAPH: {
-    '0x5':
+    '0x2105':
       'https://api.thegraph.com/subgraphs/name/auryn-macmillan/tabula-goerli',
   },
 };
@@ -86,9 +82,6 @@ export const HAUS_RPC_DEFAULTS = {
   '0x1': process.env['NX_RIVET_KEY']
     ? `https://${process.env['NX_RIVET_KEY']}.eth.rpc.rivet.cloud`
     : `https://eth-mainnet.g.alchemy.com/v2/${process.env['NX_ETHEREUM_ALCHEMY_KEY']}`,
-  '0x5': process.env['NX_RIVET_KEY']
-    ? `https://${process.env['NX_RIVET_KEY']}.goerli.rpc.rivet.cloud/`
-    : `https://eth-goerli.g.alchemy.com/v2/demo`,
   '0x64': 'https://rpc.gnosischain.com/',
   '0xa': process.env['NX_OPTIMISM_ALCHEMY_KEY']
     ? `https://opt-mainnet.g.alchemy.com/v2/${process.env['NX_OPTIMISM_ALCHEMY_KEY']}`
@@ -108,9 +101,6 @@ export const HAUS_RPC = {
   '0x1': process.env['NX_MAINNET_RPC']
     ? process.env['NX_MAINNET_RPC']
     : HAUS_RPC_DEFAULTS['0x1'],
-  '0x5': process.env['NX_GOERLI_RPC']
-    ? process.env['NX_GOERLI_RPC']
-    : HAUS_RPC_DEFAULTS['0x5'],
   '0x64': process.env['NX_GNOSISCHAIN_RPC']
     ? process.env['NX_GNOSISCHAIN_RPC']
     : HAUS_RPC_DEFAULTS['0x64'],
@@ -150,7 +140,6 @@ export const PINATA_API_KEYS: PinataApiKeys = {
 };
 export const ABI_EXPLORER_KEYS: Keychain = {
   '0x1': process.env['NX_ETHERSCAN_KEY'],
-  '0x5': process.env['NX_ETHERSCAN_KEY'],
   '0x64': process.env['NX_GNOSISSCAN_KEY'],
   '0x89': process.env['NX_POLYGONSCAN_KEY'],
   '0xa': process.env['NX_OPTIMISMSCAN_KEY'],

diff --git a/libs/keychain-utils/src/networkData.ts b/libs/keychain-utils/src/networkData.ts
@@ -11,15 +11,6 @@ export const HAUS_NETWORK_DATA: Keychain<NetworkConfig> = {
     explorer: ENDPOINTS.EXPLORER['0x1'] as string,
     rpc: HAUS_RPC['0x1'] as string,
   },
-  '0x5': {
-    chainId: '0x5',
-    networkId: 5,
-    name: 'Goerli',
-    symbol: 'ETH',
-    tokenDecimals: 18,
-    explorer: ENDPOINTS.EXPLORER['0x5'] as string,
-    rpc: HAUS_RPC['0x5'] as string,
-  },
   '0x64': {
     chainId: '0x64',
     networkId: 100,

diff --git a/libs/keychain-utils/src/validNetworks.ts b/libs/keychain-utils/src/validNetworks.ts
@@ -1,6 +1,5 @@
 export const VALID_NETWORKS = {
   '0x1': true,
-  '0x5': true,
   '0x64': true,
   '0xa': true,
   '0x89': true,

diff --git a/libs/keychain-utils/src/viemUtils.ts b/libs/keychain-utils/src/viemUtils.ts
@@ -3,7 +3,6 @@ import {
   mainnet,
   polygon,
   gnosis,
-  goerli,
   optimism,
   base,
   sepolia,
@@ -13,7 +12,6 @@ import { Keychain } from './types';
 
 export const VIEM_CHAINS: Keychain<Chain> = {
   '0x1': mainnet,
-  '0x5': goerli,
   '0x64': gnosis,
   '0x89': polygon,
   '0xa': optimism,

diff --git a/libs/tx-builder/src/utils/abi.ts b/libs/tx-builder/src/utils/abi.ts
@@ -47,7 +47,6 @@ const getABIUrl = ({
   const ABI_ADDRESS = '<<address>>';
   const TEMPORARY_ABI_EXPLORER: Keychain = {
     '0x1': `https://api.etherscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`,
-    '0x5': `https://api-goerli.etherscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`,
     '0x64': `https://api.gnosisscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`,
     '0x89': `https://api.polygonscan.com/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`,
     '0xa': `https://api-optimistic.etherscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`,

diff --git a/libs/tx-builder/src/utils/cache.ts b/libs/tx-builder/src/utils/cache.ts
@@ -15,7 +15,6 @@ const localforage = import('localforage').then(async (localforage) => {
 const defaultABIStore = {
   '0x1': {},
   '0x4': {},
-  '0x5': {},
   '0x2a': {},
   '0xa': {},
   '0x64': {},

diff --git a/libs/ui/src/components/molecules/AddressDisplay/AddressDisplay.stories.tsx b/libs/ui/src/components/molecules/AddressDisplay/AddressDisplay.stories.tsx
@@ -13,15 +13,15 @@ export const FullAddressCase = Template.bind({});
 
 FullAddressCase.args = {
   address: '0xDE6bcde54CF040088607199FC541f013bA53C21E',
-  explorerNetworkId: '0x5',
+  explorerNetworkId: '0xa4b1',
   copy: true,
 };
 
 export const TruncatedAddressCase = Template.bind({});
 
 TruncatedAddressCase.args = {
   address: '0xDE6bcde54CF040088607199FC541f013bA53C21E',
-  explorerNetworkId: '0x5',
+  explorerNetworkId: '0xa4b1',
   copy: true,
   truncate: true,
 };
diff --git a/libs/wizard-form-builder/README.md b/libs/wizard-form-builder/README.md
@@ -73,6 +73,6 @@ const WIZARD_FORM_LEGO = {
 };
 
 export const FormPage = () => {
-  return <WizardFormBuilder form={WIZARD_FORM_LEGO} targetNetwork={'0x5'} customFields={MolochFields} />;
+  return <WizardFormBuilder form={WIZARD_FORM_LEGO} targetNetwork={'0x1'} customFields={MolochFields} />;
 };
 ```