initialize security associated account for escrow by default

app/src/idl/transfer_restrictions.ts

@@ -1465,6 +1465,26 @@ export type TransferRestrictions = {
             ]
           }
         },
+        {
+          "name": "escrowSecurityAssociatedAccount",
+          "writable": true,
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  115,
+                  97,
+                  97
+                ]
+              },
+              {
+                "kind": "account",
+                "path": "escrowAccount"
+              }
+            ]
+          }
+        },
         {
           "name": "mint"
         },
@@ -1484,6 +1504,10 @@ export type TransferRestrictions = {
           "name": "payer",
           "writable": true,
           "signer": true
+        },
+        {
+          "name": "systemProgram",
+          "address": "11111111111111111111111111111111"
         }
       ],
       "args": []
@@ -2015,7 +2039,9 @@ export type TransferRestrictions = {
           },
           {
             "name": "holder",
-            "type": "pubkey"
+            "type": {
+              "option": "pubkey"
+            }
           }
         ]
       }

programs/transfer-restrictions/src/contexts/initialize_security_associated_account.rs

@@ -13,7 +13,7 @@ pub const SECURITY_ASSOCIATED_ACCOUNT_PREFIX: &str = "saa"; // security associat
 #[derive(Default, InitSpace)]
 pub struct SecurityAssociatedAccount {
     pub group: u64,
-    pub holder: Pubkey,
+    pub holder: Option<Pubkey>,
 }
 
 #[derive(Accounts)]

programs/transfer-restrictions/src/contexts/set_lockup_escrow_account.rs

@@ -1,12 +1,15 @@
-use std::str::FromStr;
 use access_control::{self, AccessControl, WalletRole};
 use anchor_lang::prelude::*;
 use anchor_spl::{
     token_2022::{self, ID as TOKEN_2022_PROGRAM_ID},
     token_interface::{Mint, TokenAccount},
 };
+use std::str::FromStr;
 
-use crate::{TransferRestrictionData, TRANSFER_RESTRICTION_DATA_PREFIX};
+use crate::{
+    common::DISCRIMINATOR_LEN, SecurityAssociatedAccount, TransferRestrictionData,
+    SECURITY_ASSOCIATED_ACCOUNT_PREFIX, TRANSFER_RESTRICTION_DATA_PREFIX,
+};
 
 const TOKENLOCK_ID: &str = "7CN3iHcRimZRa97M38cyMQAF68ecQYDqHfCUgBeSARG2";
 #[derive(Accounts)]
@@ -21,6 +24,15 @@ pub struct SetLockupEscrowAccount<'info> {
     )]
     pub transfer_restriction_data: Account<'info, TransferRestrictionData>,
 
+    #[account(init, payer = payer, space = DISCRIMINATOR_LEN + SecurityAssociatedAccount::INIT_SPACE,
+        seeds = [
+            SECURITY_ASSOCIATED_ACCOUNT_PREFIX.as_bytes(),
+            &escrow_account.key().to_bytes(),
+        ],
+        bump,
+    )]
+    pub escrow_security_associated_account: Account<'info, SecurityAssociatedAccount>,
+
     #[account(
         mint::token_program = TOKEN_2022_PROGRAM_ID,
     )]
@@ -49,4 +61,6 @@ pub struct SetLockupEscrowAccount<'info> {
     pub tokenlock_account: AccountInfo<'info>,
     #[account(mut)]
     pub payer: Signer<'info>,
+
+    pub system_program: Program<'info, System>,
 }

programs/transfer-restrictions/src/contexts/update_wallet_group.rs

@@ -54,24 +54,24 @@ pub struct UpdateWalletGroup<'info> {
     #[account(mut,
       seeds = [
         TRANSFER_RESTRICTION_HOLDER_GROUP_PREFIX.as_bytes(),
-        &security_associated_account.holder.to_bytes(),
+        &security_associated_account.holder.unwrap().to_bytes(),
         &security_associated_account.group.to_le_bytes(),
       ],
       bump,
       constraint = holder_group_current.group == security_associated_account.group,
       constraint = holder_group_current.group == transfer_restriction_group_current.id,
-      constraint = holder_group_current.holder == security_associated_account.holder,
+      constraint = holder_group_current.holder == security_associated_account.holder.unwrap(),
     )]
     pub holder_group_current: Account<'info, HolderGroup>,
     #[account(mut,
       seeds = [
         TRANSFER_RESTRICTION_HOLDER_GROUP_PREFIX.as_bytes(),
-        &security_associated_account.holder.to_bytes(),
+        &security_associated_account.holder.unwrap().to_bytes(),
         &transfer_restriction_group_new.id.to_le_bytes(),
       ],
       bump,
       constraint = holder_group_new.group == transfer_restriction_group_new.id,
-      constraint = holder_group_new.holder == security_associated_account.holder,
+      constraint = holder_group_new.holder == security_associated_account.holder.unwrap(),
     )]
     pub holder_group_new: Account<'info, HolderGroup>,
 

