Simplify signatures of calls using only payment id

virto-network · Feb 14, 2024 · b94ee4c · b94ee4c
1 parent fbea3ef
commit b94ee4c
Show file tree

Hide file tree

Showing 10 changed files with 273 additions and 321 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 bs58 = { version = "0.5.0", default-features = false }
 wasm-bindgen = { version = "0.2.87", optional = true }
 
+pallet-payments = { workspace = true, optional = true }
 frame-support = { workspace = true, optional = true }
 parity-scale-codec = { workspace = true, optional = true }
 scale-info = { workspace = true, optional = true }
@@ -19,4 +20,9 @@ default = ["runtime"]
 alloc = []
 js = ["alloc", "wasm-bindgen"]
 nightly = []
-runtime = ["dep:frame-support", "dep:parity-scale-codec", "dep:scale-info"]
+runtime = [
+  "dep:frame-support", 
+  "dep:parity-scale-codec", 
+  "dep:scale-info",
+  "dep:pallet-payments",
+]
diff --git a/common/src/payment_id.rs b/common/src/payment_id.rs
@@ -3,7 +3,16 @@ use wasm_bindgen::prelude::*;
 
 /// A compact identifier for payment
 #[cfg_attr(feature = "js", wasm_bindgen)]
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Eq, Copy, PartialEq)]
+#[cfg_attr(
+	feature = "runtime",
+	derive(
+		parity_scale_codec::Encode,
+		parity_scale_codec::Decode,
+		parity_scale_codec::MaxEncodedLen,
+		scale_info::TypeInfo,
+	)
+)]
 #[repr(C)]
 pub struct PaymentId {
 	prefix: [u8; 2],