refactor: replace SUPPORTED objects with functions for more flexible …

…access (#38)

* refactor: fallback to using strategy address on display

* refactor: expose helpers function to check if strategy is supported

Mapping objects are limiting us for off-chain network, functions
give us more flexibility.

apps/ui/src/components/Modal/VotingPower.vue

@@ -40,7 +40,7 @@ const baseNetwork = computed(() =>
           <a
             :href="network.helpers.getExplorerUrl(strategy.address, 'strategy')"
             target="_blank"
-            v-text="network.constants.STRATEGIES[strategy.address]"
+            v-text="network.constants.STRATEGIES[strategy.address] || strategy.address"
           />
           <div class="text-skin-link">
             {{ _n(Number(strategy.value) / 10 ** finalDecimals) }} {{ votingPowerSymbol }}

apps/ui/src/components/ProposalVote.vue

@@ -14,11 +14,11 @@ const start = getTsFromCurrent(props.proposal.network, props.proposal.start);
 const isSupported = computed(() => {
   const network = getNetwork(props.proposal.network);
 
-  const hasSupportedAuthenticator = props.proposal.space.authenticators.find(
-    authenticator => network.constants.SUPPORTED_AUTHENTICATORS[authenticator]
+  const hasSupportedAuthenticator = props.proposal.space.authenticators.find(authenticator =>
+    network.helpers.isAuthenticatorSupported(authenticator)
   );
-  const hasSupportedStrategies = props.proposal.strategies.find(
-    strategy => network.constants.SUPPORTED_STRATEGIES[strategy]
+  const hasSupportedStrategies = props.proposal.strategies.find(strategy =>
+    network.helpers.isStrategySupported(strategy)
   );
 
   return hasSupportedAuthenticator && hasSupportedStrategies;

apps/ui/src/networks/common/helpers.ts

@@ -54,17 +54,11 @@ export async function buildMetadata(helpers: NetworkHelpers, config: StrategyCon
 }
 
 export function createStrategyPicker({
-  supportedAuthenticators,
-  supportedStrategies,
-  contractSupportedAuthenticators,
-  relayerAuthenticators,
+  helpers,
   managerConnectors,
   lowPriorityAuthenticators = []
 }: {
-  supportedAuthenticators: Record<string, boolean | undefined>;
-  supportedStrategies: Record<string, boolean | undefined>;
-  contractSupportedAuthenticators: Record<string, boolean | undefined>;
-  relayerAuthenticators: Record<string, 'evm' | 'evm-tx' | 'starknet' | undefined>;
+  helpers: NetworkHelpers;
   managerConnectors: Connector[];
   lowPriorityAuthenticators?: ('evm' | 'evm-tx' | 'starknet')[];
 }) {
@@ -84,12 +78,12 @@ export function createStrategyPicker({
     const authenticatorsInfo = [...authenticators]
       .filter(authenticator =>
         isContract
-          ? contractSupportedAuthenticators[authenticator]
-          : supportedAuthenticators[authenticator]
+          ? helpers.isAuthenticatorContractSupported(authenticator)
+          : helpers.isAuthenticatorSupported(authenticator)
       )
       .sort((a, b) => {
-        const aRelayer = relayerAuthenticators[a];
-        const bRelayer = relayerAuthenticators[b];
+        const aRelayer = helpers.getRelayerAuthenticatorType(a);
+        const bRelayer = helpers.getRelayerAuthenticatorType(b);
         const aLowPriority = aRelayer && lowPriorityAuthenticators.includes(aRelayer);
         const bLowPriority = bRelayer && lowPriorityAuthenticators.includes(bRelayer);
 
@@ -116,7 +110,7 @@ export function createStrategyPicker({
         return 0;
       })
       .map(authenticator => {
-        const relayerType = relayerAuthenticators[authenticator];
+        const relayerType = helpers.getRelayerAuthenticatorType(authenticator);
 
         let connectors: Connector[] = [];
         if (relayerType && ['evm', 'evm-tx'].includes(relayerType)) connectors = EVM_CONNECTORS;
@@ -136,7 +130,7 @@ export function createStrategyPicker({
 
     const selectedStrategies = strategies
       .map((strategy, index) => ({ address: strategy, index: strategiesIndicies[index] }) as const)
-      .filter(({ address }) => supportedStrategies[address]);
+      .filter(({ address }) => helpers.isStrategySupported(address));
 
     if (!authenticatorInfo || (strategies.length !== 0 && selectedStrategies.length === 0)) {
       throw new Error('Unsupported space');

apps/ui/src/networks/evm/actions.ts

@@ -27,7 +27,6 @@ import type { Web3Provider } from '@ethersproject/providers';
 import type {
   Connector,
   NetworkActions,
-  NetworkConstants,
   NetworkHelpers,
   SnapshotInfo,
   StrategyConfig,
@@ -54,17 +53,13 @@ const CONFIGS: Record<number, EvmNetworkConfig> = {
 
 export function createActions(
   provider: Provider,
-  constants: NetworkConstants,
   helpers: NetworkHelpers,
   chainId: number
 ): NetworkActions {
   const networkConfig = CONFIGS[chainId];
 
   const pickAuthenticatorAndStrategies = createStrategyPicker({
-    supportedAuthenticators: constants.SUPPORTED_AUTHENTICATORS,
-    supportedStrategies: constants.SUPPORTED_STRATEGIES,
-    contractSupportedAuthenticators: constants.CONTRACT_SUPPORTED_AUTHENTICATORS,
-    relayerAuthenticators: constants.RELAYER_AUTHENTICATORS,
+    helpers,
     managerConnectors: EVM_CONNECTORS
   });
 

apps/ui/src/networks/evm/index.ts

@@ -78,6 +78,14 @@ export function createEvmNetwork(networkId: NetworkID): Network {
   const constants = createConstants(networkId);
 
   const helpers = {
+    isAuthenticatorSupported: (authenticator: string) =>
+      constants.SUPPORTED_AUTHENTICATORS[authenticator],
+    isAuthenticatorContractSupported: (authenticator: string) =>
+      constants.CONTRACT_SUPPORTED_AUTHENTICATORS[authenticator],
+    getRelayerAuthenticatorType: (authenticator: string) =>
+      constants.RELAYER_AUTHENTICATORS[authenticator],
+    isStrategySupported: (strategy: string) => constants.SUPPORTED_STRATEGIES[strategy],
+    isExecutorSupported: (executor: string) => constants.SUPPORTED_EXECUTORS[executor],
     pin: pinGraph,
     waitForTransaction: (txId: string) => provider.waitForTransaction(txId),
     waitForSpace: (spaceAddress: string, interval = 5000): Promise<Space> =>
@@ -109,7 +117,7 @@ export function createEvmNetwork(networkId: NetworkID): Network {
     hasReceive: false,
     supportsSimulation: ['eth', 'gor', 'sep', 'matic', 'arb1'].includes(networkId),
     managerConnectors: EVM_CONNECTORS,
-    actions: createActions(provider, constants, helpers, chainId),
+    actions: createActions(provider, helpers, chainId),
     api,
     constants,
     helpers