feat: pass real chainId and treasuryName

snapshot-labs · Jul 26, 2024 · 588dc06 · 588dc06
1 parent 8b6f741
commit 588dc06
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 102 deletions.
diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
@@ -1,7 +1,7 @@
 import { getInstance } from '@snapshot-labs/lock/plugins/vue3';
 import { registerTransaction } from '@/helpers/mana';
 import { getNetwork, getReadWriteNetwork, metadataNetwork } from '@/networks';
-import { Connector, StrategyConfig } from '@/networks/types';
+import { Connector, ExecutionInfo, StrategyConfig } from '@/networks/types';
 import {
   Choice,
   NetworkID,
@@ -262,9 +262,7 @@ export function useActions() {
     discussion: string,
     type: VoteType,
     choices: string[],
-    executionStrategy: string | null,
-    executionDestinationAddress: string | null,
-    execution: Transaction[]
+    executionInfo: ExecutionInfo | null
   ) {
     if (!web3.value.account) {
       forceLogin();
@@ -273,18 +271,13 @@ export function useActions() {
 
     const network = getNetwork(space.network);
 
-    const transactions = execution.map((tx: Transaction) => ({
-      ...tx,
-      operation: 0
-    }));
-
     const pinned = await network.helpers.pin({
       title,
       body,
       discussion,
       type,
       choices: choices.filter(c => !!c),
-      execution: transactions
+      execution: executionInfo?.transactions ?? []
     });
     if (!pinned || !pinned.cid) return false;
     console.log('IPFS', pinned);
@@ -297,9 +290,17 @@ export function useActions() {
         web3.value.account,
         space,
         pinned.cid,
-        executionStrategy,
-        executionDestinationAddress,
-        transactions
+        executionInfo === null
+          ? executionInfo
+          : {
+              ...executionInfo,
+              transactions: executionInfo.transactions.map(
+                (tx: Transaction) => ({
+                  ...tx,
+                  operation: 0
+                })
+              )
+            }
       )
     );
 
@@ -319,9 +320,7 @@ export function useActions() {
     discussion: string,
     type: VoteType,
     choices: string[],
-    executionStrategy: string | null,
-    executionDestinationAddress: string | null,
-    execution: Transaction[]
+    executionInfo: ExecutionInfo | null
   ) {
     if (!web3.value.account) {
       forceLogin();
@@ -330,18 +329,13 @@ export function useActions() {
 
     const network = getNetwork(space.network);
 
-    const transactions = execution.map((tx: Transaction) => ({
-      ...tx,
-      operation: 0
-    }));
-
     const pinned = await network.helpers.pin({
       title,
       body,
       discussion,
       type,
       choices: choices.filter(c => !!c),
-      execution: transactions
+      execution: executionInfo?.transactions ?? []
     });
     if (!pinned || !pinned.cid) return false;
     console.log('IPFS', pinned);
@@ -355,9 +349,17 @@ export function useActions() {
         space,
         proposalId,
         pinned.cid,
-        executionStrategy,
-        executionDestinationAddress,
-        transactions
+        executionInfo === null
+          ? executionInfo
+          : {
+              ...executionInfo,
+              transactions: executionInfo.transactions.map(
+                (tx: Transaction) => ({
+                  ...tx,
+                  operation: 0
+                })
+              )
+            }
       )
     );
 

diff --git a/apps/ui/src/networks/common/graphqlApi/index.ts b/apps/ui/src/networks/common/graphqlApi/index.ts
@@ -174,7 +174,8 @@ function formatSpace(space: ApiSpace, networkId: NetworkID): Space {
       return {
         name,
         network,
-        address
+        address,
+        chainId: CHAIN_IDS[network]
       };
     }),
     delegations: space.metadata.delegations.map(delegation => {

diff --git a/apps/ui/src/networks/evm/actions.ts b/apps/ui/src/networks/evm/actions.ts
@@ -27,6 +27,7 @@ import {
 } from '@/networks/common/helpers';
 import {
   Connector,
+  ExecutionInfo,
   NetworkActions,
   NetworkHelpers,
   SnapshotInfo,
@@ -39,8 +40,7 @@ import {
   Proposal,
   Space,
   SpaceMetadata,
-  StrategyParsedMetadata,
-  Transaction
+  StrategyParsedMetadata
 } from '@/types';
 
 const CONFIGS: Record<number, EvmNetworkConfig> = {
@@ -201,9 +201,7 @@ export function createActions(
       account: string,
       space: Space,
       cid: string,
-      executionStrategy: string | null,
-      executionDestinationAddress: string | null,
-      transactions: Transaction[]
+      executionInfo: ExecutionInfo | null
     ) => {
       await verifyNetwork(web3, chainId);
 
@@ -220,14 +218,14 @@ export function createActions(
         });
 
       let selectedExecutionStrategy;
-      if (executionStrategy) {
+      if (executionInfo) {
         selectedExecutionStrategy = {
-          addr: executionStrategy,
+          addr: executionInfo.strategyAddress,
           params: getExecutionData(
             space,
-            executionStrategy,
-            executionDestinationAddress,
-            convertToMetaTransactions(transactions)
+            executionInfo.strategyAddress,
+            executionInfo.destinationAddress,
+            convertToMetaTransactions(executionInfo.transactions)
           ).executionParams[0]
         };
       } else {
@@ -286,9 +284,7 @@ export function createActions(
       space: Space,
       proposalId: number | string,
       cid: string,
-      executionStrategy: string | null,
-      executionDestinationAddress: string | null,
-      transactions: Transaction[]
+      executionInfo: ExecutionInfo | null
     ) {
       await verifyNetwork(web3, chainId);
 
@@ -304,14 +300,14 @@ export function createActions(
       });
 
       let selectedExecutionStrategy;
-      if (executionStrategy) {
+      if (executionInfo) {
         selectedExecutionStrategy = {
-          addr: executionStrategy,
+          addr: executionInfo.strategyAddress,
           params: getExecutionData(
             space,
-            executionStrategy,
-            executionDestinationAddress,
-            convertToMetaTransactions(transactions)
+            executionInfo.strategyAddress,
+            executionInfo.destinationAddress,
+            convertToMetaTransactions(executionInfo.transactions)
           ).executionParams[0]
         };
       } else {

diff --git a/apps/ui/src/networks/offchain/actions.ts b/apps/ui/src/networks/offchain/actions.ts
@@ -23,7 +23,6 @@ import {
   Space,
   Statement,
   StrategyParsedMetadata,
-  Transaction,
   User,
   UserProfile,
   VoteType
@@ -32,6 +31,7 @@ import { EDITOR_APP_NAME, EDITOR_SNAPSHOT_OFFSET } from './constants';
 import { getSdkChoice } from './helpers';
 import {
   Connector,
+  ExecutionInfo,
   NetworkConstants,
   NetworkHelpers,
   ReadOnlyNetworkActions,
@@ -55,26 +55,24 @@ export function createActions(
     networkConfig
   });
 
-  async function getPlugins(
-    executionStrategy: string | null,
-    transactions: Transaction[]
-  ) {
+  async function getPlugins(executionInfo: ExecutionInfo | null) {
     const plugins = {} as { oSnap?: OSnapPlugin };
-    if (executionStrategy && transactions.length) {
-      const network = '11155111';
-      const treasuryAddress = executionStrategy;
+    if (executionInfo && executionInfo.transactions.length) {
+      const treasuryAddress = executionInfo.strategyAddress;
       const moduleAddress = await getModuleAddressForTreasury(
-        network,
+        executionInfo.chainId.toString(),
         treasuryAddress
       );
 
       plugins.oSnap = {
         safes: [
           {
-            safeName: 'Sekhmet treasury',
+            safeName: executionInfo.treasuryName,
             safeAddress: treasuryAddress,
-            network,
-            transactions: transactions.map(tx => parseInternalTransaction(tx)),
+            network: executionInfo.chainId.toString(),
+            transactions: executionInfo.transactions.map(tx =>
+              parseInternalTransaction(tx)
+            ),
             moduleAddress
           }
         ]
@@ -91,9 +89,7 @@ export function createActions(
       account: string,
       space: Space,
       cid: string,
-      executionStrategy: string | null,
-      executionDestinationAddress: string | null,
-      transactions: Transaction[]
+      executionInfo: ExecutionInfo | null
     ) {
       let payload: {
         title: string;
@@ -114,7 +110,7 @@ export function createActions(
       const startTime = currentTime + space.voting_delay;
       const provider = getProvider(space.snapshot_chain_id as number);
 
-      const plugins = await getPlugins(executionStrategy, transactions);
+      const plugins = await getPlugins(executionInfo);
 
       const data = {
         space: space.id,
@@ -140,9 +136,7 @@ export function createActions(
       space: Space,
       proposalId: number | string,
       cid: string,
-      executionStrategy: string | null,
-      executionDestinationAddress: string | null,
-      transactions: Transaction[]
+      executionInfo: ExecutionInfo | null
     ) {
       let payload: {
         title: string;
@@ -159,7 +153,7 @@ export function createActions(
         throw new Error('Failed to fetch proposal metadata');
       }
 
-      const plugins = await getPlugins(executionStrategy, transactions);
+      const plugins = await getPlugins(executionInfo);
 
       const data = {
         proposal: proposalId as string,

diff --git a/apps/ui/src/networks/offchain/api/index.ts b/apps/ui/src/networks/offchain/api/index.ts
@@ -65,15 +65,18 @@ function getProposalState(proposal: ApiProposal): ProposalState {
 }
 
 function formatSpace(space: ApiSpace, networkId: NetworkID): Space {
-  const treasuries = space.treasuries
+  const treasuries: SpaceMetadataTreasury[] = space.treasuries
     .map(treasury => {
+      const chainId = parseInt(treasury.network, 10);
+
       return {
         name: treasury.name,
-        network: TREASURY_NETWORKS.get(parseInt(treasury.network, 10)),
-        address: treasury.address
+        network: TREASURY_NETWORKS.get(chainId) ?? null,
+        address: treasury.address,
+        chainId
       };
     })
-    .filter(treasury => !!treasury.network) as SpaceMetadataTreasury[];
+    .filter(treasury => !!treasury.network);
 
   let validationName = space.validation.name;
   const validationParams = space.validation.params || {};

diff --git a/apps/ui/src/networks/starknet/actions.ts b/apps/ui/src/networks/starknet/actions.ts
@@ -23,6 +23,7 @@ import {
 } from '@/networks/common/helpers';
 import {
   Connector,
+  ExecutionInfo,
   NetworkActions,
   NetworkHelpers,
   SnapshotInfo,
@@ -35,8 +36,7 @@ import {
   Proposal,
   Space,
   SpaceMetadata,
-  StrategyParsedMetadata,
-  Transaction
+  StrategyParsedMetadata
 } from '@/types';
 
 const CONFIGS: Partial<Record<NetworkID, NetworkConfig>> = {
@@ -196,9 +196,7 @@ export function createActions(
       account: string,
       space: Space,
       cid: string,
-      executionStrategy: string | null,
-      executionDestinationAddress: string | null,
-      transactions: Transaction[]
+      executionInfo: ExecutionInfo | null
     ) => {
       const isContract = await getIsContract(connectorType, account);
 
@@ -217,14 +215,14 @@ export function createActions(
       }
 
       let selectedExecutionStrategy;
-      if (executionStrategy) {
+      if (executionInfo) {
         selectedExecutionStrategy = {
-          addr: executionStrategy,
+          addr: executionInfo.strategyAddress,
           params: getExecutionData(
             space,
-            executionStrategy,
-            executionDestinationAddress,
-            convertToMetaTransactions(transactions)
+            executionInfo.strategyAddress,
+            executionInfo.destinationAddress,
+            convertToMetaTransactions(executionInfo.transactions)
           ).executionParams
         };
       } else {
@@ -284,9 +282,7 @@ export function createActions(
       space: Space,
       proposalId: number | string,
       cid: string,
-      executionStrategy: string | null,
-      executionDestinationAddress: string | null,
-      transactions: Transaction[]
+      executionInfo: ExecutionInfo | null
     ) {
       const isContract = await getIsContract(connectorType, account);
 
@@ -304,14 +300,14 @@ export function createActions(
       }
 
       let selectedExecutionStrategy;
-      if (executionStrategy) {
+      if (executionInfo) {
         selectedExecutionStrategy = {
-          addr: executionStrategy,
+          addr: executionInfo.strategyAddress,
           params: getExecutionData(
             space,
-            executionStrategy,
-            executionDestinationAddress,
-            convertToMetaTransactions(transactions)
+            executionInfo.strategyAddress,
+            executionInfo.destinationAddress,
+            convertToMetaTransactions(executionInfo.transactions)
           ).executionParams
         };
       } else {