Skip to content

Commit ae74c86

Browse files
KubuxuZenGround0
authored and
rvagg
committed
pdp-next: Update the latest ABIs (#718)
* Update ABIs As deployed in FilOzone/filecoin-services#311 Signed-off-by: Jakub Sztandera <[email protected]> * Hacky way to encode the PDPOffering Signed-off-by: Jakub Sztandera <[email protected]> * update contract addresses Signed-off-by: Jakub Sztandera <[email protected]> * fix registry address Signed-off-by: Jakub Sztandera <[email protected]> * updated addPieces signature * Remove "Simple" record keeper Signed-off-by: Jakub Sztandera <[email protected]> --------- Signed-off-by: Jakub Sztandera <[email protected]> Co-authored-by: zenground0 <[email protected]>
1 parent e949bd0 commit ae74c86

10 files changed

+90
-364
lines changed

‎pdp/contract/PDPVerifier.abi‎

Lines changed: 1 addition & 19 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": "EXTRA_DATA_MAX_SIZE",
10-
"inputs": [],
11-
"outputs": [
12-
{
13-
"name": "",
14-
"type": "uint256",
15-
"internalType": "uint256"
16-
}
17-
],
18-
"stateMutability": "view"
19-
},
207
{
218
"type": "function",
229
"name": "MAX_ENQUEUED_REMOVALS",
@@ -160,7 +147,7 @@
160147
"name": "calculateProofFeeForSize",
161148
"inputs": [
162149
{
163-
"name": "rawSize",
150+
"name": "proofSize",
164151
"type": "uint256",
165152
"internalType": "uint256"
166153
}
@@ -372,11 +359,6 @@
372359
"type": "uint256[]",
373360
"internalType": "uint256[]"
374361
},
375-
{
376-
"name": "rawSizes",
377-
"type": "uint256[]",
378-
"internalType": "uint256[]"
379-
},
380362
{
381363
"name": "hasMore",
382364
"type": "bool",

‎pdp/contract/PDPVerifier.go‎

Lines changed: 14 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pdp/contract/ServiceProviderRegistry.abi‎

Lines changed: 12 additions & 157 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": "MAX_CAPABILITIES",
@@ -174,72 +161,6 @@
174161
],
175162
"stateMutability": "view"
176163
},
177-
{
178-
"type": "function",
179-
"name": "decodePDPOffering",
180-
"inputs": [
181-
{
182-
"name": "data",
183-
"type": "bytes",
184-
"internalType": "bytes"
185-
}
186-
],
187-
"outputs": [
188-
{
189-
"name": "",
190-
"type": "tuple",
191-
"internalType": "struct ServiceProviderRegistryStorage.PDPOffering",
192-
"components": [
193-
{
194-
"name": "serviceURL",
195-
"type": "string",
196-
"internalType": "string"
197-
},
198-
{
199-
"name": "minPieceSizeInBytes",
200-
"type": "uint256",
201-
"internalType": "uint256"
202-
},
203-
{
204-
"name": "maxPieceSizeInBytes",
205-
"type": "uint256",
206-
"internalType": "uint256"
207-
},
208-
{
209-
"name": "ipniPiece",
210-
"type": "bool",
211-
"internalType": "bool"
212-
},
213-
{
214-
"name": "ipniIpfs",
215-
"type": "bool",
216-
"internalType": "bool"
217-
},
218-
{
219-
"name": "storagePricePerTibPerMonth",
220-
"type": "uint256",
221-
"internalType": "uint256"
222-
},
223-
{
224-
"name": "minProvingPeriodInEpochs",
225-
"type": "uint256",
226-
"internalType": "uint256"
227-
},
228-
{
229-
"name": "location",
230-
"type": "string",
231-
"internalType": "string"
232-
},
233-
{
234-
"name": "paymentTokenAddress",
235-
"type": "address",
236-
"internalType": "contract IERC20"
237-
}
238-
]
239-
}
240-
],
241-
"stateMutability": "pure"
242-
},
243164
{
244165
"type": "function",
245166
"name": "eip712Domain",
@@ -283,72 +204,6 @@
283204
],
284205
"stateMutability": "view"
285206
},
286-
{
287-
"type": "function",
288-
"name": "encodePDPOffering",
289-
"inputs": [
290-
{
291-
"name": "pdpOffering",
292-
"type": "tuple",
293-
"internalType": "struct ServiceProviderRegistryStorage.PDPOffering",
294-
"components": [
295-
{
296-
"name": "serviceURL",
297-
"type": "string",
298-
"internalType": "string"
299-
},
300-
{
301-
"name": "minPieceSizeInBytes",
302-
"type": "uint256",
303-
"internalType": "uint256"
304-
},
305-
{
306-
"name": "maxPieceSizeInBytes",
307-
"type": "uint256",
308-
"internalType": "uint256"
309-
},
310-
{
311-
"name": "ipniPiece",
312-
"type": "bool",
313-
"internalType": "bool"
314-
},
315-
{
316-
"name": "ipniIpfs",
317-
"type": "bool",
318-
"internalType": "bool"
319-
},
320-
{
321-
"name": "storagePricePerTibPerMonth",
322-
"type": "uint256",
323-
"internalType": "uint256"
324-
},
325-
{
326-
"name": "minProvingPeriodInEpochs",
327-
"type": "uint256",
328-
"internalType": "uint256"
329-
},
330-
{
331-
"name": "location",
332-
"type": "string",
333-
"internalType": "string"
334-
},
335-
{
336-
"name": "paymentTokenAddress",
337-
"type": "address",
338-
"internalType": "contract IERC20"
339-
}
340-
]
341-
}
342-
],
343-
"outputs": [
344-
{
345-
"name": "",
346-
"type": "bytes",
347-
"internalType": "bytes"
348-
}
349-
],
350-
"stateMutability": "pure"
351-
},
352207
{
353208
"type": "function",
354209
"name": "getActiveProvidersByProductType",
@@ -1538,18 +1393,18 @@
15381393
"indexed": true,
15391394
"internalType": "enum ServiceProviderRegistryStorage.ProductType"
15401395
},
1541-
{
1542-
"name": "serviceUrl",
1543-
"type": "string",
1544-
"indexed": false,
1545-
"internalType": "string"
1546-
},
15471396
{
15481397
"name": "serviceProvider",
15491398
"type": "address",
15501399
"indexed": false,
15511400
"internalType": "address"
15521401
},
1402+
{
1403+
"name": "productData",
1404+
"type": "bytes",
1405+
"indexed": false,
1406+
"internalType": "bytes"
1407+
},
15531408
{
15541409
"name": "capabilityKeys",
15551410
"type": "string[]",
@@ -1600,18 +1455,18 @@
16001455
"indexed": true,
16011456
"internalType": "enum ServiceProviderRegistryStorage.ProductType"
16021457
},
1603-
{
1604-
"name": "serviceUrl",
1605-
"type": "string",
1606-
"indexed": false,
1607-
"internalType": "string"
1608-
},
16091458
{
16101459
"name": "serviceProvider",
16111460
"type": "address",
16121461
"indexed": false,
16131462
"internalType": "address"
16141463
},
1464+
{
1465+
"name": "productData",
1466+
"type": "bytes",
1467+
"indexed": false,
1468+
"internalType": "bytes"
1469+
},
16151470
{
16161471
"name": "capabilityKeys",
16171472
"type": "string[]",

‎pdp/contract/ServiceProviderRegistry.go‎

Lines changed: 15 additions & 108 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pdp/contract/ServiceProviderRegistryStorage.abi‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,8 @@
167167
"name": "isActive",
168168
"type": "bool",
169169
"internalType": "bool"
170-
},
171-
{
172-
"name": "providerId",
173-
"type": "uint256",
174-
"internalType": "uint256"
175170
}
176171
],
177172
"stateMutability": "view"
178173
}
179-
]
174+
]

