Fix OracleEvent.validate() for signed numeric events

p2pderivatives · Oct 30, 2024 · fe1fb50 · fe1fb50
1 parent 965b12e
commit fe1fb50
Showing 1 changed file with 27 additions and 2 deletions.
diff --git a/dlc-messages/src/oracle_msgs.rs b/dlc-messages/src/oracle_msgs.rs
@@ -220,7 +220,13 @@ impl OracleEvent {
     pub fn validate(&self) -> Result<(), Error> {
         let expected_nb_nonces = match &self.event_descriptor {
             EventDescriptor::EnumEvent(_) => 1,
-            EventDescriptor::DigitDecompositionEvent(d) => d.nb_digits as usize,
+            EventDescriptor::DigitDecompositionEvent(d) => {
+                if d.is_signed {
+                    d.nb_digits as usize + 1
+                } else {
+                    d.nb_digits as usize
+                }
+            }
         };
 
         if expected_nb_nonces == self.oracle_nonces.len() {
@@ -366,6 +372,16 @@ mod tests {
         }
     }
 
+    fn signed_digit_descriptor() -> DigitDecompositionEventDescriptor {
+        DigitDecompositionEventDescriptor {
+            base: 2,
+            is_signed: true,
+            unit: "kg/sats".to_string(),
+            precision: 1,
+            nb_digits: 10,
+        }
+    }
+
     fn some_schnorr_pubkey() -> XOnlyPublicKey {
         let key_pair = Keypair::new(SECP256K1, &mut thread_rng());
         XOnlyPublicKey::from_keypair(&key_pair).0
@@ -380,6 +396,15 @@ mod tests {
         }
     }
 
+    fn signed_digit_event(nb_nonces: usize) -> OracleEvent {
+        OracleEvent {
+            oracle_nonces: (0..nb_nonces).map(|_| some_schnorr_pubkey()).collect(),
+            event_maturity_epoch: 10,
+            event_descriptor: EventDescriptor::DigitDecompositionEvent(signed_digit_descriptor()),
+            event_id: "test-signed".to_string(),
+        }
+    }
+
     fn enum_event(nb_nonces: usize) -> OracleEvent {
         OracleEvent {
             oracle_nonces: (0..nb_nonces).map(|_| some_schnorr_pubkey()).collect(),
@@ -393,7 +418,7 @@ mod tests {
     fn valid_oracle_announcement_passes_validation_test() {
         let key_pair = Keypair::new(SECP256K1, &mut thread_rng());
         let oracle_pubkey = XOnlyPublicKey::from_keypair(&key_pair).0;
-        let events = [digit_event(10), enum_event(1)];
+        let events = [digit_event(10), signed_digit_event(11), enum_event(1)];
         for event in events {
             let mut event_hex = Vec::new();
             event