various pax things

server/src/instance.rs

@@ -530,13 +530,13 @@ pub fn instance_create(tx: &mut Transaction, instance: Instance) -> Result<Insta
     let instance_bytes = to_vec(&instance)?;
 
     let query = "
-        INSERT INTO instances (id, data)
-        VALUES ($1, $2)
+        INSERT INTO instances (id, data, upkeep)
+        VALUES ($1, $2, $3)
         RETURNING id;
     ";
 
     let result = tx
-        .query(query, &[&instance.id, &instance_bytes])?;
+        .query(query, &[&instance.id, &instance_bytes, &instance.phase_end])?;
 
     result.iter().next().ok_or(format_err!("no instances written"))?;
 

server/src/names.rs

@@ -1,7 +1,7 @@
 use rand::prelude::*;
 use rand::{thread_rng};
 
-const FIRSTS: [&'static str; 51] = [
+const FIRSTS: [&'static str; 52] = [
     "artificial",
     "ambient",
     "borean",
@@ -46,6 +46,7 @@ const FIRSTS: [&'static str; 51] = [
     "purified",
     "recalcitrant",
     "rogue",
+    "sealed",
     "subversive",
     "subterranean",
     "supercooled",
@@ -55,10 +56,12 @@ const FIRSTS: [&'static str; 51] = [
     "weary",
 ];
 
-const LASTS: [&'static str; 56] = [
+const LASTS: [&'static str; 58] = [
     "artifact",
     "assembly",
+    "antenna",
     "alloy",
+    "carrier",
     "carbon",
     "console",
     "construct",
@@ -88,6 +91,7 @@ const LASTS: [&'static str; 56] = [
     "mechanism",
     "mountain",
     "nectar",
+    "nebula",
     "oak",
     "oxide",
     "orbit",