Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export type NativeTokenStreamPermission = Permission & {
data: {
initialAmount?: bigint;
amountPerSecond: bigint;
startTime: number;
startTime?: number;
maxAmount?: number;
justification: string;
};
Expand Down Expand Up @@ -392,10 +392,6 @@ function formatNativeTokenStreamPermission(
permission.data.justification,
'Invalid parameters: justification is required',
);
assertIsDefined(
permission.data.startTime,
'Invalid parameters: startTime is required',
);

const isInitialAmountSpecified =
permission.data.initialAmount !== undefined &&
Expand All @@ -405,13 +401,20 @@ function formatNativeTokenStreamPermission(
permission.data.maxAmount !== undefined &&
permission.data.maxAmount !== null;

const isStartTimeSpecified =
permission.data.startTime !== undefined &&
permission.data.startTime !== null;

const optionalFields = {
...(isInitialAmountSpecified && {
initialAmount: toHexOrThrow(permission.data.initialAmount),
}),
...(isMaxAmountSpecified && {
maxAmount: toHexOrThrow(permission.data.maxAmount),
}),
...(isStartTimeSpecified && {
startTime: Number(permission.data.startTime),
}),
};

return {
Expand All @@ -421,7 +424,6 @@ function formatNativeTokenStreamPermission(
permission.data.amountPerSecond,
'Invalid parameters: amountPerSecond is required',
),
startTime: Number(permission.data.startTime),
justification: permission.data.justification,
...optionalFields,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,31 +137,6 @@ describe('erc7715GrantPermissionsAction', () => {
).rejects.toThrow('Invalid parameters: amountPerSecond is required');
});

it('should throw an error when startTime is undefined', async () => {
const parameters = [
{
chainId: 31337,
address: bob.address,
expiry: 1234567890,
permission: {
type: 'native-token-stream',
data: {
amountPerSecond: '0x1',
maxAmount: '0x2',
startTime: undefined,
justification: 'Test justification',
},
},
isAdjustmentAllowed: false,
signer: { type: 'account', data: { address: alice.address } },
},
];

await expect(
erc7715GrantPermissionsAction(mockClient, parameters),
).rejects.toThrow('Invalid parameters: startTime is required');
});

it('should throw an error when justification is undefined', async () => {
const parameters = [
{
Expand Down
Loading