solana: add endpoint_payload to EndpointMessage

Author: kcsongor

solana/programs/example-native-token-transfers/src/instructions/release_outbound.rs

@@ -103,6 +103,7 @@ pub fn release_outbound(ctx: Context<ReleaseOutbound>, args: ReleaseOutboundArgs
                 to_chain: accs.outbox_item.recipient_chain,
             },
         },
+        vec![],
     );
 
     if accs.wormhole_bridge.fee() > 0 {

solana/programs/example-native-token-transfers/src/messages.rs

@@ -182,6 +182,7 @@ pub struct EndpointMessage<E: Endpoint, A: AnchorDeserialize + AnchorSerialize +
     _phantom: PhantomData<E>,
     // TODO: check sibling registration at the manager level
     pub message_data: EndpointMessageData<A>,
+    pub endpoint_payload: Vec<u8>,
 }
 
 impl<E: Endpoint, A: AnchorDeserialize + AnchorSerialize + Space + Clone> std::ops::Deref
@@ -244,6 +245,7 @@ where
                 source_manager: self.source_manager,
                 manager_payload: self.manager_payload.clone(),
             },
+            endpoint_payload: self.endpoint_payload.clone(),
         }
     }
 }
@@ -252,13 +254,18 @@ impl<E: Endpoint, A> EndpointMessage<E, A>
 where
     A: AnchorDeserialize + AnchorSerialize + Space + Clone,
 {
-    pub fn new(source_manager: [u8; 32], manager_payload: ManagerMessage<A>) -> Self {
+    pub fn new(
+        source_manager: [u8; 32],
+        manager_payload: ManagerMessage<A>,
+        endpoint_payload: Vec<u8>,
+    ) -> Self {
         Self {
             _phantom: PhantomData,
             message_data: EndpointMessageData {
                 source_manager,
                 manager_payload,
             },
+            endpoint_payload,
         }
     }
 }
@@ -294,8 +301,15 @@ where
         // consumes the expected amount of bytes
         let _manager_payload_len: u16 = Readable::read(reader)?;
         let manager_payload = ManagerMessage::read(reader)?;
-
-        Ok(EndpointMessage::new(source_manager, manager_payload))
+        let endpoint_payload_len: u16 = Readable::read(reader)?;
+        let mut endpoint_payload = vec![0; endpoint_payload_len as usize];
+        reader.read_exact(&mut endpoint_payload)?;
+
+        Ok(EndpointMessage::new(
+            source_manager,
+            manager_payload,
+            endpoint_payload,
+        ))
     }
 }
 
@@ -321,6 +335,7 @@ where
                     source_manager,
                     manager_payload,
                 },
+            endpoint_payload,
         } = self;
 
         E::PREFIX.write(writer)?;
@@ -331,7 +346,11 @@ where
         // a better API would be
         // foo.write_with_prefix_be::<u16>(writer)
         // which writes the length as a big endian u16.
-        manager_payload.write(writer)
+        manager_payload.write(writer)?;
+        let len: u16 = u16::try_from(endpoint_payload.len()).expect("u16 overflow");
+        len.write(writer)?;
+        writer.write_all(endpoint_payload)?;
+        Ok(())
     }
 }
 
@@ -376,7 +395,7 @@ mod test {
     //
     #[test]
     fn test_deserialize_endpoint_message() {
-        let data = hex::decode("9945ff10042942fafabe00000000000000000000000000000000000000000000000000000079000000367999a1014667921341234300000000000000000000000000000000000000000000000000004f994e545407000000000012d687beefface00000000000000000000000000000000000000000000000000000000feebcafe000000000000000000000000000000000000000000000000000000000011").unwrap();
+        let data = hex::decode("9945ff10042942fafabe00000000000000000000000000000000000000000000000000000079000000367999a1014667921341234300000000000000000000000000000000000000000000000000004f994e545407000000000012d687beefface00000000000000000000000000000000000000000000000000000000feebcafe0000000000000000000000000000000000000000000000000000000000110000").unwrap();
         let mut vec = &data[..];
         let message: EndpointMessage<WormholeEndpoint, NativeTokenTransfer> =
             TypePrefixedPayload::read_payload(&mut vec).unwrap();
@@ -411,6 +430,7 @@ mod test {
                     },
                 },
             },
+            endpoint_payload: vec![],
         };
         assert_eq!(message, expected);
         assert_eq!(vec.len(), 0);

