Fix merge

core/payment-driver/base/src/driver.rs

@@ -141,8 +141,16 @@ pub trait PaymentDriver {
         let s: [u8; 32] = msg.signature[33..65].try_into().unwrap();
         let signature = Signature { v, r, s };
 
-        let payload = if msg.canonicalized {
-            utils::payment_hash_canonicalized(&msg.payment)
+        let payload = if let Some(payload) = msg.canonical {
+            match msg.payment.verify_canonical(payload.as_slice()) {
+                Ok(_) => prepare_signature_hash(&payload),
+                Err(e) => {
+                    log::info!(
+                        "Signature verification: canonical representation doesn't match struct: {e}"
+                    );
+                    return Ok(false);
+                }
+            }
         } else {
             // Backward compatibility version for older Nodes that don't send canonical
             // signed bytes and used Payment debug formatting as representation.

core/payment/src/lib.rs

@@ -61,7 +61,8 @@ impl PaymentService {
         let config = Arc::new(Config::from_env()?);
 
         let processor = Arc::new(PaymentProcessor::new(db.clone()));
-        self::service::bind_service(&db, processor.clone(), BindOptions::default(), config);
+        self::service::bind_service(&db, processor.clone(), config);
+
         processor.process_post_migration_jobs().await?;
 
         tokio::task::spawn(async move {

core/payment/src/processor.rs

@@ -26,7 +26,7 @@ use std::ops::Sub;
 use std::str::FromStr;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
-use std::time::Duration;
+use std::time::{Duration, Instant};
 use thiserror::Error;
 use tokio::sync::{Mutex, RwLock};