‎pdp/contract/ServiceProviderRegistryStorage.go‎

Lines changed: 4 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pdp/contract/ServiceProviderRegistryStorage.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎pdp/contract/addresses.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ func ContractAddresses() PDPContracts {
2121
switch build.BuildType {
2222
case build.BuildCalibnet:
2323
return PDPContracts{
24-
PDPVerifier: common.HexToAddress("0x579dD9E561D4Cd1776CF3e52E598616E77D5FBcb"), // PDPVerifier Proxy v2.2.1 - https://github.com/FilOzone/pdp/releases/tag/v2.2.1
24+
PDPVerifier: common.HexToAddress("0x06279D540BDCd6CA33B073cEAeA1425B6C68c93d"), // PDPVerifier Proxy v3.0.0 - https://github.com/FilOzone/filecoin-services/pull/311
2525
AllowedPublicRecordKeepers: []common.Address{
26-
common.HexToAddress("0x92B51cefF7eBc721Ad0F1fB09505E75F67DCAac6"), // Simple
27-
common.HexToAddress("0x80617b65FD2EEa1D7fDe2B4F85977670690ed348"), // FilecoinWarmStorageService Proxy v0.1.0 - https://github.com/FilOzone/filecoin-services/releases/tag/alpha%2Fcalibnet%2F0x80617b65FD2EEa1D7fDe2B4F85977670690ed348-v2
28-
common.HexToAddress("0x468342072e0dc86AFFBe15519bc5B1A1aa86e4dc"), // FilecoinWarmStorageService Proxy v0.3.0 - https://github.com/FilOzone/filecoin-services/releases/tag/v0.3.0
26+
common.HexToAddress("0xD3De778C05f89e1240ef70100Fb0d9e5b2eFD258"), // FWSS Proxy - https://github.com/FilOzone/filecoin-services/pull/311 (2025-10-21)
2927
},
3028
}
3129
case build.BuildMainnet:
@@ -64,7 +62,7 @@ func IsRecordKeeperAllowed(recordKeeper common.Address) bool {
6462
}
6563

6664
const ServiceRegistryMainnet = "0x9C65E8E57C98cCc040A3d825556832EA1e9f4Df6"
67-
const ServiceRegistryCalibnet = "0x1096ba1e7BB912136DA8524A22bF71091dc4FDd9" // FWSS v0.3.0 Registry Proxy
65+
const ServiceRegistryCalibnet = "0xc758dB755f59189d8FB3C166Ee372b77d7CFA9D3" // FWSS Registry Proxy - https://github.com/FilOzone/filecoin-services/pull/311
6866

6967
func ServiceRegistryAddress() (common.Address, error) {
7068
switch build.BuildType {

0 commit comments

Comments
 (0)