Skip to content

Commit 237e1e1

Browse files
committed
fix #693
1 parent 0259413 commit 237e1e1

4 files changed

Lines changed: 7 additions & 28 deletions

File tree

docs/src/content/docs/developer-guides/session-keys.mdx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ The SessionKeyRegistry stores arbitrary `bytes32` hashes as permissions and is a
2727
| `CreateDataSetPermission` | Create new datasets |
2828
| `AddPiecesPermission` | Add pieces to datasets |
2929
| `SchedulePieceRemovalsPermission` | Schedule piece removals |
30-
| `DeleteDataSetPermission` | Delete datasets |
3130

3231
These are the constants currently supported by FWSS. The `Permission` type also accepts any `Hex` value, allowing registration of custom permission hashes for non-FWSS operations (e.g., authenticated Curio HTTP endpoints).
3332

packages/synapse-core/src/session-key/permissions.ts

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { EIP712Types } from '../typed-data/type-definitions.ts'
77
export type CreateDataSetPermission = Tagged<Hex, 'CreateDataSetPermission'>
88
export type AddPiecesPermission = Tagged<Hex, 'AddPiecesPermission'>
99
export type SchedulePieceRemovalsPermission = Tagged<Hex, 'SchedulePieceRemovalsPermission'>
10-
export type DeleteDataSetPermission = Tagged<Hex, 'DeleteDataSetPermission'>
1110

1211
function typeHash(type: TypedData.encodeType.Value) {
1312
return keccak256(stringToHex(TypedData.encodeType(type)))
@@ -28,24 +27,9 @@ export const SchedulePieceRemovalsPermission = typeHash({
2827
primaryType: 'SchedulePieceRemovals',
2928
}) as SchedulePieceRemovalsPermission
3029

31-
export const DeleteDataSetPermission = typeHash({
32-
types: EIP712Types,
33-
primaryType: 'DeleteDataSet',
34-
}) as DeleteDataSetPermission
35-
36-
export const DefaultFwssPermissions = [
37-
CreateDataSetPermission,
38-
AddPiecesPermission,
39-
SchedulePieceRemovalsPermission,
40-
DeleteDataSetPermission,
41-
]
42-
43-
export type Permission =
44-
| CreateDataSetPermission
45-
| AddPiecesPermission
46-
| SchedulePieceRemovalsPermission
47-
| DeleteDataSetPermission
48-
| Hex
30+
export const DefaultFwssPermissions = [CreateDataSetPermission, AddPiecesPermission, SchedulePieceRemovalsPermission]
31+
32+
export type Permission = CreateDataSetPermission | AddPiecesPermission | SchedulePieceRemovalsPermission | Hex
4933

5034
export type Expirations = {
5135
[key in Permission]: bigint
@@ -55,5 +39,4 @@ export const DefaultEmptyExpirations: Expirations = {
5539
[CreateDataSetPermission]: 0n,
5640
[AddPiecesPermission]: 0n,
5741
[SchedulePieceRemovalsPermission]: 0n,
58-
[DeleteDataSetPermission]: 0n,
5942
}

packages/synapse-core/src/typed-data/type-definitions.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ export const EIP712Types = {
2828
{ name: 'clientDataSetId', type: 'uint256' },
2929
{ name: 'pieceIds', type: 'uint256[]' },
3030
],
31-
DeleteDataSet: [{ name: 'clientDataSetId', type: 'uint256' }],
32-
3331
/**
3432
* ERC-2612: Permit Extension for EIP-20 Signed Approvals
3533
* @see https://eips.ethereum.org/EIPS/eip-2612

packages/synapse-core/test/authorization-expiry.test.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { authorizationExpiry, authorizationExpiryCall } from '../src/session-key
77
import {
88
AddPiecesPermission,
99
CreateDataSetPermission,
10-
DeleteDataSetPermission,
1110
SchedulePieceRemovalsPermission,
1211
} from '../src/session-key/permissions.ts'
1312

@@ -76,7 +75,7 @@ describe('authorizationExpiry', () => {
7675
chain: calibration,
7776
address: '0x1234567890123456789012345678901234567890',
7877
sessionKeyAddress: '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd',
79-
permission: DeleteDataSetPermission,
78+
permission: SchedulePieceRemovalsPermission,
8079
})
8180

8281
assert.ok(typeof call.args[2] === 'string')
@@ -159,14 +158,14 @@ describe('authorizationExpiry', () => {
159158
permission: SchedulePieceRemovalsPermission,
160159
})
161160

162-
const expiryDelete = await authorizationExpiry(client, {
161+
const expiryCreate = await authorizationExpiry(client, {
163162
address: '0x1234567890123456789012345678901234567890',
164163
sessionKeyAddress: '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd',
165-
permission: DeleteDataSetPermission,
164+
permission: CreateDataSetPermission,
166165
})
167166

168167
assert.equal(expirySchedule, expiry1)
169-
assert.equal(expiryDelete, expiry2)
168+
assert.equal(expiryCreate, expiry2)
170169
})
171170

172171
it('should return 0 when authorization does not exist', async () => {

0 commit comments

Comments
 (0)