From e538e5d1e9e939d24019a30d35755f4056fc970d Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Tue, 28 Jan 2025 11:07:35 +1000
Subject: [PATCH] Fix balance overflow and invalid messenger channel error code
 clash

---
 crates/sp-domains-fraud-proof/src/lib.rs | 3 +++
 domains/pallets/messenger/src/lib.rs     | 6 +++++-
 domains/primitives/runtime/src/lib.rs    | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/crates/sp-domains-fraud-proof/src/lib.rs b/crates/sp-domains-fraud-proof/src/lib.rs
index ba5df2abe1..a216bcd5ad 100644
--- a/crates/sp-domains-fraud-proof/src/lib.rs
+++ b/crates/sp-domains-fraud-proof/src/lib.rs
@@ -61,6 +61,9 @@ use subspace_core_primitives::U256;
 use subspace_runtime_primitives::{Balance, Moment};
 
 /// Custom invalid validity code for the extrinsics in pallet-domains.
+// When updating these error codes, check for clashes between:
+// <https://github.com/autonomys/subspace/blob/main/domains/primitives/runtime/src/lib.rs#L85-L88>
+// <https://github.com/autonomys/subspace/blob/main/domains/pallets/messenger/src/lib.rs#L49-L53>
 #[repr(u8)]
 pub enum InvalidTransactionCode {
     TransactionProof = 101,
diff --git a/domains/pallets/messenger/src/lib.rs b/domains/pallets/messenger/src/lib.rs
index 4fa397b3c1..c7fac2515c 100644
--- a/domains/pallets/messenger/src/lib.rs
+++ b/domains/pallets/messenger/src/lib.rs
@@ -47,9 +47,13 @@ use sp_runtime::traits::{Extrinsic, Hash};
 use sp_runtime::DispatchError;
 
 pub(crate) mod verification_errors {
-    pub(crate) const INVALID_CHANNEL: u8 = 200;
+    // When updating these error codes, check for clashes between:
+    // <https://github.com/autonomys/subspace/blob/main/domains/primitives/runtime/src/lib.rs#L85-L88>
+    // <https://github.com/autonomys/subspace/blob/main/crates/sp-domains-fraud-proof/src/lib.rs#L49-L64>
     pub(crate) const INVALID_NONCE: u8 = 201;
     pub(crate) const NONCE_OVERFLOW: u8 = 202;
+    // This error code was previously 200, but that clashed with ERR_BALANCE_OVERFLOW.
+    pub(crate) const INVALID_CHANNEL: u8 = 203;
 }
 
 #[derive(Debug, Encode, Decode, Clone, Eq, PartialEq, TypeInfo, Copy)]
diff --git a/domains/primitives/runtime/src/lib.rs b/domains/primitives/runtime/src/lib.rs
index 8dd03603db..9ca66b2289 100644
--- a/domains/primitives/runtime/src/lib.rs
+++ b/domains/primitives/runtime/src/lib.rs
@@ -89,6 +89,10 @@ pub fn maximum_domain_block_weight() -> Weight {
     weight.set_proof_size(consensus_maximum_normal_block_length)
 }
 
+// When updating these error codes, check for clashes between:
+// <https://github.com/autonomys/subspace/blob/main/crates/sp-domains-fraud-proof/src/lib.rs#L49-L64>
+// <https://github.com/autonomys/subspace/blob/main/domains/pallets/messenger/src/lib.rs#L49-L53>
+
 /// Custom error when nonce overflow occurs.
 pub const ERR_NONCE_OVERFLOW: u8 = 100;
 /// Custom error when balance overflow occurs.