and some more

HausDAO · Jun 29, 2024 · 7b98164 · 7b98164
1 parent 6f46f8d
commit 7b98164
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 48 deletions.
diff --git a/apps/summon-safe/src/utils/chain.ts b/apps/summon-safe/src/utils/chain.ts
@@ -2,7 +2,6 @@ import { ValidNetwork } from '@daohaus/keychain-utils';
 
 export const VALID_NETWORKS: { [key: number]: ValidNetwork } = {
   1: '0x1',
-  5: '0x5',
   100: '0x64',
   10: '0xa',
   137: '0x89',

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/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} />;
 };
 ```