feat: use the colony creation salt instead of calling the network to …

…get the salt
JoinColony · Dec 19, 2024 · 3f616d8 · 3f616d8
1 parent e981891
commit 3f616d8
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 53 deletions.
diff --git a/amplify/backend/api/colonycdapp/schema/schema.graphql b/amplify/backend/api/colonycdapp/schema/schema.graphql
@@ -1539,9 +1539,9 @@ type ColonyCreateEvent {
   """
   blockNumber: Int!
   """
-  The address that signed the transaction
+  The salt used during creation
   """
-  signerAddress: String!
+  creationSalt: String!
 }
 
 """

diff --git a/docker/colony-cdapp-dev-env-block-ingestor b/docker/colony-cdapp-dev-env-block-ingestor
@@ -1,6 +1,6 @@
 FROM colony-cdapp-dev-env/base:latest
 
-ENV BLOCK_INGESTOR_HASH=9f9904afa30c7401f365e9e8e972d18d93e68cd4
+ENV BLOCK_INGESTOR_HASH=93f5d6c2636b2cea91287da15f9d55a00cf2ea5a
 
 # Declare volumes to set up metadata
 VOLUME [ "/colonyCDapp/amplify/mock-data" ]

diff --git a/docker/colony-cdapp-dev-env-proxy-block-ingestor b/docker/colony-cdapp-dev-env-proxy-block-ingestor
@@ -1,7 +1,7 @@
 FROM colony-cdapp-dev-env/base:latest
 
 # @TODO maybe add a PROXY_BLOCK_INGESTOR_HASH and fallback to BLOCK_INGESTOR_HASH
-ENV BLOCK_INGESTOR_HASH=9f9904afa30c7401f365e9e8e972d18d93e68cd4
+ENV BLOCK_INGESTOR_HASH=93f5d6c2636b2cea91287da15f9d55a00cf2ea5a
 # @TODO do we need here a contract to be in the format:
 # {
 #   name: 'ColonyNetwork',
@@ -49,7 +49,7 @@ RUN npm i -g [email protected]
 RUN pnpm install --frozen-lockfile
 
 # Compile JS files
-RUN pnpm --filter @joincolony/proxy-chain run build 
+RUN pnpm --filter @joincolony/proxy-chain run build
 
 WORKDIR /colonyCDappBackend
 

diff --git a/src/components/v5/frame/ColonyHome/partials/TmpProxyColonyDeploy/TmpProxyColonyDeploy.tsx b/src/components/v5/frame/ColonyHome/partials/TmpProxyColonyDeploy/TmpProxyColonyDeploy.tsx
@@ -32,8 +32,7 @@ export const TmpProxyColonyDeploy = () => {
 
     await createProxyColony({
       colonyAddress: colony.colonyAddress,
-      signerAddress: colony.colonyCreateEvent.signerAddress,
-      blockNumber: colony.colonyCreateEvent.blockNumber,
+      creationSalt: colony.colonyCreateEvent.creationSalt,
       foreignChainId: chainId,
     });
   };

diff --git a/src/graphql/fragments/colony.graphql b/src/graphql/fragments/colony.graphql
@@ -3,7 +3,7 @@ fragment Colony on Colony {
   name
   colonyCreateEvent {
     blockNumber
-    signerAddress
+    creationSalt
   }
   nativeToken {
     ...Token

diff --git a/src/graphql/generated.ts b/src/graphql/generated.ts
diff --git a/src/redux/sagas/proxyColonies/createProxyColony.ts b/src/redux/sagas/proxyColonies/createProxyColony.ts
@@ -1,9 +1,8 @@
 import { ClientType } from '@colony/colony-js';
 import { type CustomContract } from '@colony/sdk';
-import { utils, providers } from 'ethers';
-import { call, put, takeEvery } from 'redux-saga/effects';
+import { utils } from 'ethers';
+import { put, takeEvery } from 'redux-saga/effects';
 
-import { GANACHE_LOCAL_RPC_URL, isDev } from '~constants';
 import { colonyAbi } from '~constants/abis.ts';
 import { ContextModule, getContext } from '~context/index.ts';
 import { type Action, ActionTypes, type AllActions } from '~redux';
@@ -17,18 +16,14 @@ import { addTransactionToDb } from '~state/transactionState.ts';
 import { TransactionStatus } from '~types/graphql.ts';
 import { TRANSACTION_METHODS } from '~types/transactions.ts';
 
-import {
-  getColonyManager,
-  getNetworkClient,
-  putError,
-} from '../utils/index.ts';
+import { getColonyManager, putError } from '../utils/index.ts';
 
 export type CreateProxyColonyPayload =
   Action<ActionTypes.PROXY_COLONY_CREATE>['payload'];
 
 // @TODO if metatx are enabled sent a metaTx instead of tx
 function* createProxyColony({
-  payload: { colonyAddress, signerAddress, blockNumber, foreignChainId },
+  payload: { colonyAddress, creationSalt, foreignChainId },
   meta,
 }: Action<ActionTypes.PROXY_COLONY_CREATE>) {
   const batchKey = TRANSACTION_METHODS.CreateProxyColony;
@@ -38,28 +33,10 @@ function* createProxyColony({
 
   const walletAddress = utils.getAddress(address);
 
-  const provider = (() => {
-    if (isDev) {
-      return new providers.StaticJsonRpcProvider(GANACHE_LOCAL_RPC_URL);
-    }
-    return new providers.Web3Provider(window.ethereum!);
-  })();
-
-  /**
-   * For the networkClient.getColonyCreationSalt to properly work when passing the `from` value
-   * We need to instantiate the ColonyNetworkClient using a provider
-   */
-  const networkClient = yield call(getNetworkClient, provider);
-
   try {
-    const generatedColonySalt = yield networkClient.getColonyCreationSalt({
-      blockTag: blockNumber,
-      from: signerAddress,
-    });
-
     const proxyColonyContract: CustomContract<typeof colonyAbi> =
       colonyManager.getCustomContract(colonyAddress, colonyAbi);
-    const params = [foreignChainId, generatedColonySalt];
+    const params = [foreignChainId, creationSalt];
 
     yield addTransactionToDb(meta.id, {
       context: ClientType.ColonyClient, // @NOTE we want to add a new context type
@@ -78,7 +55,7 @@ function* createProxyColony({
     const [transaction, waitForMined] = yield proxyColonyContract
       .createTxCreator('createProxyColony', [
         BigInt(foreignChainId),
-        generatedColonySalt,
+        creationSalt,
         {
           gasLimit: BigInt(10_000_000),
         },

diff --git a/src/redux/types/actions/proxyColonies.ts b/src/redux/types/actions/proxyColonies.ts
@@ -8,9 +8,8 @@ export type ProxyColoniesActionTypes =
       ActionTypes.PROXY_COLONY_CREATE,
       {
         colonyAddress: Address;
-        signerAddress: Address;
-        blockNumber: number;
         foreignChainId: number;
+        creationSalt: string;
       },
       object
     >