Storage subset merkle tree onchain #21
Conversation
docongminh
changed the title
| pub struct DistributeVault<'info> { | ||
| /// The [ParentState]. | ||
| #[account(has_one = admin)] | ||
| pub parent_account: AccountLoader<'info, ParentAccount>, |
|
|
||
| /// Accounts required for distributing tokens from the parent vault to distributor vaults. | ||
| #[derive(Accounts)] | ||
| pub struct DistributeVault<'info> { |
There was a problem hiding this comment.
FundMerkleDisitributorFromRoot
| #[derive(Accounts)] | ||
| pub struct DistributeVault<'info> { | ||
| /// The [ParentState]. | ||
| #[account(has_one = admin)] |
| pub parent_vault: Account<'info, TokenAccount>, | ||
|
|
||
| /// Admin | ||
| pub admin: Signer<'info>, |
| // [distributor_vault, distributor, distributor_vault, distributor] | ||
| let remaining_accounts: &[AccountInfo] = ctx.remaining_accounts; | ||
| // Ensure valid layout. | ||
| if remaining_accounts.len() % 2 != 0 { |
There was a problem hiding this comment.
no need remaninings accounts here
| ); | ||
|
|
||
| // Check distributor has been funded token | ||
| if distributor_vault.amount >= distributor_state.max_total_claim { |
There was a problem hiding this comment.
distributor_state.funded_amount
| pub struct NewDistributorParams { | ||
| pub version: u64, | ||
| pub root: [u8; 32], | ||
| pub total_nodes: u8, | ||
| pub depth: u8, | ||
| pub nodes: Vec<[u8; 32]>, |
| pub struct NewDistributorParams { | ||
| pub version: u64, | ||
| pub root: [u8; 32], | ||
| pub total_nodes: u8, | ||
| pub depth: u8, |
| @@ -127,6 +132,19 @@ pub struct NewDistributor<'info> { | |||
| )] | |||
| pub distributor: AccountLoader<'info, MerkleDistributor>, | |||
There was a problem hiding this comment.
use init_if_needed for token_vault
| payer = admin | ||
| )] | ||
| pub partial_merkle_tree: Account<'info, PartialMerkleTree>, | ||
|
|
||
| /// Base key of the distributor. | ||
| pub base: Signer<'info>, |
There was a problem hiding this comment.
use admin as unchecked_account, and payer to pay for rent
| space = PartialMerkleTree::space(total_node as usize), | ||
| payer = admin | ||
| )] | ||
| pub partial_merkle_tree: Account<'info, PartialMerkleTree>, |
There was a problem hiding this comment.
save nodes in distributor state
There was a problem hiding this comment.
Because AccountLoader does not support storing a dynamic Vec directly. So, create CanopyTree to storage metadata (root, nodes, depth..) of MerkleDistributor
| @@ -30,6 +34,7 @@ pub struct NewDistributorParams { | |||
| pub claim_type: u8, | |||
| pub operator: Pubkey, | |||
| pub locker: Pubkey, | |||
| pub parent_account: Pubkey, | |||
There was a problem hiding this comment.
parent should be pda of base + mint
| init, | ||
| seeds = [ | ||
| b"ParentAccount".as_ref(), | ||
| mint.key().to_bytes().as_ref(), |
| /// Parent vault | ||
| /// Should create previously | ||
| #[account( | ||
| associated_token::mint = mint, |
| pub system_program: Program<'info, System>, | ||
| } | ||
|
|
||
| pub fn handle_new_parent_account(ctx: Context<NewParentAccount>) -> Result<()> { |
| use anchor_spl::token::{Mint, TokenAccount}; | ||
|
|
||
| #[derive(Accounts)] | ||
| pub struct NewParentAccount<'info> { |
There was a problem hiding this comment.
add a function to transfer fund to parent account
There was a problem hiding this comment.
done with FundDistributorRoot
| let mut parent_account = ctx.accounts.parent_account.load_init()?; | ||
|
|
||
| parent_account.bump = *ctx.bumps.get("parent_account").unwrap(); | ||
| parent_account.admin = ctx.accounts.admin.key(); |
| partial_merkle_tree.depth, | ||
| initial_index, | ||
| proof, | ||
| partial_merkle_tree.nodes.clone(), |
There was a problem hiding this comment.
should use &partial_merkle_tree.nodes.clone()
| /// Token Address of parent vault | ||
| pub parent_vault: Pubkey, | ||
| /// Padding | ||
| pub padding: u64, |
Flow for storage a part of proof onchain:
Note:
I quickly tested the NewClaimAndStake transaction locally using:
The resulting transaction size was 661 bytes. That means we have about 571 bytes of remaining space, which should accommodate roughly 17 proofs for this transaction in this case.