Skip to content

fix(dev_snp): Support pipeline flows for SNP verification #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PeterFarber wants to merge 2 commits into
base: edge
Choose a base branch
from
+26 −4
Open

fix(dev_snp): Support pipeline flows for SNP verification #623

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2406f55
fix: check for unsigned report
PeterFarber Jan 30, 2026
762e703
fix: try to use m1 to find report
PeterFarber Jan 30, 2026
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
30 changes: 26 additions & 4 deletions src/dev_snp.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,17 @@
verify(M1, M2, NodeOpts) ->
?event(snp_verify, verify_called),
maybe
% In pipeline flows (e.g., /~relay@1.0/call/verify~snp@1.0), the report
% comes from M1 (result of previous stage). For direct calls, it may be
% in M2. Try M1 first, then fall back to M2.
{ok, {Msg, Address, NodeMsgID, ReportJSON, MsgWithJSONReport}}
?= extract_and_normalize_message(M2, NodeOpts),
?= case extract_and_normalize_message(M1, NodeOpts) of
{ok, Result} -> {ok, Result};
{error, {report_not_found, _}} ->
?event(snp_verify, {report_not_in_m1_trying_m2}),
extract_and_normalize_message(M2, NodeOpts);
{error, ExtractReason} -> {error, ExtractReason}
end,
% Perform all validation steps
{ok, NonceResult} ?= verify_nonce(Address, NodeMsgID, Msg, NodeOpts),
{ok, SigResult} ?=
Expand Down Expand Up @@ -216,9 +225,22 @@ extract_and_normalize_message(M2, NodeOpts) ->
)
),
?event({msg_with_json_report, {explicit, MsgWithJSONReport}}),
% Normalize the request message
ReportJSON = hb_ao:get(<<"report">>, MsgWithJSONReport, NodeOpts),
Report = hb_json:decode(ReportJSON),
% Normalize the request message. First try to get the report from the
% committed message. If not found (e.g., message not signed), fall back
% to the raw message.
ReportJSON = case hb_ao:get(<<"report">>, MsgWithJSONReport, NodeOpts) of
not_found ->
?event({report_not_in_committed, falling_back_to_raw}),
hb_ao:get(<<"report">>, RawMsg, NodeOpts);
Found -> Found
end,
{ok, ValidReportJSON} ?= case ReportJSON of
not_found ->
?event({report_not_found, {m2, M2}, {raw_msg, RawMsg}}),
{error, {report_not_found, <<"No 'report' key found in message">>}};
_ -> {ok, ReportJSON}
end,
Report = hb_json:decode(ValidReportJSON),
Msg =
maps:merge(
maps:without([<<"report">>], MsgWithJSONReport),
Expand Down