update unique constraint

tari-project · May 3, 2024 · c719df1 · c719df1
1 parent e378ebf
commit c719df1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/dan_layer/epoch_manager/src/base_layer/base_layer_epoch_manager.rs b/dan_layer/epoch_manager/src/base_layer/base_layer_epoch_manager.rs
@@ -349,7 +349,12 @@ impl<TAddr: NodeAddressable + DerivableFromPublicKey>
         let vn = self
             .global_db
             .validator_nodes(&mut tx)
-            .get_by_public_key(start_epoch, end_epoch, public_key)
+            .get_by_public_key(
+                start_epoch,
+                end_epoch,
+                public_key,
+                self.config.validator_node_sidechain_id.as_ref(),
+            )
             .optional()?;
 
         Ok(vn)
@@ -388,7 +393,12 @@ impl<TAddr: NodeAddressable + DerivableFromPublicKey>
             let vn = self
                 .global_db
                 .validator_nodes(&mut tx)
-                .get_by_public_key(start_epoch, end_epoch, &public_key)
+                .get_by_public_key(
+                    start_epoch,
+                    end_epoch,
+                    &public_key,
+                    self.config.validator_node_sidechain_id.as_ref(),
+                )
                 .optional()?
                 .ok_or_else(|| EpochManagerError::ValidatorNodeNotRegistered {
                     address: public_key.to_string(),

diff --git a/dan_layer/storage/src/global/backend_adapter.rs b/dan_layer/storage/src/global/backend_adapter.rs
@@ -108,6 +108,7 @@ pub trait GlobalDbAdapter: AtomicDb + Send + Sync + Clone {
         start_epoch: Epoch,
         end_epoch: Epoch,
         public_key: &PublicKey,
+        sidechain_id: Option<&PublicKey>,
     ) -> Result<ValidatorNode<Self::Addr>, Self::Error>;
     fn validator_nodes_count(
         &self,

diff --git a/dan_layer/storage/src/global/validator_node_db.rs b/dan_layer/storage/src/global/validator_node_db.rs
@@ -79,9 +79,10 @@ impl<'a, 'tx, TGlobalDbAdapter: GlobalDbAdapter> ValidatorNodeDb<'a, 'tx, TGloba
         start_epoch: Epoch,
         end_epoch: Epoch,
         public_key: &PublicKey,
+        sidechain_id: Option<&PublicKey>,
     ) -> Result<ValidatorNode<TGlobalDbAdapter::Addr>, TGlobalDbAdapter::Error> {
         self.backend
-            .get_validator_node_by_public_key(self.tx, start_epoch, end_epoch, public_key)
+            .get_validator_node_by_public_key(self.tx, start_epoch, end_epoch, public_key, sidechain_id)
             .map_err(TGlobalDbAdapter::Error::into)
     }
 

diff --git a/dan_layer/storage_sqlite/src/global/backend_adapter.rs b/dan_layer/storage_sqlite/src/global/backend_adapter.rs
@@ -30,7 +30,7 @@ use std::{
 
 use diesel::{
     sql_query,
-    sql_types::{BigInt, Bigint},
+    sql_types::{BigInt, Bigint, Binary},
     ExpressionMethods,
     JoinOnDsl,
     NullableExpressionMethods,
@@ -378,9 +378,9 @@ impl<TAddr: NodeAddressable> GlobalDbAdapter for SqliteGlobalDbAdapter<TAddr> {
                 validator_nodes::shard_key.eq(shard_key.as_bytes()),
                 validator_nodes::epoch.eq(epoch.as_u64() as i64),
                 validator_nodes::fee_claim_public_key.eq(ByteArray::as_bytes(&fee_claim_public_key)),
-                validator_nodes::sidechain_id.eq(sidechain_id.as_ref().map(|id| id.as_bytes())),
+                validator_nodes::sidechain_id.eq(sidechain_id.as_ref().map(|id| id.as_bytes()).unwrap_or(&[0u8; 32])),
             ))
-            .on_conflict(validator_nodes::public_key)
+            .on_conflict((validator_nodes::public_key, validator_nodes::sidechain_id))
             .do_update()
             .set((
                 validator_nodes::address.eq(&addr),
@@ -404,6 +404,7 @@ impl<TAddr: NodeAddressable> GlobalDbAdapter for SqliteGlobalDbAdapter<TAddr> {
         start_epoch: Epoch,
         end_epoch: Epoch,
         public_key: &PublicKey,
+        sidechain_id: Option<&PublicKey>,
     ) -> Result<ValidatorNode<Self::Addr>, Self::Error> {
         use crate::global::schema::{committees, validator_nodes};
 
@@ -424,6 +425,9 @@ impl<TAddr: NodeAddressable> GlobalDbAdapter for SqliteGlobalDbAdapter<TAddr> {
             )
             .filter(coalesce_bigint(committees::epoch.nullable(), validator_nodes::epoch).le(end_epoch.as_u64() as i64))
             .filter(validator_nodes::public_key.eq(ByteArray::as_bytes(public_key)))
+            .filter(
+                validator_nodes::sidechain_id.eq(sidechain_id.map(|id| ByteArray::as_bytes(id)).unwrap_or(&[0u8; 32])),
+            )
             .order_by(committees::epoch.desc())
             .first::<DbValidatorNode>(tx.connection())
             .map_err(|source| SqliteStorageError::DieselError {