f: undo upgrade, needs better implementation

Author: matiasedgeandnode

IndexingPaymentsTodo.md

@@ -18,4 +18,4 @@
 * Expose a function that indexers can use to calculate the tokens to be collected and other collection params?
 * Support a way for gateway to shop an agreement around? Deadline + dedup key? So only one agreement with the dedupe key can be accepted?
 * Maybe check that the epoch the indexer is sending is the one the transaction will be run in?
-* Check upgrade conditions. DONE: ~~Support indexing agreement upgadeability, so that there is a mechanism to adjust the rates without having to cancel and start over~~.
+* Check upgrade conditions. Support indexing agreement upgadeability, so that there is a mechanism to adjust the rates without having to cancel and start over.

packages/horizon/contracts/payments/collectors/RecurringCollector.sol

@@ -98,25 +98,26 @@ contract RecurringCollector is EIP712, GraphDirectory, Authorizable, IRecurringC
         bytes16 oldAgreementId,
         SignedRCA memory signedRCA
     ) external onlyDataService(signedRCA.rca.dataService) {
-        _cancel(signedRCA.rca.dataService, signedRCA.rca.payer, signedRCA.rca.serviceProvider, oldAgreementId);
-        _accept(signedRCA);
-        AgreementKey memory oldKey = AgreementKey({
-            dataService: signedRCA.rca.dataService,
-            payer: signedRCA.rca.payer,
-            serviceProvider: signedRCA.rca.serviceProvider,
-            agreementId: oldAgreementId
-        });
-        AgreementData memory oldAgreement = _getAgreement(oldKey);
-        AgreementKey memory key = AgreementKey({
-            dataService: signedRCA.rca.dataService,
-            payer: signedRCA.rca.payer,
-            serviceProvider: signedRCA.rca.serviceProvider,
-            agreementId: signedRCA.rca.agreementId
-        });
-        AgreementData storage agreement = _getForUpdateAgreement(key);
-        agreement.acceptedAt = oldAgreement.acceptedAt;
-        agreement.lastCollectionAt = oldAgreement.lastCollectionAt;
-        agreement.updatedFromAgreementId = oldAgreementId;
+        // FIX-ME: implement me
+        // _cancel(signedRCA.rca.dataService, signedRCA.rca.payer, signedRCA.rca.serviceProvider, oldAgreementId);
+        // _accept(signedRCA);
+        // AgreementKey memory oldKey = AgreementKey({
+        //     dataService: signedRCA.rca.dataService,
+        //     payer: signedRCA.rca.payer,
+        //     serviceProvider: signedRCA.rca.serviceProvider,
+        //     agreementId: oldAgreementId
+        // });
+        // AgreementData memory oldAgreement = _getAgreement(oldKey);
+        // AgreementKey memory key = AgreementKey({
+        //     dataService: signedRCA.rca.dataService,
+        //     payer: signedRCA.rca.payer,
+        //     serviceProvider: signedRCA.rca.serviceProvider,
+        //     agreementId: signedRCA.rca.agreementId
+        // });
+        // AgreementData storage agreement = _getForUpdateAgreement(key);
+        // agreement.acceptedAt = oldAgreement.acceptedAt;
+        // agreement.lastCollectionAt = oldAgreement.lastCollectionAt;
+        // agreement.updatedFromAgreementId = oldAgreementId;
     }
 
     /**

packages/subgraph-service/contracts/SubgraphService.sol

@@ -627,35 +627,36 @@ contract SubgraphService is
             SubgraphServiceIndexingAgreementDataServiceMismatch(signedRCA.rca.dataService)
         );
 
-        _cancelIndexingAgreement(signedRCA.rca.payer, signedRCA.rca.serviceProvider, oldAgreementId);
-        IndexingAgreementKey memory oldKey = IndexingAgreementKey({
-            indexer: signedRCA.rca.serviceProvider,
-            payer: signedRCA.rca.payer,
-            agreementId: oldAgreementId
-        });
-        IndexingAgreementData memory oldAgreement = _getIndexingAgreement(oldKey);
-
-        RCAIndexingAgreementMetadata memory metadata = _decodeRCAMetadata(signedRCA.rca.metadata);
-        Allocation.State memory allocation = _allocations.get(oldAgreement.allocationId);
-        require(
-            allocation.subgraphDeploymentId == metadata.subgraphDeploymentId,
-            SubgraphServiceIndexingAgreementDeploymentIdMismatch(
-                metadata.subgraphDeploymentId,
-                oldAgreement.allocationId,
-                allocation.subgraphDeploymentId
-            )
-        );
-
-        _acceptIndexingAgreement(oldAgreement.allocationId, signedRCA, metadata);
-        IndexingAgreementKey memory key = IndexingAgreementKey({
-            indexer: signedRCA.rca.serviceProvider,
-            payer: signedRCA.rca.payer,
-            agreementId: signedRCA.rca.agreementId
-        });
-        IndexingAgreementData storage agreement = _getForUpdateIndexingAgreement(key);
-
-        agreement.acceptedAt = oldAgreement.acceptedAt;
-        agreement.lastCollectionAt = oldAgreement.lastCollectionAt;
+        // FIX-ME: Implement me
+        // _cancelIndexingAgreement(signedRCA.rca.payer, signedRCA.rca.serviceProvider, oldAgreementId);
+        // IndexingAgreementKey memory oldKey = IndexingAgreementKey({
+        //     indexer: signedRCA.rca.serviceProvider,
+        //     payer: signedRCA.rca.payer,
+        //     agreementId: oldAgreementId
+        // });
+        // IndexingAgreementData memory oldAgreement = _getIndexingAgreement(oldKey);
+
+        // RCAIndexingAgreementMetadata memory metadata = _decodeRCAMetadata(signedRCA.rca.metadata);
+        // Allocation.State memory allocation = _allocations.get(oldAgreement.allocationId);
+        // require(
+        //     allocation.subgraphDeploymentId == metadata.subgraphDeploymentId,
+        //     SubgraphServiceIndexingAgreementDeploymentIdMismatch(
+        //         metadata.subgraphDeploymentId,
+        //         oldAgreement.allocationId,
+        //         allocation.subgraphDeploymentId
+        //     )
+        // );
+
+        // _acceptIndexingAgreement(oldAgreement.allocationId, signedRCA, metadata);
+        // IndexingAgreementKey memory key = IndexingAgreementKey({
+        //     indexer: signedRCA.rca.serviceProvider,
+        //     payer: signedRCA.rca.payer,
+        //     agreementId: signedRCA.rca.agreementId
+        // });
+        // IndexingAgreementData storage agreement = _getForUpdateIndexingAgreement(key);
+
+        // agreement.acceptedAt = oldAgreement.acceptedAt;
+        // agreement.lastCollectionAt = oldAgreement.lastCollectionAt;
     }
 
     /**