add vestingStartTime to node

programs/locker/src/instructions/v3/claim.rs

@@ -39,7 +39,8 @@ impl ClaimV3Params {
             &self.amount_per_period.to_le_bytes(),
             &self.number_of_period.to_le_bytes(),
             &self.cliff_time.to_le_bytes(),
-            &self.frequency.to_le_bytes()
+            &self.frequency.to_le_bytes(),
+            &self.vesting_start_time.to_le_bytes()
         ]);
 
         let leaf = hashv(&[LEAF_PREFIX, &node.to_bytes()]);

tests/locker_utils/merkle_tree/EscrowRecipientTree.ts

@@ -12,6 +12,7 @@ export class EscrowRecipientTree {
       numberOfPeriod: BN;
       cliffTime: BN;
       frequency: BN;
+      vestingStartTime: BN;
     }[]
   ) {
     this._tree = new MerkleTree(
@@ -24,6 +25,7 @@ export class EscrowRecipientTree {
             numberOfPeriod,
             cliffTime,
             frequency,
+            vestingStartTime
           },
           index
         ) => {
@@ -33,7 +35,8 @@ export class EscrowRecipientTree {
             amountPerPeriod,
             numberOfPeriod,
             cliffTime,
-            frequency
+            frequency,
+            vestingStartTime
           );
         }
       )
