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
4 changes: 2 additions & 2 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ export default function Home() {

{currentStep === 'ledger' && validationData && (
<HardwareSigning
domainHash={validationData.expected.domainAndMessageHashes?.domainHash || ''}
messageHash={validationData.expected.domainAndMessageHashes?.messageHash || ''}
domainHash={validationData.expected.domainAndMessageHashes.domainHash}
messageHash={validationData.expected.domainAndMessageHashes.messageHash}
ledgerAccount={validationData.ledgerId}
safeTxTypedData={validationData.actual.safeTxTypedData}
onSigningComplete={handleSigningComplete}
Expand Down
16 changes: 1 addition & 15 deletions src/components/ValidationResults.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,6 @@ export const ValidationResults: React.FC<ValidationResultsProps> = ({

const matchStatus = evaluation?.matchStatus;
const descriptionContent = evaluation?.description;
const hashes = validationResult.expected.domainAndMessageHashes;
const canSign = Boolean(hashes?.domainHash && hashes?.messageHash);
const showEntryDetails = !(taskOriginDisabled && currentEntry?.kind === 'taskOrigin');

const handleNext = () => {
Expand Down Expand Up @@ -403,19 +401,7 @@ export const ValidationResults: React.FC<ValidationResultsProps> = ({
</p>
)}

{!blockingErrorsExist && !canSign && (
<div className="rounded-lg border border-yellow-200 bg-yellow-50 p-4 max-w-lg w-full mb-6">
<p className="mb-1 text-sm font-bold text-yellow-800 flex items-center gap-1">
<AlertTriangle size={16} /> Signing Not Available
</p>
<p className="text-sm text-yellow-700 text-left">
Domain and message hashes are required for signing but were not generated during
validation.
</p>
</div>
)}

{!blockingErrorsExist && canSign && (
{!blockingErrorsExist && (
<div className="w-full flex justify-center">
<Button
onClick={() => onProceedToLedgerSigning(validationResult)}
Expand Down
32 changes: 32 additions & 0 deletions src/lib/__tests__/validation-results-utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const VAL_A = hash('a');
const VAL_B = hash('b');
const VAL_C = hash('c');
const FIELD = 'ETH Balance (wei)';
const SIGNING_HASHES = { address: ADDR_A, domainHash: VAL_A, messageHash: VAL_B };

const override = (key: string, value: string): Override => ({
key,
Expand Down Expand Up @@ -65,11 +66,13 @@ const validation = (
): ValidationData => ({
ledgerId: 0,
expected: {
domainAndMessageHashes: SIGNING_HASHES,
stateOverrides: expected.stateOverrides ?? [],
stateChanges: expected.stateChanges ?? [],
balanceChanges: expected.balanceChanges ?? [],
},
actual: {
domainAndMessageHashes: actual.domainAndMessageHashes,
stateOverrides: actual.stateOverrides ?? [],
stateChanges: actual.stateChanges ?? [],
balanceChanges: actual.balanceChanges ?? [],
Expand All @@ -82,6 +85,35 @@ const matching = {
balanceChanges: [balanceOf(ADDR_A, VAL_A, VAL_B)],
};

describe('signing comparison', () => {
it('matches EIP-712 signing data without blocking when hashes match', () => {
const items = buildValidationItems(validation({}, { domainAndMessageHashes: SIGNING_HASHES }));
const dataToSign = `0x1901${'a'.repeat(64)}${'b'.repeat(64)}`;

expect(items.signing).toHaveLength(1);
const evaluation = evaluateValidationEntry({ kind: 'signing', index: 0 }, items);
expect(evaluation.cards.expected.afterValue).toBe(dataToSign);
expect(evaluation.cards.actual.afterValue).toBe(dataToSign);
expect(evaluation.matchStatus.status).toBe('match');
expect(hasBlockingErrors(items)).toBe(false);
});

it('mismatches and blocks signing when hashes differ', () => {
const items = buildValidationItems(
validation({}, { domainAndMessageHashes: { ...SIGNING_HASHES, messageHash: VAL_C } })
);
const evaluation = evaluateValidationEntry({ kind: 'signing', index: 0 }, items);

expect(evaluation.cards.actual.afterValue).toBe(`0x1901${'a'.repeat(64)}${'c'.repeat(64)}`);
expect(evaluation.matchStatus.status).toBe('mismatch');
expect(hasBlockingErrors(items)).toBe(true);
});

it('omits signing items when actual hashes are absent', () => {
expect(buildValidationItems(validation({}, {})).signing).toEqual([]);
});
});

describe('state-diff comparison pairing', () => {
it('does not block when actual matches expected', () => {
expect(hasBlockingErrors(buildValidationItems(validation(matching, matching)))).toBe(false);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/types/comparison.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export interface SigningDataComparison {
messageHash: string;
description?: string;
};
actual?: {
actual: {
dataToSign: string;
address: string;
domainHash: string;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/types/validation-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export interface ValidationData {
stateOverrides: StateOverride[];
stateChanges: StateChange[];
balanceChanges?: BalanceChange[];
domainAndMessageHashes?: ExpectedHashes;
domainAndMessageHashes: ExpectedHashes;
};
actual: {
stateOverrides: StateOverride[];
Expand Down
16 changes: 7 additions & 9 deletions src/lib/validation-results-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ const buildSigningComparisons = (
const expectedHashes = validationResult.expected.domainAndMessageHashes;
const actualHashes = validationResult.actual.domainAndMessageHashes;

if (!expectedHashes || !actualHashes) return [];
if (!actualHashes) return [];

const expectedDataToSign = `0x1901${expectedHashes.domainHash.replace(
'0x',
Expand Down Expand Up @@ -431,7 +431,7 @@ export const hasBlockingErrors = (items: ValidationItemsByStep): boolean => {
if (taskOriginFailed) return true;

const signingMismatch = items.signing.some(
signing => !signing.actual || signing.expected.dataToSign !== signing.actual.dataToSign
signing => signing.expected.dataToSign !== signing.actual.dataToSign
);
if (signingMismatch) return true;

Expand Down Expand Up @@ -594,13 +594,11 @@ export const evaluateValidationEntry = (
case 'signing': {
const item = items.signing[entry.index]!;
const expectedData = item.expected.dataToSign;
const actualData = item.actual?.dataToSign ?? NOT_FOUND_TEXT;
const match = item.actual ? expectedData === item.actual.dataToSign : false;
const matchStatus: ValidationMatchStatus = item.actual
? match
? createMatchStatus('match', 'Match - EIP-712 data matches expected')
: createMatchStatus('mismatch', 'Mismatch - EIP-712 data does not match expected')
: createMatchStatus('missing', 'Missing - Not found in actual results');
const actualData = item.actual.dataToSign;
const match = expectedData === actualData;
const matchStatus: ValidationMatchStatus = match
? createMatchStatus('match', 'Match - EIP-712 data matches expected')
: createMatchStatus('mismatch', 'Mismatch - EIP-712 data does not match expected');

const description = describeDeclared(item.expected);

Expand Down
2 changes: 1 addition & 1 deletion src/lib/validation-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function getExpectedData(parsedConfig: TaskConfig): {
stateOverrides: StateOverride[];
stateChanges: StateChange[];
balanceChanges: BalanceChange[];
domainAndMessageHashes?: ExpectedHashes;
domainAndMessageHashes: ExpectedHashes;
} {
return {
stateOverrides: parsedConfig.stateOverrides,
Expand Down
Loading