post-rebasing fixes

common/gateway-storage/src/models.rs

@@ -33,7 +33,7 @@ impl TryFrom<PersistedSharedKeys> for SharedGatewayKey {
             &value.derived_aes256_gcm_siv_key,
             &value.derived_aes128_ctr_blake3_hmac_keys_bs58,
         ) {
-            (None, None) => Err(StorageError::MissingSharedKey { id: value.id }),
+            (None, None) => Err(StorageError::MissingSharedKey { id: value.client_id }),
             (Some(aes256gcm_siv), _) => {
                 let current_key = SharedSymmetricKey::try_from_bytes(aes256gcm_siv)
                     .map_err(|source| StorageError::DataCorruption(source.to_string()))?;

common/gateway-storage/src/shared_keys.rs

@@ -48,7 +48,7 @@ impl SharedKeysManager {
         // we don't want to be using `INSERT OR REPLACE INTO` due to the foreign key on `available_bandwidth` if the entry already exists
         sqlx::query!(
             r#"
-                INSERT OR IGNORE INTO shared_keys(client_id, client_address_bs58, derived_aes128_ctr_blake3_hmac_keys_bs58, derived_aes256_gcm_siv_key) VALUES (?, ?, ?);
+                INSERT OR IGNORE INTO shared_keys(client_id, client_address_bs58, derived_aes128_ctr_blake3_hmac_keys_bs58, derived_aes256_gcm_siv_key) VALUES (?, ?, ?, ?);
 
                 UPDATE shared_keys
                 SET