[zk-token-proof] Add CUs to close account instruction #33042
Conversation
| @@ -132,6 +132,11 @@ declare_process_instruction!(process_instruction, 0, |invoke_context| { | |||
|
|
|||
| match instruction { | |||
| ProofInstruction::CloseContextState => { | |||
| if native_programs_consume_cu { | |||
There was a problem hiding this comment.
Why do we need the if native_programs_consume_cu { check at all? Can't we just always consume the CUs?
There was a problem hiding this comment.
Yes, we don't need this check and can just remove it. It was added in long time ago and it was never really removed. The newer instructions that were added in don't have this feature gate check.
I was going to remove this check (hence the title...), but if I remove it here, then some of the CI tests fail due to some proof instructions exceeding compute unit limit. So I thought I would just add the compute units for close instruction in this PR to get that backported quickly and then remove the feature gate in a separate PR. As long as the proof program activation is coordinated with #30620, then I thought this would be okay.
samkim-crypto
changed the title
|
@taozhu-chicago sorry for taking so long to address this 🙏 . This PR adds compute units for an instruction, I also found out why the test is actually not failing even though this instruction does not consume compute units. The program test disables the native compute unit feature here. |
| @@ -134,6 +134,11 @@ declare_process_instruction!(process_instruction, 0, |invoke_context| { | |||
|
|
|||
| match instruction { | |||
| ProofInstruction::CloseContextState => { | |||
| if native_programs_consume_cu { | |||
| invoke_context | |||
| .consume_checked(3_300) | |||
add compute units for close context state account (cherry picked from commit 79c02c8)
Problem
The close context state account instruction does not incure a fee. If the feature #30620 is activated, then any native instruction that does not incure a fee will fail.
Summary of Changes
Added compute units to close account. The instruction itself performs two things:
I modeled the compute units similar to the
spl-tokenclose account instruction. The token close account instruction performs similar steps as the close context state account instruction here. Although the token instruction is executed as BPF, it only really performs pubkey comparison and then frees the account, so the cost should be quite similar. The token close instruction incurs about3_300compute units, so this amount was assigned to the close context state account instruction.Fixes #