refactor: unify PDA AccountId construction via AccountId::for_{public,private}_pda

Browse Source

Addresses the following review comment:

- "I think this should be a constructor `AccountId::for_private_pda`.
  Consider also removing the existing `impl From<(ProgramId, Seed)> for
  AccountId` for public pdas in favor of a `AccountId::for_public_pda`
  to have a unified way of constructing pdas"

I replaced `impl From<(&ProgramId, &PdaSeed)> for AccountId` with
`AccountId::for_public_pda(program_id: &ProgramId, seed: &PdaSeed) ->
Self` and replaced the free function `private_pda_account_id(...)`
with `AccountId::for_private_pda(program_id: &ProgramId, seed:
&PdaSeed, npk: &NullifierPublicKey) -> Self`. Both live in an inherent
`impl AccountId` block in nssa/core/src/program.rs next to the PDA
derivation logic. Migrated all call sites across nssa/core,
nssa/src/state.rs, nssa/src/validated_state_diff.rs,
program_methods/guest/src/bin/privacy_preserving_circuit.rs,
programs/amm/core, programs/associated_token_account/core, the example
tail-call binary, and the ATA tutorial doc. Test function names that
referenced the old free function were also renamed
(private_pda_account_id_* to for_private_pda_*).

...

This commit is contained in:

Moudy

2026-04-21 12:35:19 +02:00

parent 68d43d7f2b

commit 0183eac5cc

43 changed files with 110 additions and 100 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

artifacts/test_program_methods/auth_asserting_noop.bin

BIN

Binary file not shown.

artifacts/test_program_methods/burner.bin

BIN

Binary file not shown.

artifacts/test_program_methods/chain_caller.bin

BIN

Binary file not shown.

artifacts/test_program_methods/changer_claimer.bin

BIN

Binary file not shown.

artifacts/test_program_methods/claimer.bin

BIN

Binary file not shown.

artifacts/test_program_methods/clock_chain_caller.bin

BIN

Binary file not shown.

artifacts/test_program_methods/data_changer.bin

BIN

Binary file not shown.

artifacts/test_program_methods/extra_output.bin

BIN

Binary file not shown.

artifacts/test_program_methods/flash_swap_callback.bin

BIN

Binary file not shown.

artifacts/test_program_methods/flash_swap_initiator.bin

BIN

Binary file not shown.

artifacts/test_program_methods/malicious_authorization_changer.bin

BIN

Binary file not shown.

artifacts/test_program_methods/malicious_caller_program_id.bin

BIN

Binary file not shown.

artifacts/test_program_methods/malicious_self_program_id.bin

BIN

Binary file not shown.

artifacts/test_program_methods/minter.bin

BIN

Binary file not shown.

artifacts/test_program_methods/missing_output.bin

BIN

Binary file not shown.

artifacts/test_program_methods/modified_transfer.bin

BIN

Binary file not shown.

artifacts/test_program_methods/nonce_changer.bin

BIN

Binary file not shown.

artifacts/test_program_methods/noop.bin

BIN

Binary file not shown.

artifacts/test_program_methods/pda_claimer.bin

BIN

Binary file not shown.

artifacts/test_program_methods/pinata_cooldown.bin

BIN

Binary file not shown.

artifacts/test_program_methods/private_pda_delegator.bin

BIN

Binary file not shown.

artifacts/test_program_methods/program_owner_changer.bin

BIN

Binary file not shown.

artifacts/test_program_methods/simple_balance_transfer.bin

BIN

Binary file not shown.

artifacts/test_program_methods/time_locked_transfer.bin

BIN

Binary file not shown.

artifacts/test_program_methods/two_pda_claimer.bin

BIN

Binary file not shown.

artifacts/test_program_methods/validity_window.bin

BIN

Binary file not shown.

artifacts/test_program_methods/validity_window_chain_caller.bin

BIN

Binary file not shown.