Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 32252c4

Browse files
f: undo upgrade, needs better implementation
1 parent a2eba38 commit 32252c4

File tree

3 files changed

+51
-49
lines changed

3 files changed

+51
-49
lines changed

‎IndexingPaymentsTodo.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
* Expose a function that indexers can use to calculate the tokens to be collected and other collection params?
1919
* Support a way for gateway to shop an agreement around? Deadline + dedup key? So only one agreement with the dedupe key can be accepted?
2020
* Maybe check that the epoch the indexer is sending is the one the transaction will be run in?
21-
* 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~~.
21+
* 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

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -98,25 +98,26 @@ contract RecurringCollector is EIP712, GraphDirectory, Authorizable, IRecurringC
9898
bytes16 oldAgreementId,
9999
SignedRCA memory signedRCA
100100
) external onlyDataService(signedRCA.rca.dataService) {
101-
_cancel(signedRCA.rca.dataService, signedRCA.rca.payer, signedRCA.rca.serviceProvider, oldAgreementId);
102-
_accept(signedRCA);
103-
AgreementKey memory oldKey = AgreementKey({
104-
dataService: signedRCA.rca.dataService,
105-
payer: signedRCA.rca.payer,
106-
serviceProvider: signedRCA.rca.serviceProvider,
107-
agreementId: oldAgreementId
108-
});
109-
AgreementData memory oldAgreement = _getAgreement(oldKey);
110-
AgreementKey memory key = AgreementKey({
111-
dataService: signedRCA.rca.dataService,
112-
payer: signedRCA.rca.payer,
113-
serviceProvider: signedRCA.rca.serviceProvider,
114-
agreementId: signedRCA.rca.agreementId
115-
});
116-
AgreementData storage agreement = _getForUpdateAgreement(key);
117-
agreement.acceptedAt = oldAgreement.acceptedAt;
118-
agreement.lastCollectionAt = oldAgreement.lastCollectionAt;
119-
agreement.updatedFromAgreementId = oldAgreementId;
101+
// FIX-ME: implement me
102+
// _cancel(signedRCA.rca.dataService, signedRCA.rca.payer, signedRCA.rca.serviceProvider, oldAgreementId);
103+
// _accept(signedRCA);
104+
// AgreementKey memory oldKey = AgreementKey({
105+
// dataService: signedRCA.rca.dataService,
106+
// payer: signedRCA.rca.payer,
107+
// serviceProvider: signedRCA.rca.serviceProvider,
108+
// agreementId: oldAgreementId
109+
// });
110+
// AgreementData memory oldAgreement = _getAgreement(oldKey);
111+
// AgreementKey memory key = AgreementKey({
112+
// dataService: signedRCA.rca.dataService,
113+
// payer: signedRCA.rca.payer,
114+
// serviceProvider: signedRCA.rca.serviceProvider,
115+
// agreementId: signedRCA.rca.agreementId
116+
// });
117+
// AgreementData storage agreement = _getForUpdateAgreement(key);
118+
// agreement.acceptedAt = oldAgreement.acceptedAt;
119+
// agreement.lastCollectionAt = oldAgreement.lastCollectionAt;
120+
// agreement.updatedFromAgreementId = oldAgreementId;
120121
}
121122

122123
/**

‎packages/subgraph-service/contracts/SubgraphService.sol

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -627,35 +627,36 @@ contract SubgraphService is
627627
SubgraphServiceIndexingAgreementDataServiceMismatch(signedRCA.rca.dataService)
628628
);
629629

630-
_cancelIndexingAgreement(signedRCA.rca.payer, signedRCA.rca.serviceProvider, oldAgreementId);
631-
IndexingAgreementKey memory oldKey = IndexingAgreementKey({
632-
indexer: signedRCA.rca.serviceProvider,
633-
payer: signedRCA.rca.payer,
634-
agreementId: oldAgreementId
635-
});
636-
IndexingAgreementData memory oldAgreement = _getIndexingAgreement(oldKey);
637-
638-
RCAIndexingAgreementMetadata memory metadata = _decodeRCAMetadata(signedRCA.rca.metadata);
639-
Allocation.State memory allocation = _allocations.get(oldAgreement.allocationId);
640-
require(
641-
allocation.subgraphDeploymentId == metadata.subgraphDeploymentId,
642-
SubgraphServiceIndexingAgreementDeploymentIdMismatch(
643-
metadata.subgraphDeploymentId,
644-
oldAgreement.allocationId,
645-
allocation.subgraphDeploymentId
646-
)
647-
);
648-
649-
_acceptIndexingAgreement(oldAgreement.allocationId, signedRCA, metadata);
650-
IndexingAgreementKey memory key = IndexingAgreementKey({
651-
indexer: signedRCA.rca.serviceProvider,
652-
payer: signedRCA.rca.payer,
653-
agreementId: signedRCA.rca.agreementId
654-
});
655-
IndexingAgreementData storage agreement = _getForUpdateIndexingAgreement(key);
656-
657-
agreement.acceptedAt = oldAgreement.acceptedAt;
658-
agreement.lastCollectionAt = oldAgreement.lastCollectionAt;
630+
// FIX-ME: Implement me
631+
// _cancelIndexingAgreement(signedRCA.rca.payer, signedRCA.rca.serviceProvider, oldAgreementId);
632+
// IndexingAgreementKey memory oldKey = IndexingAgreementKey({
633+
// indexer: signedRCA.rca.serviceProvider,
634+
// payer: signedRCA.rca.payer,
635+
// agreementId: oldAgreementId
636+
// });
637+
// IndexingAgreementData memory oldAgreement = _getIndexingAgreement(oldKey);
638+
639+
// RCAIndexingAgreementMetadata memory metadata = _decodeRCAMetadata(signedRCA.rca.metadata);
640+
// Allocation.State memory allocation = _allocations.get(oldAgreement.allocationId);
641+
// require(
642+
// allocation.subgraphDeploymentId == metadata.subgraphDeploymentId,
643+
// SubgraphServiceIndexingAgreementDeploymentIdMismatch(
644+
// metadata.subgraphDeploymentId,
645+
// oldAgreement.allocationId,
646+
// allocation.subgraphDeploymentId
647+
// )
648+
// );
649+
650+
// _acceptIndexingAgreement(oldAgreement.allocationId, signedRCA, metadata);
651+
// IndexingAgreementKey memory key = IndexingAgreementKey({
652+
// indexer: signedRCA.rca.serviceProvider,
653+
// payer: signedRCA.rca.payer,
654+
// agreementId: signedRCA.rca.agreementId
655+
// });
656+
// IndexingAgreementData storage agreement = _getForUpdateIndexingAgreement(key);
657+
658+
// agreement.acceptedAt = oldAgreement.acceptedAt;
659+
// agreement.lastCollectionAt = oldAgreement.lastCollectionAt;
659660
}
660661

661662
/**

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /