Skip to content

Commit ec22cb9

Browse files
parzival1821parzival1821
authored
Merge branch 'main' into validate-payment-loop
2 parents d390bb5 + 1837576 commit ec22cb9

27 files changed

+1114
-396
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
2626
8. FilecoinWarmStorageService Proxy: [0x468342072e0dc86AFFBe15519bc5B1A1aa86e4dc](https://calibration.filfox.info/en/address/0x468342072e0dc86AFFBe15519bc5B1A1aa86e4dc)
2727
9. FilecoinWarmStorageServiceStateView: [0xE4587AAdB97d7B8197aa08E432bAD0D9Cfe3a17F](https://calibration.filfox.info/en/address/0xE4587AAdB97d7B8197aa08E432bAD0D9Cfe3a17F)
2828

29-
Configuration:
29+
Configuration:
3030
- USDFC Token: [0xb3042734b608a1B16e9e86B374A3f3e389B4cDf0](https://calibration.filfox.info/en/address/0xb3042734b608a1B16e9e86B374A3f3e389B4cDf0)
3131
- FILBEAM_BENEFICIARY_ADDRESS: [0x1D60d2F5960Af6341e842C539985FA297E10d6eA](https://calibration.filfox.info/en/address/0x1D60d2F5960Af6341e842C539985FA297E10d6eA)
3232
- FILBEAM_CONTROLLER_ADDRESS: [0x5f7E5E2A756430EdeE781FF6e6F7954254Ef629A](https://calibration.filfox.info/en/address/0x5f7E5E2A756430EdeE781FF6e6F7954254Ef629A)
@@ -62,7 +62,7 @@ Configuration:
6262
8. FilecoinWarmStorageService Proxy: [0x9ef4cAb0aD0D19b8Df28791Df80b29bC784bE91b](https://calibration.filfox.info/en/address/0x9ef4cAb0aD0D19b8Df28791Df80b29bC784bE91b)
6363
9. FilecoinWarmStorageServiceStateView: [0x7175a72479e2B0050ed310f1a49a517C03573547](https://calibration.filfox.info/en/address/0x7175a72479e2B0050ed310f1a49a517C03573547)
6464

65-
Configuration:
65+
Configuration:
6666
- USDFC Token: [0xb3042734b608a1B16e9e86B374A3f3e389B4cDf0](https://calibration.filfox.info/en/address/0xb3042734b608a1B16e9e86B374A3f3e389B4cDf0)
6767
- FILBEAM_BENEFICIARY_ADDRESS: [0x1D60d2F5960Af6341e842C539985FA297E10d6eA](https://calibration.filfox.info/en/address/0x1D60d2F5960Af6341e842C539985FA297E10d6eA)
6868
- FILBEAM_CONTROLLER_ADDRESS: [0x5f7E5E2A756430EdeE781FF6e6F7954254Ef629A](https://calibration.filfox.info/en/address/0x5f7E5E2A756430EdeE781FF6e6F7954254Ef629A)
@@ -197,4 +197,4 @@ The underlying functionality remains unchanged; this release only updates termin
197197

198198
[Unreleased]: https://github.com/filozone/filecoin-services/compare/v0.2.0...HEAD
199199
[0.2.0]: https://github.com/filozone/filecoin-services/releases/tag/v0.2.0
200-
[0.1.0]: https://github.com/filozone/filecoin-services/releases/tag/v0.1.0
200+
[0.1.0]: https://github.com/filozone/filecoin-services/releases/tag/v0.1.0

‎service_contracts/abi/FilecoinWarmStorageService.abi.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,6 +1602,17 @@
16021602
}
16031603
]
16041604
},
1605+
{
1606+
"type": "error",
1607+
"name": "ClientDataSetAlreadyRegistered",
1608+
"inputs": [
1609+
{
1610+
"name": "clientDataSetId",
1611+
"type": "uint256",
1612+
"internalType": "uint256"
1613+
}
1614+
]
1615+
},
16051616
{
16061617
"type": "error",
16071618
"name": "CommissionExceedsMaximum",

‎service_contracts/abi/FilecoinWarmStorageServiceStateLibrary.abi.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
{
2222
"type": "function",
23-
"name": "clientDataSetIDs",
23+
"name": "clientDataSetIds",
2424
"inputs": [
2525
{
2626
"name": "service",
@@ -31,6 +31,11 @@
3131
"name": "payer",
3232
"type": "address",
3333
"internalType": "address"
34+
},
35+
{
36+
"name": "clientDataSetId",
37+
"type": "uint256",
38+
"internalType": "uint256"
3439
}
3540
],
3641
"outputs": [

‎service_contracts/abi/FilecoinWarmStorageServiceStateView.abi.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,17 @@
2525
},
2626
{
2727
"type": "function",
28-
"name": "clientDataSetIDs",
28+
"name": "clientDataSetIds",
2929
"inputs": [
3030
{
3131
"name": "payer",
3232
"type": "address",
3333
"internalType": "address"
34+
},
35+
{
36+
"name": "clientDataSetId",
37+
"type": "uint256",
38+
"internalType": "uint256"
3439
}
3540
],
3641
"outputs": [

‎service_contracts/abi/PDPVerifier.abi.json‎

Lines changed: 99 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@
44
"inputs": [],
55
"stateMutability": "nonpayable"
66
},
7-
{
8-
"type": "function",
9-
"name": "BURN_ACTOR",
10-
"inputs": [],
11-
"outputs": [
12-
{
13-
"name": "",
14-
"type": "address",
15-
"internalType": "address"
16-
}
17-
],
18-
"stateMutability": "view"
19-
},
207
{
218
"type": "function",
229
"name": "EXTRA_DATA_MAX_SIZE",
@@ -30,32 +17,6 @@
3017
],
3118
"stateMutability": "view"
3219
},
33-
{
34-
"type": "function",
35-
"name": "FIL_USD_PRICE_FEED_ID",
36-
"inputs": [],
37-
"outputs": [
38-
{
39-
"name": "",
40-
"type": "bytes32",
41-
"internalType": "bytes32"
42-
}
43-
],
44-
"stateMutability": "view"
45-
},
46-
{
47-
"type": "function",
48-
"name": "LEAF_SIZE",
49-
"inputs": [],
50-
"outputs": [
51-
{
52-
"name": "",
53-
"type": "uint256",
54-
"internalType": "uint256"
55-
}
56-
],
57-
"stateMutability": "view"
58-
},
5920
{
6021
"type": "function",
6122
"name": "MAX_ENQUEUED_REMOVALS",
@@ -108,45 +69,6 @@
10869
],
10970
"stateMutability": "view"
11071
},
111-
{
112-
"type": "function",
113-
"name": "PYTH",
114-
"inputs": [],
115-
"outputs": [
116-
{
117-
"name": "",
118-
"type": "address",
119-
"internalType": "contract IPyth"
120-
}
121-
],
122-
"stateMutability": "view"
123-
},
124-
{
125-
"type": "function",
126-
"name": "RANDOMNESS_PRECOMPILE",
127-
"inputs": [],
128-
"outputs": [
129-
{
130-
"name": "",
131-
"type": "address",
132-
"internalType": "address"
133-
}
134-
],
135-
"stateMutability": "view"
136-
},
137-
{
138-
"type": "function",
139-
"name": "SECONDS_IN_DAY",
140-
"inputs": [],
141-
"outputs": [
142-
{
143-
"name": "",
144-
"type": "uint256",
145-
"internalType": "uint256"
146-
}
147-
],
148-
"stateMutability": "view"
149-
},
15072
{
15173
"type": "function",
15274
"name": "UPGRADE_INTERFACE_VERSION",
@@ -182,6 +104,11 @@
182104
"type": "uint256",
183105
"internalType": "uint256"
184106
},
107+
{
108+
"name": "listenerAddr",
109+
"type": "address",
110+
"internalType": "address"
111+
},
185112
{
186113
"name": "pieceData",
187114
"type": "tuple[]",
@@ -207,7 +134,7 @@
207134
"internalType": "uint256"
208135
}
209136
],
210-
"stateMutability": "nonpayable"
137+
"stateMutability": "payable"
211138
},
212139
{
213140
"type": "function",
@@ -217,9 +144,23 @@
217144
"name": "setId",
218145
"type": "uint256",
219146
"internalType": "uint256"
220-
},
147+
}
148+
],
149+
"outputs": [
150+
{
151+
"name": "",
152+
"type": "uint256",
153+
"internalType": "uint256"
154+
}
155+
],
156+
"stateMutability": "view"
157+
},
158+
{
159+
"type": "function",
160+
"name": "calculateProofFeeForSize",
161+
"inputs": [
221162
{
222-
"name": "estimatedGasFee",
163+
"name": "rawSize",
223164
"type": "uint256",
224165
"internalType": "uint256"
225166
}
@@ -312,6 +253,32 @@
312253
"outputs": [],
313254
"stateMutability": "nonpayable"
314255
},
256+
{
257+
"type": "function",
258+
"name": "feeEffectiveTime",
259+
"inputs": [],
260+
"outputs": [
261+
{
262+
"name": "",
263+
"type": "uint64",
264+
"internalType": "uint64"
265+
}
266+
],
267+
"stateMutability": "view"
268+
},
269+
{
270+
"type": "function",
271+
"name": "feePerTiB",
272+
"inputs": [],
273+
"outputs": [
274+
{
275+
"name": "",
276+
"type": "uint96",
277+
"internalType": "uint96"
278+
}
279+
],
280+
"stateMutability": "view"
281+
},
315282
{
316283
"type": "function",
317284
"name": "findPieceIds",
@@ -531,24 +498,6 @@
531498
],
532499
"stateMutability": "view"
533500
},
534-
{
535-
"type": "function",
536-
"name": "getFILUSDPrice",
537-
"inputs": [],
538-
"outputs": [
539-
{
540-
"name": "",
541-
"type": "uint64",
542-
"internalType": "uint64"
543-
},
544-
{
545-
"name": "",
546-
"type": "int32",
547-
"internalType": "int32"
548-
}
549-
],
550-
"stateMutability": "view"
551-
},
552501
{
553502
"type": "function",
554503
"name": "getNextChallengeEpoch",
@@ -815,6 +764,19 @@
815764
"outputs": [],
816765
"stateMutability": "nonpayable"
817766
},
767+
{
768+
"type": "function",
769+
"name": "proposedFeePerTiB",
770+
"inputs": [],
771+
"outputs": [
772+
{
773+
"name": "",
774+
"type": "uint96",
775+
"internalType": "uint96"
776+
}
777+
],
778+
"stateMutability": "view"
779+
},
818780
{
819781
"type": "function",
820782
"name": "provePossession",
@@ -901,6 +863,19 @@
901863
"outputs": [],
902864
"stateMutability": "nonpayable"
903865
},
866+
{
867+
"type": "function",
868+
"name": "updateProofFee",
869+
"inputs": [
870+
{
871+
"name": "newFeePerTiB",
872+
"type": "uint256",
873+
"internalType": "uint256"
874+
}
875+
],
876+
"outputs": [],
877+
"stateMutability": "nonpayable"
878+
},
904879
{
905880
"type": "function",
906881
"name": "upgradeToAndCall",
@@ -989,6 +964,31 @@
989964
],
990965
"anonymous": false
991966
},
967+
{
968+
"type": "event",
969+
"name": "FeeUpdateProposed",
970+
"inputs": [
971+
{
972+
"name": "currentFee",
973+
"type": "uint256",
974+
"indexed": false,
975+
"internalType": "uint256"
976+
},
977+
{
978+
"name": "newFee",
979+
"type": "uint256",
980+
"indexed": false,
981+
"internalType": "uint256"
982+
},
983+
{
984+
"name": "effectiveTime",
985+
"type": "uint256",
986+
"indexed": false,
987+
"internalType": "uint256"
988+
}
989+
],
990+
"anonymous": false
991+
},
992992
{
993993
"type": "event",
994994
"name": "Initialized",
@@ -1143,18 +1143,6 @@
11431143
"type": "uint256",
11441144
"indexed": false,
11451145
"internalType": "uint256"
1146-
},
1147-
{
1148-
"name": "price",
1149-
"type": "uint64",
1150-
"indexed": false,
1151-
"internalType": "uint64"
1152-
},
1153-
{
1154-
"name": "expo",
1155-
"type": "int32",
1156-
"indexed": false,
1157-
"internalType": "int32"
11581146
}
11591147
],
11601148
"anonymous": false

0 commit comments

Comments
 (0)