refactor: reorient `CLAIM` note consumption flow by partylikeits1983 · Pull Request #2528 · 0xMiden/protocol

partylikeits1983 · 2026-02-27T22:21:17Z

This PR reorients the flow in which the CLAIM note is consumed.

This PR reorients the flow from:

CLAIM -> aggfaucet -> (FPI call) bridge_in -> P2ID

CLAIM note is consumed by AggFaucet account, which does an FPI call to bridge to verify merkle proof, if valid creates P2ID note

to:

CLAIM -> bridge_in -> MINT -> aggfaucet -> P2ID

CLAIM note is consumed by AggBridge account which verifies the merkle proof, if valid creates a MINT note, which is then consumed by AggFaucet account in separate tx, which creates P2ID note.

This PR adds a mapping to the AggBridge which stores the bytes20 origin token address in the faucet registry as hash(bytes20) -> AccountId.

This is so that when creating the MINT note, the correct network note attachment target can be set. Storing the hash of the destination address as the key in a mapping, where the value is the aggfaucet AccountId is essential, as previously we only stored registered AggFaucets in a mapping like this: AccountId -> bool.

Note: Both the MINT note & P2ID note which created by the consumption of the MINT note, both use the PROOF_DATA_KEY (hash of proof data) as their serial numbers.

Resolves #2506

…ot in DataStore

Fumuran

Looks great, thank you! I left some nits and questions inline.

This is partial review, I only looked through the MASM code (but mostly in a way of code optimization, not the algorithm correctness).

crates/miden-agglayer/asm/agglayer/bridge/bridge_config.masm

crates/miden-agglayer/asm/agglayer/bridge/bridge_in.masm

crates/miden-agglayer/asm/note_scripts/CLAIM.masm

crates/miden-agglayer/asm/note_scripts/CONFIG_AGG_BRIDGE.masm

crates/miden-testing/tests/agglayer/config_bridge.rs

crates/miden-testing/tests/scripts/faucet.rs

Co-authored-by: Andrey Khmuro <[email protected]>

Fumuran

Looks great, thank you! I left just one nit inline.

crates/miden-agglayer/src/config_note.rs

crates/miden-agglayer/asm/agglayer/bridge/bridge_config.masm

crates/miden-agglayer/asm/agglayer/bridge/bridge_in.masm

crates/miden-agglayer/asm/note_scripts/CLAIM.masm

crates/miden-agglayer/asm/agglayer/bridge/bridge_in.masm

crates/miden-agglayer/src/lib.rs

…faucet

* chore: pass faucet ID on stack to verify_claim_amount * chore: pass faucet ID on stack to build_mint_output_note * chore: completely remove CLAIM_FAUCET_ID_PREFIX_MEM_ADDR * chore: drop "y" in verify_u128_to_native_amount_conversion * chore: avoid uplicating y only to drop it later * chore: adjust comments; no longer reading faucetID from mem * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <[email protected]> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <[email protected]> * fix: rename to output & fix copilot suggestion --------- Co-authored-by: Alexander John Lee <[email protected]> Co-authored-by: Copilot Autofix powered by AI <[email protected]> Co-authored-by: riemann <[email protected]>

mmagician

The merge changes look good now 👍🏼

I left a few more questions / open items to investigate, but other than those we should be ready to merge soon.

crates/miden-agglayer/src/bridge.rs

mmagician · 2026-03-16T15:52:49Z

crates/miden-agglayer/asm/agglayer/bridge/bridge_in.masm

+const CLAIM_PROOF_DATA_WORD_LEN = 134
+const CLAIM_LEAF_DATA_WORD_LEN = 8


yes it might need some more thinking, but at least we should not duplicate the constants that refer to the same underlying data, which these do

mmagician · 2026-03-16T15:55:29Z

crates/miden-agglayer/asm/agglayer/bridge/bridge_in.masm

+    # Compute note tag targeting the faucet account
+    loc_load.BUILD_MINT_FAUCET_PREFIX_LOC
+    # => [faucet_prefix, note_type, MINT_RECIPIENT, pad(16)]
+
+    exec.note_tag::create_account_target


I don't understand why this is the case, could you pinpoint why this is needed?
IIUC, this is a tag for the faucet, nothing to do with the P2ID that is created later?
The faucet is a network account, and the consumption of notes should not be determined by tag, but by note attachment.

crates/miden-agglayer/asm/agglayer/bridge/bridge_in.masm

Co-authored-by: Marti <[email protected]>

partylikeits1983 · 2026-03-16T19:52:10Z

Comment #1

yes it might need some more thinking, but at least we should not duplicate the constants that refer to the same underlying data, which these do

Resolved.

Comment #2

I don't understand why this is the case, could you pinpoint why this is needed?
IIUC, this is a tag for the faucet, nothing to do with the P2ID that is created later?
The faucet is a network account, and the consumption of notes should not be determined by tag, but by note attachment.

I set the tag of the MINT note to be the DEFAULT tag, i.e. 0. Resolved in the latest commit.

partylikeits1983 self-assigned this Feb 27, 2026

partylikeits1983 added agglayer PRs or issues related to AggLayer bridging integration pr-from-maintainers PRs that come from internal contributors or integration partners. They should be given priority labels Feb 27, 2026

partylikeits1983 added 5 commits February 28, 2026 01:25

feat: wip CLAIM note flow reorientation

12124d4

wip: build MINT note from aggbridge

79d2cac

wip: created MINT note encodes incorrect public P2ID or public P2ID n…

d951740

…ot in DataStore

feat: working e2e CLAIM flow reordering

ce6e21d

fix: cleanup rm debug.stack

