Fix Signature Calculation

Change-Id: Ia0fa7f86f09360d792dbfebd8928f9a444ac3368

solana/bridge/program/src/accounts.rs

@@ -56,14 +56,14 @@ impl<'b, const State: AccountState> Seeded<&ClaimDerivationData> for Claim<'b, {
 
 pub type SignatureSet<'b, const State: AccountState> = Data<'b, types::SignatureSet, { State }>;
 
-pub struct SignaturesSetDerivationData {
+pub struct SignatureSetDerivationData {
     pub hash: [u8; 32],
 }
 
-impl<'b, const State: AccountState> Seeded<&SignaturesSetDerivationData>
+impl<'b, const State: AccountState> Seeded<&SignatureSetDerivationData>
     for SignatureSet<'b, { State }>
 {
-    fn seeds(data: &SignaturesSetDerivationData) -> Vec<Vec<u8>> {
+    fn seeds(data: &SignatureSetDerivationData) -> Vec<Vec<u8>> {
         vec![data.hash.to_vec()]
     }
 }

solana/bridge/program/src/api/post_vaa.rs

@@ -17,7 +17,7 @@ use crate::{
         Message,
         MessageDerivationData,
         SignatureSet,
-        SignaturesSetDerivationData,
+        SignatureSetDerivationData,
     },
     types::{self,},
     Error,
@@ -42,9 +42,9 @@ use std::io::{
     Write,
 };
 
-impl<'a> From<&PostVAA<'a>> for SignaturesSetDerivationData {
+impl<'a> From<&PostVAA<'a>> for SignatureSetDerivationData {
     fn from(accs: &PostVAA<'a>) -> Self {
-        SignaturesSetDerivationData {
+        SignatureSetDerivationData {
             hash: accs.signature_set.hash,
         }
     }

solana/bridge/program/src/api/verify_signature.rs

@@ -7,7 +7,7 @@ use crate::{
         GuardianSet,
         GuardianSetDerivationData,
         SignatureSet,
-        SignaturesSetDerivationData,
+        SignatureSetDerivationData,
     },
     types::{self,},
     Error::{
@@ -54,11 +54,10 @@ impl From<&VerifySignatures<'_>> for GuardianSetDerivationData {
     }
 }
 
-impl From<&VerifySignatures<'_>> for SignaturesSetDerivationData {
-    fn from(data: &VerifySignatures<'_>) -> Self {
-        SignaturesSetDerivationData {
-            // TODO
-            hash: data.signature_set.hash,
+impl From<[u8; 32]> for SignatureSetDerivationData {
+    fn from(hash: [u8; 32]) -> Self {
+        SignatureSetDerivationData {
+            hash
         }
     }
 }
@@ -93,7 +92,6 @@ pub fn verify_signatures(
     accs: &mut VerifySignatures,
     data: VerifySignaturesData,
 ) -> Result<()> {
-
     accs.guardian_set
         .verify_derivation(ctx.program_id, &(&*accs).into())?;
 
@@ -183,39 +181,41 @@ pub fn verify_signatures(
         return Err(ProgramError::InvalidArgument.into());
     }
 
-    // Check message
+    // Extract message which is encoded in Solana Secp256k1 instruction data.
     let message = &secp_ix.data
         [secp_ixs[0].msg_offset as usize..(secp_ixs[0].msg_offset + secp_ixs[0].msg_size) as usize];
 
-    let mut h = sha3::Keccak256::default();
-    if let Err(e) = h.write(message) {
-        return Err(e.into());
+    // Hash the message part, which contains the serialized VAA body.
+    let msg_hash: [u8; 32] = {
+        let mut h = sha3::Keccak256::default();
+        if let Err(e) = h.write(message) {
+            return Err(e.into());
+        };
+        h.finalize().into()
     };
 
-    let msg_hash: [u8; 32] = h.finalize().into();
     if msg_hash != data.hash {
         return Err(InvalidHash.into());
     }
 
-    // Track whether the account needs initialization
-    // Prepare message/payload-specific sig_info account
+    // Confirm at this point that the derivation succeeds, we didn't have a signature set with the
+    // correct hash until this point.
+    accs.signature_set.verify_derivation(
+        ctx.program_id,
+        &msg_hash.into(),
+    )?;
+
     if !accs.signature_set.is_initialized() {
         accs.signature_set.signatures = vec![[0u8; 65]; 19];
         accs.signature_set.guardian_set_index = accs.guardian_set.index;
         accs.signature_set.hash = data.hash;
-
-        accs.signature_set
-            .verify_derivation(ctx.program_id, &(&*accs).into())?;
-
-        accs.signature_set.create(&(&*accs).into(), ctx, accs.payer.key, Exempt)?;
+        accs.signature_set.create(&msg_hash.into(), ctx, accs.payer.key, Exempt)?;
     } else {
-        accs.signature_set
-            .verify_derivation(ctx.program_id, &(&*accs).into())?;
-
         // If the account already existed, check that the parameters match
         if accs.signature_set.guardian_set_index != accs.guardian_set.index {
             return Err(GuardianSetMismatch.into());
         }
+
         if accs.signature_set.hash != data.hash {
             return Err(InvalidHash.into());
         }

solana/bridge/program/src/client_instructions.rs

@@ -31,7 +31,7 @@ use crate::{
         Sequence,
         SequenceDerivationData,
         SignatureSet,
-        SignaturesSetDerivationData,
+        SignatureSetDerivationData,
     },
     types::PostedMessage,
     BridgeConfig,
@@ -133,7 +133,7 @@ pub fn verify_signatures(
     );
 
     let signature_set = SignatureSet::<'_, { AccountState::Uninitialized }>::key(
-        &SignaturesSetDerivationData { hash },
+        &SignatureSetDerivationData { hash },
         &program_id,
     );
 
@@ -181,7 +181,7 @@ pub fn post_vaa(
     );
 
     let signature_set = SignatureSet::<'_, { AccountState::Uninitialized }>::key(
-        &SignaturesSetDerivationData { hash },
+        &SignatureSetDerivationData { hash },
         &program_id,
     );