lang: Add Discriminator impl for instructions

coral-xyz · Jun 28, 2022 · 170d856 · 170d856
1 parent 55e0c5d
commit 170d856
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/lang/src/lib.rs b/lang/src/lib.rs
@@ -181,8 +181,12 @@ pub trait ZeroCopy: Discriminator + Copy + Clone + Zeroable + Pod {}
 /// `Sha256(<namespace>::<method_name>)[..8] || BorshSerialize(args)`.
 /// `args` is a borsh serialized struct of named fields for each argument given
 /// to an instruction.
-pub trait InstructionData: AnchorSerialize {
-    fn data(&self) -> Vec<u8>;
+pub trait InstructionData: Discriminator + AnchorSerialize {
+    fn data(&self) -> Vec<u8> {
+        let mut d = Self::discriminator().to_vec();
+        d.append(&mut self.try_to_vec().expect("Should always serialize"));
+        d
+    }
 }
 
 /// An event that can be emitted via a Solana log. See [`emit!`](crate::prelude::emit) for an example.

diff --git a/lang/syn/src/codegen/program/instruction.rs b/lang/syn/src/codegen/program/instruction.rs
@@ -39,13 +39,12 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream {
                 /// constructor.
                 #strct
 
-                impl anchor_lang::InstructionData for New {
-                    fn data(&self) -> Vec<u8> {
-                        let mut d = #sighash_tts.to_vec();
-                        d.append(&mut self.try_to_vec().expect("Should always serialize"));
-                        d
+                impl anchor_lang::Discriminator for New {
+                    fn discriminator() -> [u8; 8] {
+                        #sighash_tts
                     }
                 }
+                impl anchor_lang::InstructionData for New {}
             }
         }
     };
@@ -82,13 +81,12 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream {
                             let sighash_tts: proc_macro2::TokenStream =
                                 format!("{:?}", sighash_arr).parse().unwrap();
                             quote! {
-                                impl anchor_lang::InstructionData for #ix_name_camel {
-                                    fn data(&self) -> Vec<u8> {
-                                        let mut d = #sighash_tts.to_vec();
-                                        d.append(&mut self.try_to_vec().expect("Should always serialize"));
-                                        d
+                                impl anchor_lang::Discriminator for #ix_name_camel {
+                                    fn discriminator() -> [u8; 8] {
+                                        #sighash_tts
                                     }
                                 }
+                                impl anchor_lang::InstructionData for #ix_name_camel {}
                             }
                         };
 
@@ -138,13 +136,12 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream {
                 let sighash_tts: proc_macro2::TokenStream =
                     format!("{:?}", sighash_arr).parse().unwrap();
                 quote! {
-                    impl anchor_lang::InstructionData for #ix_name_camel {
-                        fn data(&self) -> Vec<u8> {
-                            let mut d = #sighash_tts.to_vec();
-                            d.append(&mut self.try_to_vec().expect("Should always serialize"));
-                            d
+                    impl anchor_lang::Discriminator for #ix_name_camel {
+                        fn discriminator() -> [u8; 8] {
+                            #sighash_tts
                         }
                     }
+                    impl anchor_lang::InstructionData for #ix_name_camel {}
                 }
             };
             // If no args, output a "unit" variant instead of a struct variant.