@@ -47,7 +50,8 @@ export class EscrowRecipientTree {
     amountPerPeriod: BN,
     numberOfPeriod: BN,
     cliffTime: BN,
-    frequency: BN
+    frequency: BN,
+    vestingStartTime: BN
   ): Buffer {
     const buf = Buffer.concat([
       account.toBuffer(),
@@ -56,6 +60,7 @@ export class EscrowRecipientTree {
       new BN(numberOfPeriod).toArrayLike(Buffer, "le", 8),
       new BN(cliffTime).toArrayLike(Buffer, "le", 8),
       new BN(frequency).toArrayLike(Buffer, "le", 8),
+      new BN(vestingStartTime).toArrayLike(Buffer, "le", 8),
     ]);
 
     const hashedBuff = Buffer.from(sha256(buf), "hex");
@@ -74,7 +79,8 @@ export class EscrowRecipientTree {
     amountPerPeriod: BN,
     numberOfPeriod: BN,
     cliffTime: BN,
-    frequency: BN
+    frequency: BN,
+    vestingStartTime: BN
   ): Buffer[] {
     return this._tree.getProof(
       EscrowRecipientTree.toNode(
@@ -83,7 +89,8 @@ export class EscrowRecipientTree {
         amountPerPeriod,
         numberOfPeriod,
         cliffTime,
-        frequency
+        frequency,
+        vestingStartTime
       )
     );
   }

tests/locker_utils/merkle_tree/index.ts

@@ -9,6 +9,7 @@ export function generateMerkleTreeRoot(
     numberOfPeriod: BN;
     cliffTime: BN;
     frequency: BN;
+    vestingStartTime: BN
   }[]
 ): number[] {
   const escrowRecipientTree = new EscrowRecipientTree(data);
@@ -23,6 +24,7 @@ export function getMerkleTreeProof(
     numberOfPeriod: BN;
     cliffTime: BN;
     frequency: BN;
+    vestingStartTime: BN;
   }[],
   user: {
     account: web3.PublicKey;
@@ -31,6 +33,7 @@ export function getMerkleTreeProof(
     numberOfPeriod: BN;
     cliffTime: BN;
     frequency: BN;
+    vestingStartTime: BN;
   }
 ) {
   const {
@@ -40,6 +43,7 @@ export function getMerkleTreeProof(
     numberOfPeriod,
     cliffTime,
     frequency,
+    vestingStartTime
   } = user;
   const escrowRecipientTree = new EscrowRecipientTree(data);
   return escrowRecipientTree.getProof(
@@ -48,6 +52,7 @@ export function getMerkleTreeProof(
     amountPerPeriod,
     numberOfPeriod,
     cliffTime,
-    frequency
+    frequency,
+    vestingStartTime
   );
 }

tests/v3/test_cancel.ts

@@ -112,7 +112,8 @@ describe("[V3] Cancel escrow", () => {
         amountPerPeriod,
         numberOfPeriod,
         cliffTime,
-        frequency
+        frequency,
+        vestingStartTime
       };
     });
     const user = {
@@ -121,7 +122,8 @@ describe("[V3] Cancel escrow", () => {
       amountPerPeriod,
       numberOfPeriod,
       cliffTime,
-      frequency
+      frequency,
+      vestingStartTime
     };
     totalDepositAmount = totalLockedAmount.muln(leaves.length);
     root = generateMerkleTreeRoot(leaves);

tests/v3/test_close_vesting_escrow.ts

@@ -145,7 +145,8 @@ describe("[V3] Close vesting escrow", () => {
           amountPerPeriod,
           numberOfPeriod,
           cliffTime,
-          frequency
+          frequency,
+          vestingStartTime
         };
       });
       const user = {
@@ -154,7 +155,8 @@ describe("[V3] Close vesting escrow", () => {
         amountPerPeriod,
         numberOfPeriod,
         cliffTime,
-        frequency
+        frequency,
+        vestingStartTime
       };
       totalDepositAmount = totalLockedAmount.muln(leaves.length);
       root = generateMerkleTreeRoot(leaves);
@@ -208,7 +210,8 @@ describe("[V3] Close vesting escrow", () => {
           amountPerPeriod,
           numberOfPeriod,
           cliffTime,
-          frequency
+          frequency,
+          vestingStartTime
         };
         const recipientProof = getMerkleTreeProof(leaves, recipientNode);
 
@@ -277,7 +280,8 @@ describe("[V3] Close vesting escrow", () => {
           amountPerPeriod,
           numberOfPeriod,
           cliffTime,
-          frequency
+          frequency,
+          vestingStartTime
         };
         const recipientProof = getMerkleTreeProof(leaves, recipientNode);
 
@@ -372,7 +376,8 @@ describe("[V3] Close vesting escrow", () => {
           amountPerPeriod,
           numberOfPeriod,
           cliffTime,
-          frequency
+          frequency,
+          vestingStartTime
         };
       });
       const user = {
@@ -381,7 +386,8 @@ describe("[V3] Close vesting escrow", () => {
         amountPerPeriod,
         numberOfPeriod,
         cliffTime,
-        frequency
+        frequency,
+        vestingStartTime
       };
       totalDepositAmount = totalLockedAmount.muln(leaves.length);
       root = generateMerkleTreeRoot(leaves);
@@ -435,7 +441,8 @@ describe("[V3] Close vesting escrow", () => {
           amountPerPeriod,
           numberOfPeriod,
           cliffTime,
-          frequency
+          frequency,
+          vestingStartTime
         };
         const recipientProof = getMerkleTreeProof(leaves, recipientNode);
         try {
@@ -504,7 +511,8 @@ describe("[V3] Close vesting escrow", () => {
           amountPerPeriod,
           numberOfPeriod,
           cliffTime,
-          frequency
+          frequency,
+          vestingStartTime
         };
         const recipientProof = getMerkleTreeProof(leaves, recipientNode);
         try {

tests/v3/test_create_lock_spl_token.ts

@@ -148,6 +148,7 @@ describe("[V3] Create vesting with spl token", () => {
         numberOfPeriod,
         cliffTime,
         frequency,
+        vestingStartTime
       };
     });
     const user = {
@@ -157,6 +158,7 @@ describe("[V3] Create vesting with spl token", () => {
       numberOfPeriod,
       cliffTime,
       frequency,
+      vestingStartTime
     };
     totalDepositAmount = totalLockedAmount.muln(leaves.length);
     root = generateMerkleTreeRoot(leaves);
@@ -239,6 +241,7 @@ describe("[V3] Create vesting with spl token", () => {
         numberOfPeriod,
         cliffTime,
         frequency,
+        vestingStartTime
       };
       const recipientProof = getMerkleTreeProof(leaves, recipientNode);
       try {
@@ -302,6 +305,7 @@ describe("[V3] Create vesting with spl token", () => {
       numberOfPeriod,
       cliffTime,
       frequency,
+      vestingStartTime
     };
     const newRecipientProof = getMerkleTreeProof(leaves, recipientNode);
 

tests/v3/test_create_lock_token2022.ts

@@ -101,6 +101,7 @@ describe("[V3] Create vesting with Token2022", () => {
         numberOfPeriod,
         cliffTime,
         frequency,
+        vestingStartTime
       };
     });
     const user = {
@@ -110,6 +111,7 @@ describe("[V3] Create vesting with Token2022", () => {
       numberOfPeriod,
       cliffTime,
       frequency,
+      vestingStartTime
     };
     totalDepositAmount = totalLockedAmount.muln(leaves.length);
     root = generateMerkleTreeRoot(leaves);
@@ -182,6 +184,7 @@ describe("[V3] Create vesting with Token2022", () => {
         numberOfPeriod,
         cliffTime,
         frequency,
+        vestingStartTime
       };
       const recipientProof = getMerkleTreeProof(leaves, recipientNode);
       try {
@@ -245,6 +248,7 @@ describe("[V3] Create vesting with Token2022", () => {
       numberOfPeriod,
       cliffTime,
       frequency,
+      vestingStartTime
     };
     const newRecipientProof = getMerkleTreeProof(leaves, recipientNode);
 

tests/v3/test_escrow_metadata.ts

@@ -132,7 +132,8 @@ describe("[V3] Create vesting metadata", () => {
         amountPerPeriod,
         numberOfPeriod,
         cliffTime,
-        frequency
+        frequency,
+        vestingStartTime
       };
     });
     const user = {
@@ -141,7 +142,8 @@ describe("[V3] Create vesting metadata", () => {
       amountPerPeriod,
       numberOfPeriod,
       cliffTime,
-      frequency
+      frequency,
+      vestingStartTime
     };
     totalDepositAmount = totalLockedAmount.muln(leaves.length);
     root = generateMerkleTreeRoot(leaves);