57cfbb5

partylikeits1983 force-pushed the ajl-reorient-claim-note-flow branch from 55ee9fb to 57cfbb5 Compare February 27, 2026 22:25

partylikeits1983 added the no changelog This PR does not require an entry in the `CHANGELOG.md` file label Feb 27, 2026

partylikeits1983 requested review from Fumuran and mmagician February 27, 2026 22:27

partylikeits1983 modified the milestone: v0.14.0 Feb 27, 2026

refactor: improve readability of MINT note memory addresses

c8d1afb

partylikeits1983 marked this pull request as ready for review March 2, 2026 10:46

refactor: fix stack comments

7fd9d76

partylikeits1983 mentioned this pull request Mar 2, 2026

Compute claimed global index chain hash #2516

Open

Fumuran requested changes Mar 2, 2026

View reviewed changes

partylikeits1983 and others added 10 commits March 2, 2026 17:39

fix: rm println statements

8dff792

Update crates/miden-agglayer/asm/agglayer/bridge/bridge_config.masm

2225fe0

Co-authored-by: Andrey Khmuro <[email protected]>

Update crates/miden-agglayer/asm/agglayer/bridge/bridge_config.masm

7588547

Co-authored-by: Andrey Khmuro <[email protected]>

Update crates/miden-agglayer/asm/agglayer/bridge/bridge_config.masm

bd4c3ef

Co-authored-by: Andrey Khmuro <[email protected]>

Update crates/miden-agglayer/asm/agglayer/bridge/bridge_config.masm

7e5d734

Co-authored-by: Andrey Khmuro <[email protected]>

Update crates/miden-agglayer/asm/note_scripts/CLAIM.masm

512df0c

Co-authored-by: Andrey Khmuro <[email protected]>

Update crates/miden-agglayer/asm/agglayer/bridge/bridge_config.masm

74cb97e

Co-authored-by: Andrey Khmuro <[email protected]>

Update crates/miden-agglayer/asm/agglayer/bridge/bridge_config.masm

7f5ba6f

Co-authored-by: Andrey Khmuro <[email protected]>

Update crates/miden-agglayer/asm/agglayer/bridge/bridge_in.masm

a77b9a2

Co-authored-by: Andrey Khmuro <[email protected]>

Update crates/miden-agglayer/asm/agglayer/bridge/bridge_in.masm

6a602df

Co-authored-by: Andrey Khmuro <[email protected]>

partylikeits1983 force-pushed the ajl-reorient-claim-note-flow branch from ee64a9b to 6a602df Compare March 2, 2026 14:51

refactor: add get_scale & get_scale_inner for call vs exec

58c84d6

Fumuran approved these changes Mar 11, 2026

View reviewed changes

crates/miden-agglayer/src/config_note.rs Outdated Show resolved Hide resolved

mmagician requested changes Mar 11, 2026

View reviewed changes

partylikeits1983 added 7 commits March 12, 2026 16:48

refactor: use local memory for TOKEN_ADDR_HASH_PTR

c46c53e

refactor: look up faucet by token address only once during claim

b41c7dd

fix: fix array comment syntax

09dd8d8

refactor: rm pad comments from exec'ed proc

5558907

refactor: rm swapw & replace w padw

93dab0e

fix: update comment

b52096e

refactor: refactor is_token_registered proc

6da3bac

partylikeits1983 requested a review from mmagician March 13, 2026 17:16

chore: more explicit mem constant names

22e5fc3

mmagician reviewed Mar 14, 2026

View reviewed changes

crates/miden-agglayer/asm/agglayer/bridge/bridge_in.masm Outdated Show resolved Hide resolved

fix: explicit pad before FPI call

cfb6211

mmagician force-pushed the ajl-reorient-claim-note-flow branch from 0d19a5e to cfb6211 Compare March 14, 2026 09:27

mmagician mentioned this pull request Mar 14, 2026

chore: opinionated improvements to #2528 #2602

Merged

mmagician requested changes Mar 14, 2026

View reviewed changes

crates/miden-agglayer/src/lib.rs Outdated Show resolved Hide resolved

crates/miden-agglayer/src/lib.rs Outdated Show resolved Hide resolved

crates/miden-agglayer/src/lib.rs Outdated Show resolved Hide resolved

partylikeits1983 and others added 4 commits March 16, 2026 12:46

refactor: remove unused bridge account ID storage slot from AggLayer …

f22e0cd

…faucet

chore: merge latest agglayer into ajl-reorient-claim-note-flow

c416871

refactor: move bridge & faucet code from lib.rs to dedicated modules

2679ca1

partylikeits1983 requested a review from mmagician March 16, 2026 13:40

partylikeits1983 mentioned this pull request Mar 16, 2026

feat: implement CLAIM note nullifier tracking #2610

Open

mmagician reviewed Mar 16, 2026

View reviewed changes

partylikeits1983 enabled auto-merge (squash) March 16, 2026 19:14

partylikeits1983 and others added 3 commits March 16, 2026 22:14

refactor: rm unused error const

ea245c1

Update crates/miden-agglayer/src/bridge.rs

53c6179

Co-authored-by: Marti <[email protected]>

refactor: rm duplicate constant

34fa750

refactor: use default tag for MINT note

faed14a

		const CLAIM_PROOF_DATA_WORD_LEN = 134
		const CLAIM_LEAF_DATA_WORD_LEN = 8

Conversation

partylikeits1983 commented Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Fumuran left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Fumuran left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mmagician left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mmagician Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

mmagician Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

partylikeits1983 commented Mar 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

partylikeits1983 commented Feb 27, 2026 •

edited

Loading