refactor: utxo to compressed account #544

ananas-block · 2024-03-20T21:40:32Z

Changes:

replaced utxo with compressed account both in variables and comments
refactored tlv
commented serialized utxos and optimized instruction

SwenSchaeferjohann

found some nits. not urgent but sharing for visibility regardless

SwenSchaeferjohann · 2024-03-22T04:12:41Z

js/stateless.js/src/idls/psp_compressed_pda.ts

              };
            };
          },
          {
-            name: 'outUtxos';
+            name: 'outputAccountHashes';


inconsistency w input equivalent,

outputAccountHashes -> outputCompressedAccountHashes

SwenSchaeferjohann · 2024-03-22T04:34:05Z

js/stateless.js/src/idls/psp_compressed_pda.ts

-            type: {
-              vec: 'u64';
-            };
+            name: 'indexMtAccount';


nit (consistency) elsewhere a similar value is used in outputStateMerkleTreeAccountIndices

SwenSchaeferjohann · 2024-03-24T19:36:19Z

programs/compressed-pda/src/instructions.rs

-    pub tlv_data: TlvDataElement,
-}
-
-// TODO: parse utxos a more efficient way, since owner is sent multiple times this way
 #[derive(Debug)]
 #[account]


the struct InstructionDataTransfer is now used by the cpiSignatureAccount, so tagging it as anchor account breaks the IDL.
instead, we can tag it as regular type with AnchorDeserialize,also allows us to not have to prepend 8 bytes when deserializing and can use ::deserialize instead of try_deserialize_unchecked()

SwenSchaeferjohann · 2024-03-24T19:45:04Z

programs/compressed-token/src/process_transfer.rs

@@ -243,19 +241,20 @@ pub struct TransferInstruction<'info> {
    pub self_program: Program<'info, crate::program::PspCompressedToken>,
 }

