wallclock as ms

programs/validator-history/src/instructions/copy_gossip_contact_info.rs

@@ -65,8 +65,9 @@ pub fn handler(ctx: Context<CopyGossipContactInfo>) -> Result<()> {
         return Err(ValidatorHistoryError::GossipDataInvalid.into());
     }
 
-    // Timestamp can't be too far in the future or this upload will be stuck. Allows 10 minutes of buffer
-    if last_signed_ts
+    // Timestamp can't be too far in the future or this upload will be stuck. Allows 10 minutes of buffer.
+    // last_signed_ts is in ms, clock.unix_timestamp is in seconds
+    if last_signed_ts / 1000
         > clock
             .unix_timestamp
             .checked_add(600)

tests/tests/test_gossip.rs

@@ -332,7 +332,7 @@ async fn test_gossip_timestamps() {
     };
 
     let clock: Clock = banks_client.get_sysvar().await.unwrap();
-    let wallclock = clock.unix_timestamp as u64;
+    let wallclock = clock.unix_timestamp as u64 * 1000;
     let mut contact_info = ContactInfo::new(fixture.identity_keypair.pubkey(), wallclock, 0);
     let ipv4 = Ipv4Addr::new(1, 2, 3, 4);
     let ip = IpAddr::V4(ipv4);
@@ -395,7 +395,7 @@ async fn test_gossip_timestamps() {
         .await;
 
     // ContactInfo with 11 minutes in the future wallclock - will fail
-    contact_info.set_wallclock(wallclock + 11 * 60);
+    contact_info.set_wallclock(wallclock + 11 * 60 * 1000);
     let crds_data = CrdsData::ContactInfo(contact_info.clone());
     let transaction = create_gossip_tx(&fixture, &crds_data);