Fix: Store streaming payment changes on colony action, and tidy up editStreamingPaymentMotion saga

Author: iamsamgibbs

amplify/backend/api/colonycdapp/schema/schema.graphql

@@ -3186,6 +3186,29 @@ type ColonyAction @model @searchable {
   Streaming payment associated with the action, if any
   """
   streamingPayment: StreamingPayment @hasOne(fields: ["streamingPaymentId"])
+  """
+  Changes to the streaming payment associated with the action, if any
+  Applicable to `EDIT_STREAMING_PAYMENT` action only
+  """
+  streamingPaymentChanges: StreamingPaymentChangeSet
+}
+
+type StreamingPaymentChangeSet {
+  """
+  The values before the change
+  """
+  oldValues: StreamingPaymentChanges!
+  """
+  The values before the change
+  """
+  newValues: StreamingPaymentChanges!
+}
+
+type StreamingPaymentChanges {
+  startTime: String!
+  endTime: String!
+  interval: String!
+  amount: String!
 }
 
 """
@@ -3627,32 +3650,6 @@ type StreamingPayment @model {
   """
   motions: [ColonyMotion]
     @hasMany(indexName: "byStreamingPaymentId", fields: ["id"])
-  """
-  List of Streaming Payment changelog entries
-  """
-  changelog: [StreamingPaymentChangelog!]
-}
-
-type StreamingPaymentChangelog {
-  """
-  Transaction hash associated with the changelog entry
-  """
-  transactionHash: String!
-  """
-  The values before the change
-  """
-  oldValues: StreamingPaymentChanges!
-  """
-  The values before the change
-  """
-  newValues: StreamingPaymentChanges!
-}
-
-type StreamingPaymentChanges {
-  startTime: String!
-  endTime: String!
-  interval: String!
-  amount: String!
 }
 
 type StreamingPaymentMetadata @model {

docker/colony-cdapp-dev-env-block-ingestor

@@ -1,6 +1,6 @@
 FROM colony-cdapp-dev-env/base:latest
 
-ENV BLOCK_INGESTOR_HASH=56f9fa11ba4f9836744c2a0249b764958b7a8db8
+ENV BLOCK_INGESTOR_HASH=dd43a8f4e131ea6bf44a9ee7f120b885c398e2b7
 
 # Declare volumes to set up metadata
 VOLUME [ "/colonyCDapp/amplify/mock-data" ]

src/graphql/fragments/streamingPayment.graphql

@@ -23,15 +23,6 @@ fragment StreamingPayment on StreamingPayment {
     amount
     timestamp
   }
-  changelog {
-    transactionHash
-    oldValues {
-      ...StreamingPaymentChanges
-    }
-    newValues {
-      ...StreamingPaymentChanges
-    }
-  }
 }
 
 fragment StreamingPaymentChanges on StreamingPaymentChanges {

src/graphql/generated.ts

@@ -4,7 +4,6 @@ import {
   ColonyRole,
   getPermissionProofs,
   Id,
-  type AnyVotingReputationClient,
 } from '@colony/colony-js';
 import { call, fork, put, takeEvery } from 'redux-saga/effects';
 
@@ -96,16 +95,6 @@ function* editStreamingPaymentMotion({
       throw new Error('Streaming payments extension cannot be found');
     }
 
-    const votingReputationClient: AnyVotingReputationClient = yield call(
-      [colonyManager, colonyManager.getClient],
-      ClientType.VotingReputationClient,
-      colonyAddress,
-    );
-
-    if (!votingReputationClient) {
-      throw new Error('Voting reputation extension cannot be found');
-    }
-
     const multicallData = yield getEditStreamingPaymentMulticallData({
       streamingPayment,
       colonyClient,
@@ -125,7 +114,7 @@ function* editStreamingPaymentMotion({
       colonyClient,
       streamingPayment.nativeDomainId,
       [ColonyRole.Funding, ColonyRole.Administration],
-      votingReputationClient.address,
+      votingReputationAddress,
     );
 
     const { skillId } = yield call(
@@ -163,11 +152,6 @@ function* editStreamingPaymentMotion({
           branchMask,
           siblings,
         ],
-        group: {
-          key: batchKey,
-          id: meta.id,
-          index: 1,
-        },
       },
     });