-// TODO: parse utxos a more efficient way, since owner is sent multiple times this way
+// TODO: parse compressed_accounts a more efficient way, since owner is sent multiple times this way
 // This struct is equivalent to the InstructionDataTransfer, but uses the imported types from the psp_compressed_pda
 #[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize)]
 pub struct InstructionDataTransfer {


if we give this struct the same name as in compress-pda, we break the IDL.
(previously it just didn't break because compressed-pda was defining its InstructionDataTransfer struct as account not as type)
In my feature branch, I've temporarily renamed this to CompressedTokenInstructionDataTransfer in order to fix the IDL. there's probably a better name for it tho.

programs/compressed-pda/src/compressed_account.rs

SwenSchaeferjohann

left some more comments on what i found while working on #548 re: fixing IDL

SwenSchaeferjohann · 2024-03-26T02:17:16Z

programs/compressed-token/src/process_transfer.rs

 }

 #[derive(Clone, Copy, Debug, PartialEq, Eq, AnchorSerialize, AnchorDeserialize)]
-pub struct TokenTransferOutUtxo {
+pub struct TokenTransferOutputData {


TokenTransferOutputData still has index_mt_account so we're currently sending the same data to the chain twice. once as part of the TokenTransferOutputData and once in the output_state_merkle_tree_account_indices of the InstructionDataTransfer of compressed-token in line 487

SwenSchaeferjohann · 2024-03-26T02:33:06Z

programs/compressed-pda/src/event.rs

+    pub input_compressed_accounts: Vec<CompressedAccountWithMerkleContext>,
+    pub output_compressed_accounts: Vec<CompressedAccount>,
+    // index of Merkle tree account in remaining accounts
+    pub output_state_merkle_tree_account_indices: Vec<u8>,


for these to be fully useful in the mock-rpc (i.e. client/mock-rpc doesn't have to fetch additional data) we'd also have to emit the output_nullifier_queue_indices
and put them into the pubkey_array... but onchain doesn't have access to that data AFAIK since its only needed for spending accounts. instead of finding a workaround for this we should prolly make the PublicTransactionEvent smaller again, not emit the output_queues, and not emit any of the redundant info at all either and just implement a few additional steps in the test-rpc. cc @ananas-block

* fix: enabled group access control, added more tests * Update programs/compressed-pda/src/compressed_account.rs Co-authored-by: Swen Schäferjohann <[email protected]> * Update programs/account-compression/src/instructions/insert_into_indexed_array.rs Co-authored-by: Swen Schäferjohann <[email protected]> --------- Co-authored-by: Swen Schäferjohann <[email protected]>

* fix: enabled group access control, added more tests * feat: add address checks and insert logic * removed prints

SwenSchaeferjohann · 2024-03-27T21:25:13Z

programs/compressed-pda/src/compressed_account.rs

+    pub index_merkle_tree_account: u8,
+    pub index_nullifier_array_account: u8,


@ananas-block should we just clean up the api now? i.e. merkle_tree_account_index and nullifier_array_account_index
such that the naming is consistent with _index suffix in leaf_index.

(and more consistent with use of nullifier queue elsewhere would be to do
nullifier_queue_account_index)

SwenSchaeferjohann · 2024-03-27T21:43:44Z

programs/compressed-pda/src/event.rs

    pub relay_fee: Option<u64>,
+    pub de_compress_amount: Option<u64>,


@ananas-block do we want to add the is_compress: bool now?

ananas-block force-pushed the jorrit/refactor-utxo branch from 2b30c90 to 5f68101 Compare March 20, 2024 21:48

SwenSchaeferjohann approved these changes Mar 22, 2024

View reviewed changes

SwenSchaeferjohann reviewed Mar 22, 2024

View reviewed changes

SwenSchaeferjohann force-pushed the jorrit/refactor-utxo branch 2 times, most recently from f0f35b1 to 5f68101 Compare March 22, 2024 22:55

SwenSchaeferjohann reviewed Mar 24, 2024

View reviewed changes

programs/compressed-pda/src/compressed_account.rs Show resolved Hide resolved

SwenSchaeferjohann reviewed Mar 24, 2024

View reviewed changes

SwenSchaeferjohann reviewed Mar 26, 2024

View reviewed changes

ananas-block force-pushed the jorrit/refactor-utxo branch from 9fd61ce to d691e58 Compare March 27, 2024 14:20

ananas-block marked this pull request as ready for review March 27, 2024 18:00

ananas-block requested review from vadorovsky and sergeytimoshin as code owners March 27, 2024 18:00

ananas-block and others added 6 commits March 27, 2024 18:06

refactor: utxo to compressed account

fc876c4

fixed comments

a8ee4a1

feat: pda skeleton (#556)

abdfca8

* fix: enabled group access control, added more tests * feat: add address checks and insert logic * removed prints

fixed compile issue

b8ca93b

chore: test js refactor (#560)

8347826

ananas-block force-pushed the jorrit/refactor-utxo branch from 0d00e28 to 8347826 Compare March 27, 2024 18:07

fixed clippy

4d5a662

ananas-block force-pushed the jorrit/refactor-utxo branch from 2cb969c to fa66793 Compare March 27, 2024 21:09

commented ignored address merkle tree test

03f10ad

ananas-block force-pushed the jorrit/refactor-utxo branch from fa66793 to 03f10ad Compare March 27, 2024 21:21

SwenSchaeferjohann reviewed Mar 27, 2024

View reviewed changes

fixed naming inconsistencies

be243f0

ananas-block merged commit 31ea106 into main Mar 28, 2024
6 checks passed

ananas-block deleted the jorrit/refactor-utxo branch March 28, 2024 00:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: utxo to compressed account #544

refactor: utxo to compressed account #544

ananas-block commented Mar 20, 2024 •

edited

Loading

SwenSchaeferjohann left a comment

SwenSchaeferjohann Mar 22, 2024

SwenSchaeferjohann Mar 22, 2024 •

edited

Loading

SwenSchaeferjohann Mar 24, 2024

SwenSchaeferjohann Mar 24, 2024

SwenSchaeferjohann left a comment

SwenSchaeferjohann Mar 26, 2024

ananas-block Mar 27, 2024

SwenSchaeferjohann Mar 26, 2024

SwenSchaeferjohann Mar 27, 2024 •

edited

Loading

ananas-block Mar 27, 2024

SwenSchaeferjohann Mar 27, 2024

		pub index_merkle_tree_account: u8,
		pub index_nullifier_array_account: u8,

		pub relay_fee: Option<u64>,
		pub de_compress_amount: Option<u64>,

refactor: utxo to compressed account #544

refactor: utxo to compressed account #544

Conversation

ananas-block commented Mar 20, 2024 • edited Loading

SwenSchaeferjohann left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SwenSchaeferjohann Mar 22, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SwenSchaeferjohann left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SwenSchaeferjohann Mar 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ananas-block commented Mar 20, 2024 •

edited

Loading

SwenSchaeferjohann Mar 22, 2024 •

edited

Loading

SwenSchaeferjohann Mar 27, 2024 •

edited

Loading