programs/transfer-restrictions/src/instructions/transfer_restrictions/initialize_security_associated_account.rs

@@ -14,7 +14,7 @@ pub fn initialize_security_associated_account(
     let security_associated_account = &mut ctx.accounts.security_associated_account;
 
     security_associated_account.group = ctx.accounts.group.id;
-    security_associated_account.holder = *ctx.accounts.holder.to_account_info().key;
+    security_associated_account.holder = Some(ctx.accounts.holder.key());
 
     let holder_group = &mut ctx.accounts.holder_group;
     holder_group.current_wallets_count = holder_group.current_wallets_count.checked_add(1).unwrap();

programs/transfer-restrictions/src/instructions/transfer_restrictions/set_lockup_escrow_account.rs

@@ -20,6 +20,10 @@ pub fn set_lockup_escrow_account(
     let transfer_restriction_data = &mut ctx.accounts.transfer_restriction_data;
     transfer_restriction_data.lockup_escrow_account = Some(escrow_account);
 
+    let escrow_security_associated_token_account = &mut ctx.accounts.escrow_security_associated_account;
+    escrow_security_associated_token_account.group = 0;
+    escrow_security_associated_token_account.holder = None;
+
     Ok(())
 }
 

tests/helpers/transfer-restrictions_helper.ts

@@ -489,16 +489,19 @@ export class TransferRestrictionsHelper {
     authorityWalletRolePubkey: PublicKey,
     payer: Keypair
   ): Promise<string> {
+    const [escrowSecurityAssociatedAccountPubkey] = this.securityAssociatedAccountPDA(lockupEscrowAccountPubkey);
     return this.program.methods
       .setLockupEscrowAccount()
       .accountsStrict({
         transferRestrictionData: this.transferRestrictionDataPubkey,
+        escrowSecurityAssociatedAccount: escrowSecurityAssociatedAccountPubkey,
         mint: this.mintPubkey,
         accessControlAccount: this.accessControlPubkey,
         authorityWalletRole: authorityWalletRolePubkey,
         escrowAccount: lockupEscrowAccountPubkey,
         tokenlockAccount: tokenlockAccountPubkey,
         payer: payer.publicKey,
+        systemProgram: SystemProgram.programId,
       })
       .signers([payer])
       .rpc({ commitment: this.confirmOptions });

tests/lockup-token.ts

@@ -512,19 +512,6 @@ describe("token lockup", () => {
       )[0],
       testEnvironment.walletsAdmin
     );
-    await testEnvironment.transferRestrictionsHelper.initializeSecurityAssociatedAccount(
-      testEnvironment.transferRestrictionsHelper.groupPDA(recipientGroupId)[0],
-      testEnvironment.transferRestrictionsHelper.holderPDA(
-        recipientHolderId
-      )[0],
-      recipientHolderGroupPubkey,
-      escrowOwnerPubkey,
-      escrowAccount,
-      testEnvironment.accessControlHelper.walletRolePDA(
-        testEnvironment.walletsAdmin.publicKey
-      )[0],
-      testEnvironment.walletsAdmin
-    );
     // Initialize Transfer Restrictions Rule
     const tsNow = await getNowTs(testEnvironment.connection);
     const lockedUntil = new anchor.BN(tsNow);

tests/tokenlock/100-timelocks.ts

@@ -83,7 +83,7 @@ describe("TokenLockup stress test", () => {
       );
       const maxReleaseDelay = new anchor.BN(346896000);
       const minTimelockAmount = new anchor.BN(100);
-      const initializeTokenlockSignature = await initializeTokenlock(
+      await initializeTokenlock(
         tokenlockProgram,
         maxReleaseDelay,
         minTimelockAmount,
@@ -272,20 +272,9 @@ describe("TokenLockup stress test", () => {
       walletCTokenAccount,
       authorityWalletRole,
       testEnvironment.walletsAdmin,
-    )
-
-    await testEnvironment.transferRestrictionsHelper.initializeSecurityAssociatedAccount(
-      groupPubkey,
-      holderPubkey,
-      holderGroupPubkey,
-      escrowOwnerPubkey,
-      escrowAccount,
-      authorityWalletRole,
-      testEnvironment.walletsAdmin,
-    )
+    );
 
     const transferAmount = new anchor.BN(unlockedBalance);
-
     const withdrawTxSignature = await withdraw(
       testEnvironment.connection,
       transferAmount,
@@ -298,7 +287,7 @@ describe("TokenLockup stress test", () => {
       walletCTokenAccount,
       testEnvironment.transferRestrictionsHelper,
       walletC
-    )
+    );
     console.log("Transfer Transaction Signature", withdrawTxSignature);
     tokenlockData = await tokenlockProgram.account.tokenLockData.fetch(
       tokenlockDataPubkey