Verify Token-2022 settlement against the whole existing suite

The Token-2022 paths are worth little if they only hold for the handful
of cases someone thought to write twice, so instead of a parallel suite
this reruns the suite that already exists against the second program.

`common::also_under_token_2022!(some_test)` sits in front of a test and
generates `some_test_token_2022`, which runs the same body with
Token-2022 as the thread-local active program. Nothing in the body
changes: the token helpers build against `token::active()`, and
`payer_signed_tx` / `signed_tx` repoint the legacy program id in every
instruction they assemble. 75 tests are covered this way, across buffer
creation, reclamation, order settlement, pushes, and limit prices --
error paths as much as happy ones.

Naming the test in front of it, rather than wrapping the body, keeps the
indentation and makes a stale name a compile error instead of a test
that quietly stopped being generated. A test that can only hold under
one program (one pinned to the legacy native mint) goes without and says
why, as do the suites whose instructions name no token program at all.

Three tests are Token-2022-only, covering what has no legacy analogue --
a buffer for a mint with a `TransferFeeConfig`, which needs a
`TransferFeeAmount` on every account holding it and so must be longer
than the base layout:

- `creates_buffer_sized_for_a_mint_with_extensions`
- `recreating_an_extension_mint_buffer_is_idempotent`
- `reclaims_a_buffer_sized_for_an_extension_mint`

`bench-report.json` gains the CU, account, and transaction-byte readings
for every generated test. Token-2022 costs more per instruction, as
expected from the longer accounts and the extension-aware transfer path.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: kaze-cow

Cargo.lock

@@ -30,6 +30,7 @@ hex-literal = "1"
 litesvm = "0.15"
 litesvm-token = "0.15"
 num_enum = "0.7"
+pastey = "0.2"
 pinocchio = "0.11"
 pinocchio-system = "0.6"
 pinocchio-token = "0.7"

Cargo.toml