solana/programs/example-native-token-transfers/tests/cancel_flow.rs

@@ -116,7 +116,7 @@ async fn post_transfer_vaa(
         },
     };
     let endpoint_message: EndpointMessage<WormholeEndpoint, NativeTokenTransfer> =
-        EndpointMessage::new(OTHER_MANAGER, manager_message.clone());
+        EndpointMessage::new(OTHER_MANAGER, manager_message.clone(), vec![]);
 
     let vaa = Vaa {
         version: 1,

solana/programs/example-native-token-transfers/tests/sdk/accounts.rs

@@ -101,14 +101,11 @@ impl NTT {
         manager_message: ManagerMessage<NativeTokenTransfer>,
     ) -> Pubkey {
         let mut hasher = Keccak256::new();
-        hasher.update(&chain.to_be_bytes());
+        hasher.update(chain.to_be_bytes());
         hasher.update(&TypePrefixedPayload::to_vec_payload(&manager_message));
 
         let (inbox_item, _) = Pubkey::find_program_address(
-            &[
-                InboxItem::SEED_PREFIX,
-                &hasher.finalize(),
-            ],
+            &[InboxItem::SEED_PREFIX, &hasher.finalize()],
             &self.program,
         );
         inbox_item

solana/programs/example-native-token-transfers/tests/transfer.rs

@@ -185,7 +185,8 @@ async fn test_transfer(ctx: &mut ProgramTestContext, test_data: &TestData, mode:
                     to: [1u8; 32],
                     to_chain: ChainId { id: 2 },
                 }
-            }
+            },
+            vec![]
         )
     );
 

solana/tests/example-native-token-transfer.ts

@@ -159,8 +159,9 @@ describe('example-native-token-transfers', () => {
             new NormalizedAmount(BigInt(10000), 8),
             toChainId('solana'),
             user.publicKey.toBuffer()
-          )
-        )
+          ),
+        ),
+        endpointPayload: Buffer.alloc(0)
       }
 
       const serialized = WormholeEndpointMessage.serialize(sendingEndpointMessage, a => ManagerMessage.serialize(a, NativeTokenTransfer.serialize))

solana/ts/sdk/payloads/common.ts

@@ -5,10 +5,12 @@ export class EndpointMessage<A> {
   static prefix: Buffer
   sourceManager: Buffer
   managerPayload: ManagerMessage<A>
+  endpointPayload: Buffer
 
-  constructor(sourceManager: Buffer, managerPayload: ManagerMessage<A>) {
+  constructor(sourceManager: Buffer, managerPayload: ManagerMessage<A>, endpointPayload: Buffer) {
     this.sourceManager = sourceManager
     this.managerPayload = managerPayload
+    this.endpointPayload = endpointPayload
   }
 
   static deserialize<A>(data: Buffer, deserializer: (data: Buffer) => ManagerMessage<A>): EndpointMessage<A> {
@@ -22,13 +24,17 @@ export class EndpointMessage<A> {
     const sourceManager = data.subarray(4, 36)
     const managerPayloadLen = data.readUInt16BE(36)
     const managerPayload = deserializer(data.subarray(38, 38 + managerPayloadLen))
-    return new EndpointMessage(sourceManager, managerPayload)
+    const endpointPayloadLen = data.readUInt16BE(38 + managerPayloadLen)
+    const endpointPayload = data.subarray(40 + managerPayloadLen, 40 + managerPayloadLen + endpointPayloadLen)
+    return new EndpointMessage(sourceManager, managerPayload, endpointPayload)
   }
 
   static serialize<A>(msg: EndpointMessage<A>, serializer: (payload: ManagerMessage<A>) => Buffer): Buffer {
     const payload = serializer(msg.managerPayload)
     assert(msg.sourceManager.length == 32, 'sourceManager must be 32 bytes')
-    const buffer = Buffer.concat([this.prefix, msg.sourceManager, new BN(payload.length).toBuffer('be', 2), payload])
+    const payloadLen = new BN(payload.length).toBuffer('be', 2)
+    const endpointPayloadLen = new BN(msg.endpointPayload.length).toBuffer('be', 2)
+    const buffer = Buffer.concat([this.prefix, msg.sourceManager, payloadLen, payload, endpointPayloadLen, msg.endpointPayload])
     return buffer
   }
 }