Skip to content

Commit 2fac39a

Browse files
committed
chore: remove DeleteDataSet signature checking facilities
Signed-off-by: Jakub Sztandera <[email protected]>
1 parent 225f020 commit 2fac39a

File tree

2 files changed

+0
-55
lines changed

2 files changed

+0
-55
lines changed

service_contracts/src/FilecoinWarmStorageService.sol

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,6 @@ contract FilecoinWarmStorageService is
212212
bytes32 private constant SCHEDULE_PIECE_REMOVALS_TYPEHASH =
213213
keccak256("SchedulePieceRemovals(uint256 clientDataSetId,uint256[] pieceIds)");
214214

215-
bytes32 private constant DELETE_DATA_SET_TYPEHASH = keccak256("DeleteDataSet(uint256 clientDataSetId)");
216-
217215
// =========================================================================
218216
// Storage variables
219217
//
@@ -1479,32 +1477,6 @@ contract FilecoinWarmStorageService is
14791477
);
14801478
}
14811479

1482-
/**
1483-
* @notice Verifies a signature for the DeleteDataSet operation
1484-
* @param payer The address of the payer who should have signed the message
1485-
* @param clientDataSetId The ID of the data set
1486-
* @param signature The signature bytes (v, r, s)
1487-
*/
1488-
function verifyDeleteDataSetSignature(address payer, uint256 clientDataSetId, bytes memory signature)
1489-
internal
1490-
view
1491-
{
1492-
// Prepare the message hash that was signed
1493-
bytes32 structHash = keccak256(abi.encode(DELETE_DATA_SET_TYPEHASH, clientDataSetId));
1494-
bytes32 digest = _hashTypedDataV4(structHash);
1495-
1496-
// Recover signer address from the signature
1497-
address recoveredSigner = recoverSigner(digest, signature);
1498-
1499-
if (payer == recoveredSigner) {
1500-
return;
1501-
}
1502-
require(
1503-
sessionKeyRegistry.authorizationExpiry(payer, recoveredSigner, DELETE_DATA_SET_TYPEHASH) >= block.timestamp,
1504-
Errors.InvalidSignature(payer, recoveredSigner)
1505-
);
1506-
}
1507-
15081480
/**
15091481
* @notice Recover the signer address from a signature
15101482
* @param messageHash The signed message hash

service_contracts/test/SignatureFixtureTest.t.sol

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ contract MetadataSignatureTestContract is EIP712 {
6161
bytes32 private constant SCHEDULE_PIECE_REMOVALS_TYPEHASH =
6262
keccak256("SchedulePieceRemovals(uint256 clientDataSetId,uint256[] pieceIds)");
6363

64-
bytes32 private constant DELETE_DATA_SET_TYPEHASH = keccak256("DeleteDataSet(uint256 clientDataSetId)");
65-
6664
// Metadata hashing functions
6765
function hashMetadataEntry(string memory key, string memory value) internal pure returns (bytes32) {
6866
return keccak256(abi.encode(METADATA_ENTRY_TYPEHASH, keccak256(bytes(key)), keccak256(bytes(value))));
@@ -180,11 +178,6 @@ contract MetadataSignatureTestContract is EIP712 {
180178
return _hashTypedDataV4(structHash);
181179
}
182180

183-
function getDeleteDataSetDigest(uint256 clientDataSetId) public view returns (bytes32) {
184-
bytes32 structHash = keccak256(abi.encode(DELETE_DATA_SET_TYPEHASH, clientDataSetId));
185-
return _hashTypedDataV4(structHash);
186-
}
187-
188181
function getDomainSeparator() public view returns (bytes32) {
189182
return _domainSeparatorV4();
190183
}
@@ -228,7 +221,6 @@ contract MetadataSignatureFixturesTest is Test {
228221
testPieceIds[1] = 3;
229222
testPieceIds[2] = 5;
230223
bytes memory scheduleRemovalsSig = generateSchedulePieceRemovalsSignature(testPieceIds);
231-
bytes memory deleteDataSetSig = generateDeleteDataSetSignature();
232224

233225
// Get all digests
234226
bytes32 createDataSetDigest =
@@ -237,7 +229,6 @@ contract MetadataSignatureFixturesTest is Test {
237229
bytes32 addPiecesDigest =
238230
testContract.getAddPiecesDigest(CLIENT_DATA_SET_ID, FIRST_ADDED, pieceCidsArray, pieceKeys, pieceValues);
239231
bytes32 scheduleRemovalsDigest = testContract.getSchedulePieceRemovalsDigest(CLIENT_DATA_SET_ID, testPieceIds);
240-
bytes32 deleteDataSetDigest = testContract.getDeleteDataSetDigest(CLIENT_DATA_SET_ID);
241232

242233
// Output JavaScript format for copying to synapse-sdk tests
243234
console.log("Copy this JavaScript const to synapse-sdk src/test/pdp-auth.test.ts:");
@@ -283,11 +274,6 @@ contract MetadataSignatureFixturesTest is Test {
283274
console.log(" digest: '%s',", vm.toString(scheduleRemovalsDigest));
284275
console.log(" clientDataSetId: %d,", CLIENT_DATA_SET_ID);
285276
console.log(" pieceIds: [%d, %d, %d]", testPieceIds[0], testPieceIds[1], testPieceIds[2]);
286-
console.log(" },");
287-
console.log(" deleteDataSet: {");
288-
console.log(" signature: '%s',", vm.toString(deleteDataSetSig));
289-
console.log(" digest: '%s',", vm.toString(deleteDataSetDigest));
290-
console.log(" clientDataSetId: %d", CLIENT_DATA_SET_ID);
291277
console.log(" }");
292278
console.log(" }");
293279
console.log("}");
@@ -329,10 +315,6 @@ contract MetadataSignatureFixturesTest is Test {
329315
console.log(" %d,", testPieceIds[1]);
330316
console.log(" %d", testPieceIds[2]);
331317
console.log(" ]");
332-
console.log(" },");
333-
console.log(" \"deleteDataSet\": {");
334-
console.log(" \"signature\": \"%s\",", vm.toString(deleteDataSetSig));
335-
console.log(" \"clientDataSetId\": %d", CLIENT_DATA_SET_ID);
336318
console.log(" }");
337319
console.log("}");
338320

@@ -410,9 +392,6 @@ contract MetadataSignatureFixturesTest is Test {
410392
console.log(" SchedulePieceRemovals: [");
411393
console.log(" { name: 'clientDataSetId', type: 'uint256' },");
412394
console.log(" { name: 'pieceIds', type: 'uint256[]' }");
413-
console.log(" ],");
414-
console.log(" DeleteDataSet: [");
415-
console.log(" { name: 'clientDataSetId', type: 'uint256' }");
416395
console.log(" ]");
417396
}
418397

@@ -474,12 +453,6 @@ contract MetadataSignatureFixturesTest is Test {
474453
return abi.encodePacked(r, s, v);
475454
}
476455

477-
function generateDeleteDataSetSignature() internal view returns (bytes memory) {
478-
bytes32 digest = testContract.getDeleteDataSetDigest(CLIENT_DATA_SET_ID);
479-
(uint8 v, bytes32 r, bytes32 s) = vm.sign(TEST_PRIVATE_KEY, digest);
480-
return abi.encodePacked(r, s, v);
481-
}
482-
483456
// External signature validation functions
484457
function testCreateDataSetSignature(string memory json, address signer) internal view {
485458
string memory signature = vm.parseJsonString(json, ".createDataSet.signature");

0 commit comments

Comments
 (0)