@@ -1,72 +1,114 @@
 {
   "accounts": {
     "create_buffers/happy_path_creates_initialized_buffer_token_account": 6,
+    "create_buffers/happy_path_creates_initialized_buffer_token_account_token_2022": 6,
     "create_buffers/happy_path_creates_multiple_buffers_in_one_instruction": 10,
+    "create_buffers/happy_path_creates_multiple_buffers_in_one_instruction_token_2022": 10,
     "create_buffers/max_buffers_in_one_instruction": 64,
     "create_order/happy_path_creates_order_pda_with_expected_body": 4,
     "initialize/happy_path_initializes_state_pda_with_expected_data": 4,
     "reclaim_buffer/funded_buffer_is_skipped": 7,
+    "reclaim_buffer/funded_buffer_is_skipped_token_2022": 7,
     "reclaim_buffer/happy_path_reclaims_empty_buffer_to_the_authority_itself": 7,
+    "reclaim_buffer/happy_path_reclaims_empty_buffer_to_the_authority_itself_token_2022": 7,
     "reclaim_buffer/max_buffers_in_one_instruction": 64,
     "reclaim_buffer/reclaims_multiple_buffers_skipping_funded": 9,
+    "reclaim_buffer/reclaims_multiple_buffers_skipping_funded_token_2022": 9,
     "reclaim_order/happy_path_returns_lamports_and_closes_pda": 4,
     "settle/finalizes_with_no_pushes": 5,
+    "settle/finalizes_with_no_pushes_token_2022": 5,
     "settle/pulls_from_multiple_orders": 15,
+    "settle/pulls_from_multiple_orders_token_2022": 15,
     "settle/pulls_funds_to_destination": 10,
+    "settle/pulls_funds_to_destination_token_2022": 10,
     "settle/pulls_to_multiple_destinations": 11,
+    "settle/pulls_to_multiple_destinations_token_2022": 11,
     "settle/pushes_a_single_order": 9,
+    "settle/pushes_a_single_order_token_2022": 9,
     "settle/pushes_several_orders_from_different_buffers": 13,
+    "settle/pushes_several_orders_from_different_buffers_token_2022": 13,
     "settle/pushes_several_orders_from_one_buffer": 12,
+    "settle/pushes_several_orders_from_one_buffer_token_2022": 12,
     "settle/settles_a_single_order": 9,
+    "settle/settles_a_single_order_token_2022": 9,
     "settle/settles_multiple_orders": 17,
+    "settle/settles_multiple_orders_token_2022": 17,
     "transfer_authority/manager_can_transfer_manager": 4,
     "transfer_authority/manager_can_transfer_reclaim_authority": 4,
     "transfer_authority/reclaim_authority_can_transfer_itself": 4
   },
   "compute_units": {
     "create_buffers/happy_path_creates_initialized_buffer_token_account": 10360,
+    "create_buffers/happy_path_creates_initialized_buffer_token_account_token_2022": 11694,
     "create_buffers/happy_path_creates_multiple_buffers_in_one_instruction": 21789,
+    "create_buffers/happy_path_creates_multiple_buffers_in_one_instruction_token_2022": 25787,
     "create_buffers/max_buffers_in_one_instruction": 177518,
     "create_order/happy_path_creates_order_pda_with_expected_body": 7916,
     "initialize/happy_path_initializes_state_pda_with_expected_data": 4519,
     "reclaim_buffer/funded_buffer_is_skipped": 6363,
+    "reclaim_buffer/funded_buffer_is_skipped_token_2022": 6367,
     "reclaim_buffer/happy_path_reclaims_empty_buffer_to_the_authority_itself": 7511,
+    "reclaim_buffer/happy_path_reclaims_empty_buffer_to_the_authority_itself_token_2022": 8747,
     "reclaim_buffer/max_buffers_in_one_instruction": 138392,
     "reclaim_buffer/reclaims_multiple_buffers_skipping_funded": 18170,
+    "reclaim_buffer/reclaims_multiple_buffers_skipping_funded_token_2022": 19408,
     "reclaim_order/happy_path_returns_lamports_and_closes_pda": 2127,
     "settle/finalizes_with_no_pushes": 7049,
+    "settle/finalizes_with_no_pushes_token_2022": 7053,
     "settle/pulls_from_multiple_orders": 20034,
+    "settle/pulls_from_multiple_orders_token_2022": 25634,
     "settle/pulls_funds_to_destination": 13564,
+    "settle/pulls_funds_to_destination_token_2022": 16366,
     "settle/pulls_to_multiple_destinations": 14712,
+    "settle/pulls_to_multiple_destinations_token_2022": 18927,
     "settle/pushes_a_single_order": 12410,
+    "settle/pushes_a_single_order_token_2022": 13799,
     "settle/pushes_several_orders_from_different_buffers": 17727,
+    "settle/pushes_several_orders_from_different_buffers_token_2022": 20501,
     "settle/pushes_several_orders_from_one_buffer": 17728,
+    "settle/pushes_several_orders_from_one_buffer_token_2022": 20502,
     "settle/settles_a_single_order": 12428,
+    "settle/settles_a_single_order_token_2022": 13799,
     "settle/settles_multiple_orders": 23088,
+    "settle/settles_multiple_orders_token_2022": 27193,
     "transfer_authority/manager_can_transfer_manager": 3163,
     "transfer_authority/manager_can_transfer_reclaim_authority": 3165,
     "transfer_authority/reclaim_authority_can_transfer_itself": 3168
   },
   "transaction_bytes": {
     "create_buffers/happy_path_creates_initialized_buffer_token_account": 303,
+    "create_buffers/happy_path_creates_initialized_buffer_token_account_token_2022": 303,
     "create_buffers/happy_path_creates_multiple_buffers_in_one_instruction": 435,
+    "create_buffers/happy_path_creates_multiple_buffers_in_one_instruction_token_2022": 435,
     "create_buffers/max_buffers_in_one_instruction": 331,
     "create_order/happy_path_creates_order_pda_with_expected_body": 389,
     "initialize/happy_path_initializes_state_pda_with_expected_data": 301,
     "reclaim_buffer/funded_buffer_is_skipped": 400,
+    "reclaim_buffer/funded_buffer_is_skipped_token_2022": 400,
     "reclaim_buffer/happy_path_reclaims_empty_buffer_to_the_authority_itself": 400,
+    "reclaim_buffer/happy_path_reclaims_empty_buffer_to_the_authority_itself_token_2022": 400,
     "reclaim_buffer/max_buffers_in_one_instruction": 332,
     "reclaim_buffer/reclaims_multiple_buffers_skipping_funded": 466,
+    "reclaim_buffer/reclaims_multiple_buffers_skipping_funded_token_2022": 466,
     "reclaim_order/happy_path_returns_lamports_and_closes_pda": 236,
     "settle/finalizes_with_no_pushes": 289,
+    "settle/finalizes_with_no_pushes_token_2022": 289,
     "settle/pulls_from_multiple_orders": 655,
+    "settle/pulls_from_multiple_orders_token_2022": 655,
     "settle/pulls_funds_to_destination": 472,
+    "settle/pulls_funds_to_destination_token_2022": 472,
     "settle/pulls_to_multiple_destinations": 513,
+    "settle/pulls_to_multiple_destinations_token_2022": 513,
     "settle/pushes_a_single_order": 431,
+    "settle/pushes_a_single_order_token_2022": 431,
     "settle/pushes_several_orders_from_different_buffers": 573,
+    "settle/pushes_several_orders_from_different_buffers_token_2022": 573,
     "settle/pushes_several_orders_from_one_buffer": 541,
+    "settle/pushes_several_orders_from_one_buffer_token_2022": 541,
     "settle/settles_a_single_order": 431,
+    "settle/settles_a_single_order_token_2022": 431,
     "settle/settles_multiple_orders": 715,
+    "settle/settles_multiple_orders_token_2022": 715,
     "transfer_authority/manager_can_transfer_manager": 333,
     "transfer_authority/manager_can_transfer_reclaim_authority": 333,
     "transfer_authority/reclaim_authority_can_transfer_itself": 333

bench-report.json

@@ -30,6 +30,7 @@ arrayref.workspace = true
 bincode.workspace = true
 litesvm.workspace = true
 litesvm-token.workspace = true
+pastey.workspace = true
 proptest.workspace = true
 cow-settlement-client.workspace = true
 cow-settlement-interface = { workspace = true, features = ["test-fixtures"] }
@@ -39,6 +40,8 @@ solana-instructions-sysvar.workspace = true
 solana-program-pack.workspace = true
 solana-sdk.workspace = true
 solana-sha256-hasher.workspace = true
+spl-associated-token-account-interface.workspace = true
+spl-token-2022-interface.workspace = true
 solana-system-interface.workspace = true
 
 [lints]

programs/settlement/Cargo.toml

@@ -45,7 +45,7 @@ use solana_sdk::{
     instruction::{AccountMeta, InstructionError},
     pubkey::Pubkey,
     signature::{Keypair, Signer},
-    transaction::{Transaction, TransactionError},
+    transaction::TransactionError,
 };
 
 mod common;
@@ -139,6 +139,7 @@ fn settle_and_pay_amounts(
     vec![begin.into(), finalize.into()]
 }
 
+common::also_under_token_2022!(settles_a_single_order);
 #[test]
 fn settles_a_single_order() {
     let (mut svm, program_id, payer) = setup();
@@ -157,6 +158,7 @@ fn settles_a_single_order() {
         .expect("settlement should succeed");
 }
 
+common::also_under_token_2022!(settles_multiple_orders);
 #[test]
 fn settles_multiple_orders() {
     let (mut svm, program_id, payer) = setup();
@@ -179,6 +181,7 @@ fn settles_multiple_orders() {
         .expect("multi-order settlement should succeed");
 }
 
+common::also_under_token_2022!(rejects_wrong_stored_bump);
 #[test]
 fn rejects_wrong_stored_bump() {
     let (mut svm, program_id, payer) = setup();
@@ -213,6 +216,7 @@ fn rejects_wrong_stored_bump() {
     );
 }
 
+common::also_under_token_2022!(rejects_fabricated_program_owned_account);
 #[test]
 fn rejects_fabricated_program_owned_account() {
     let (mut svm, program_id, payer) = setup();
@@ -262,6 +266,7 @@ fn rejects_fabricated_program_owned_account() {
     );
 }
 
+common::also_under_token_2022!(rejects_non_order_account_in_order_slot);
 #[test]
 fn rejects_non_order_account_in_order_slot() {
     let (mut svm, program_id, payer) = setup();
@@ -300,6 +305,7 @@ fn rejects_non_order_account_in_order_slot() {
     );
 }
 
+common::also_under_token_2022!(rejects_sell_token_account_mismatch);
 #[test]
 fn rejects_sell_token_account_mismatch() {
     let (mut svm, program_id, payer) = setup();
@@ -329,6 +335,7 @@ fn rejects_sell_token_account_mismatch() {
     );
 }
 
+common::also_under_token_2022!(rejects_sell_token_owner_mismatch);
 #[test]
 fn rejects_sell_token_owner_mismatch() {
     let (mut svm, program_id, payer) = setup();
@@ -360,6 +367,7 @@ fn rejects_sell_token_owner_mismatch() {
     );
 }
 
+common::also_under_token_2022!(rejects_non_token_sell_account);
 #[test]
 fn rejects_non_token_sell_account() {
     let (mut svm, program_id, payer) = setup();
@@ -389,6 +397,7 @@ fn rejects_non_token_sell_account() {
     );
 }
 
+common::also_under_token_2022!(rejects_duplicate_orders);
 #[test]
 fn rejects_duplicate_orders() {
     let (mut svm, program_id, payer) = setup();
@@ -415,6 +424,7 @@ fn rejects_duplicate_orders() {
     );
 }
 
+common::also_under_token_2022!(rejects_orders_in_wrong_address_order);
 #[test]
 fn rejects_orders_in_wrong_address_order() {
     let (mut svm, program_id, payer) = setup();
@@ -493,6 +503,7 @@ fn rejects_orders_in_wrong_address_order() {
     );
 }
 
+common::also_under_token_2022!(rejects_cancelled_order);
 #[test]
 fn rejects_cancelled_order() {
     let (mut svm, program_id, payer) = setup();
@@ -532,6 +543,7 @@ fn rejects_cancelled_order() {
     );
 }
 
+common::also_under_token_2022!(rejects_expired_order);
 #[test]
 fn rejects_expired_order() {
     let (mut svm, program_id, payer) = setup();
@@ -558,6 +570,7 @@ fn rejects_expired_order() {
     );
 }
 
+common::also_under_token_2022!(settles_order_at_exact_valid_to);
 #[test]
 fn settles_order_at_exact_valid_to() {
     let (mut svm, program_id, payer) = setup();
@@ -580,6 +593,7 @@ fn settles_order_at_exact_valid_to() {
     send(&mut svm, &payer, instructions).expect("an order is still settleable at exactly valid_to");
 }
 
+common::also_under_token_2022!(pulls_funds_to_destination);
 #[test]
 fn pulls_funds_to_destination() {
     let (mut svm, program_id, payer) = setup();
@@ -622,6 +636,7 @@ fn pulls_funds_to_destination() {
     );
 }
 
+common::also_under_token_2022!(pulls_to_multiple_destinations);
 #[test]
 fn pulls_to_multiple_destinations() {
     let (mut svm, program_id, payer) = setup();
@@ -674,6 +689,7 @@ fn pulls_to_multiple_destinations() {
     );
 }
 
+common::also_under_token_2022!(pulls_from_multiple_orders);
 #[test]
 fn pulls_from_multiple_orders() {
     let (mut svm, program_id, payer) = setup();
@@ -750,6 +766,7 @@ fn pulls_from_multiple_orders() {
     );
 }
 
+common::also_under_token_2022!(rejects_pulls_summing_beyond_u64);
 #[test]
 fn rejects_pulls_summing_beyond_u64() {
     let (mut svm, program_id, payer) = setup();
@@ -791,6 +808,7 @@ fn rejects_pulls_summing_beyond_u64() {
     );
 }
 
+common::also_under_token_2022!(zero_pulls_moves_nothing);
 #[test]
 fn zero_pulls_moves_nothing() {
     let (mut svm, program_id, payer) = setup();
@@ -822,12 +840,7 @@ fn zero_pulls_moves_nothing() {
             pulls: &[],
         }],
     );
-    let transaction = Transaction::new_signed_with_payer(
-        &instructions,
-        Some(&payer.pubkey()),
-        &[&payer],
-        svm.latest_blockhash(),
-    );
+    let transaction = common::payer_signed_tx(&svm, &payer, instructions);
     let account_keys = transaction.message.account_keys.clone();
     let transaction = svm
         .send_transaction(transaction)
@@ -840,6 +853,7 @@ fn zero_pulls_moves_nothing() {
     assert_eq!(token::balance(&svm, &sell_token), initial_amount);
 }
 
+common::also_under_token_2022!(rejects_wrong_state_pda);
 #[test]
 fn rejects_wrong_state_pda() {
     let (mut svm, program_id, payer) = setup();
@@ -869,6 +883,8 @@ fn rejects_wrong_state_pda() {
     );
 }
 
+// Legacy-only: this replaces the token program with an unrelated key, so a
+// Token-2022 run would submit the very same transaction.
 #[test]
 fn rejects_wrong_token_program() {
     let (mut svm, program_id, payer) = setup();
@@ -898,6 +914,7 @@ fn rejects_wrong_token_program() {
     );
 }
 
+common::also_under_token_2022!(rejects_pull_delegated_to_incorrect_address);
 #[test]
 fn rejects_pull_delegated_to_incorrect_address() {
     let (mut svm, program_id, payer) = setup();
@@ -932,6 +949,7 @@ fn rejects_pull_delegated_to_incorrect_address() {
     );
 }
 
+common::also_under_token_2022!(rejects_pull_exceeding_delegation);
 #[test]
 fn rejects_pull_exceeding_delegation() {
     let (mut svm, program_id, payer) = setup();
@@ -976,6 +994,7 @@ fn rejects_pull_exceeding_delegation() {
     assert_eq!(token::delegated_amount(&svm, &sell_token), delegated);
 }
 
+common::also_under_token_2022!(rejects_extra_account);
 #[test]
 fn rejects_extra_account() {
     let (mut svm, program_id, payer) = setup();
@@ -1003,6 +1022,7 @@ fn rejects_extra_account() {
     );
 }
 
+common::also_under_token_2022!(rejects_push_to_wrong_destination);
 #[test]
 fn rejects_push_to_wrong_destination() {
     let (mut svm, program_id, payer) = setup();
@@ -1030,6 +1050,7 @@ fn rejects_push_to_wrong_destination() {
     );
 }
 
+common::also_under_token_2022!(rejects_fewer_pushes_than_orders);
 #[test]
 fn rejects_fewer_pushes_than_orders() {
     let (mut svm, program_id, payer) = setup();
@@ -1054,6 +1075,7 @@ fn rejects_fewer_pushes_than_orders() {
     );
 }
 
+common::also_under_token_2022!(rejects_more_pushes_than_orders);
 #[test]
 fn rejects_more_pushes_than_orders() {
     let (mut svm, program_id, payer) = setup();
@@ -1078,6 +1100,7 @@ fn rejects_more_pushes_than_orders() {
     );
 }
 
+common::also_under_token_2022!(rejects_partial_push_amount_in_finalize_settle);
 #[test]
 fn rejects_partial_push_amount_in_finalize_settle() {
     let (mut svm, program_id, payer) = setup();