Skip to content

Commit 7e1f04b

Browse files
authored
fix: remove PaymentArbitrated (#301)
1 parent 009188b commit 7e1f04b

File tree

7 files changed

+2
-86
lines changed

7 files changed

+2
-86
lines changed

service_contracts/abi/FilecoinWarmStorageService.abi.json

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@
915915
]
916916
}
917917
],
918-
"stateMutability": "nonpayable"
918+
"stateMutability": "view"
919919
},
920920
{
921921
"type": "function",
@@ -1266,43 +1266,6 @@
12661266
],
12671267
"anonymous": false
12681268
},
1269-
{
1270-
"type": "event",
1271-
"name": "PaymentArbitrated",
1272-
"inputs": [
1273-
{
1274-
"name": "railId",
1275-
"type": "uint256",
1276-
"indexed": false,
1277-
"internalType": "uint256"
1278-
},
1279-
{
1280-
"name": "dataSetId",
1281-
"type": "uint256",
1282-
"indexed": false,
1283-
"internalType": "uint256"
1284-
},
1285-
{
1286-
"name": "originalAmount",
1287-
"type": "uint256",
1288-
"indexed": false,
1289-
"internalType": "uint256"
1290-
},
1291-
{
1292-
"name": "modifiedAmount",
1293-
"type": "uint256",
1294-
"indexed": false,
1295-
"internalType": "uint256"
1296-
},
1297-
{
1298-
"name": "faultedEpochs",
1299-
"type": "uint256",
1300-
"indexed": false,
1301-
"internalType": "uint256"
1302-
}
1303-
],
1304-
"anonymous": false
1305-
},
13061269
{
13071270
"type": "event",
13081271
"name": "PieceAdded",

service_contracts/src/FilecoinWarmStorageService.sol

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ contract FilecoinWarmStorageService is
9797
event ProviderApproved(uint256 indexed providerId);
9898
event ProviderUnapproved(uint256 indexed providerId);
9999

100-
// Event for validation
101-
event PaymentArbitrated(
102-
uint256 railId, uint256 dataSetId, uint256 originalAmount, uint256 modifiedAmount, uint256 faultedEpochs
103-
);
104-
105100
// =========================================================================
106101
// Structs
107102

@@ -1488,7 +1483,7 @@ contract FilecoinWarmStorageService is
14881483
uint256 fromEpoch,
14891484
uint256 toEpoch,
14901485
uint256 /* rate */
1491-
) external override returns (ValidationResult memory result) {
1486+
) external view override returns (ValidationResult memory result) {
14921487
// Get the data set ID associated with this rail
14931488
uint256 dataSetId = railToDataSet[railId];
14941489
require(dataSetId != 0, Errors.RailNotAssociated(railId));
@@ -1535,9 +1530,6 @@ contract FilecoinWarmStorageService is
15351530
// Calculate how many epochs were not proven (faulted)
15361531
uint256 faultedEpochs = totalEpochsRequested - provenEpochCount;
15371532

1538-
// Emit event for logging
1539-
emit PaymentArbitrated(railId, dataSetId, proposedAmount, modifiedAmount, faultedEpochs);
1540-
15411533
return ValidationResult({
15421534
modifiedAmount: modifiedAmount,
15431535
settleUpto: lastProvenEpoch, // Settle up to the last proven epoch

subgraph/API.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ query AllRails($first: Int, $skip: Int) {
335335
operator
336336
arbiter
337337
paymentRate
338-
settledUpto
339338
endEpoch
340339
queueLength
341340
dataSet {
@@ -359,7 +358,6 @@ query RailById($railId: ID!) {
359358
operator
360359
arbiter
361360
paymentRate
362-
settledUpto
363361
endEpoch
364362
queueLength
365363
dataSet {
@@ -389,7 +387,6 @@ query RailsByClient($clientAddress: Bytes!) {
389387
token
390388
to
391389
paymentRate
392-
settledUpto
393390
endEpoch
394391
dataSet {
395392
id
@@ -410,7 +407,6 @@ query RailsByProvider($providerAddress: Bytes!) {
410407
token
411408
from
412409
paymentRate
413-
settledUpto
414410
endEpoch
415411
dataSet {
416412
id
@@ -432,7 +428,6 @@ query HighPaymentRails($minRate: BigInt!) {
432428
from
433429
to
434430
paymentRate
435-
settledUpto
436431
endEpoch
437432
dataSet {
438433
id

subgraph/schemas/schema.v1.graphql

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ type Rail @entity(immutable: false) {
4848
operator: Bytes!
4949
arbiter: Bytes!
5050
paymentRate: BigInt!
51-
settledUpto: BigInt!
52-
settledAmount: BigInt!
53-
totalFaultedEpochs: BigInt!
5451
endEpoch: BigInt!
5552
isActive: Boolean!
5653
queueLength: BigInt!

subgraph/src/filecoin-warm-storage-service.ts

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
DataSetServiceProviderChanged as DataSetServiceProviderChangedEvent,
1010
PDPPaymentTerminated as PDPPaymentTerminatedEvent,
1111
CDNPaymentTerminated as CDNPaymentTerminatedEvent,
12-
PaymentArbitrated as PaymentArbitratedEvent,
1312
} from "../generated/FilecoinWarmStorageService/FilecoinWarmStorageService";
1413
import { PDPVerifier } from "../generated/PDPVerifier/PDPVerifier";
1514
import { DataSet, FaultRecord, Piece, Provider, Rail, RateChangeQueue } from "../generated/schema";
@@ -535,28 +534,3 @@ export function handleCDNPaymentTerminated(event: CDNPaymentTerminatedEvent): vo
535534
dataSet.save();
536535
}
537536
}
538-
539-
/**
540-
* Handles the PaymentArbitrated event.
541-
* Arbitrates a storage payment.
542-
*/
543-
export function handlePaymentArbitrated(event: PaymentArbitratedEvent): void {
544-
const railId = event.params.railId;
545-
const dataSetId = event.params.dataSetId;
546-
const arbitratedAmount = event.params.modifiedAmount;
547-
const faultedEpochs = event.params.faultedEpochs;
548-
549-
const rail = Rail.load(getRailEntityId(railId));
550-
if (!rail) {
551-
log.warning("PaymentArbitrated: Rail {} not found", [railId.toString()]);
552-
return;
553-
}
554-
555-
const dataSet = DataSet.load(getDataSetEntityId(dataSetId));
556-
557-
rail.settledAmount = rail.settledAmount.plus(arbitratedAmount);
558-
rail.totalFaultedEpochs = rail.totalFaultedEpochs.plus(faultedEpochs);
559-
rail.settledUpto = dataSet ? dataSet.lastProvenEpoch : rail.settledUpto;
560-
561-
rail.save();
562-
}

subgraph/src/utils/entity.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ export function createRails(
3030
rail.arbiter = listenerAddr;
3131
rail.dataSet = dataSetId;
3232
rail.paymentRate = BIGINT_ZERO;
33-
rail.settledUpto = BIGINT_ZERO;
34-
rail.settledAmount = BIGINT_ZERO;
35-
rail.totalFaultedEpochs = BIGINT_ZERO;
3633
rail.endEpoch = BIGINT_ZERO;
3734
rail.isActive = true;
3835
rail.queueLength = BIGINT_ZERO;

subgraph/templates/subgraph.template.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ dataSources:
8282
handler: handlePDPPaymentTerminated
8383
- event: "CDNPaymentTerminated(indexed uint256,uint256,uint256,uint256)"
8484
handler: handleCDNPaymentTerminated
85-
- event: "PaymentArbitrated(uint256,uint256,uint256,uint256,uint256)"
86-
handler: handlePaymentArbitrated
8785
file: ./src/filecoin-warm-storage-service.ts
8886
# LEGACY DATA SOURCE: Indexes events from older contract versions so historical data isn’t lost
8987
# Example: PieceAdded event was upgraded - old had (dataSetId, pieceId, keys[], values[]), new has pieceCid param

0 commit comments

Comments
 (0)