From fecf3e67313322780ed0b1f93ef41a069039b451 Mon Sep 17 00:00:00 2001
From: Lukasz Klimek <842586+lklimek@users.noreply.github.com>
Date: Wed, 29 Oct 2025 15:19:22 +0100
Subject: [PATCH 1/3] fix(dapi): broadcast errors displayed as consensus error

---
 .../services/platform_service/error_mapping.rs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/rs-dapi/src/services/platform_service/error_mapping.rs b/packages/rs-dapi/src/services/platform_service/error_mapping.rs
index c2cdf252d9..ecac28bc54 100644
--- a/packages/rs-dapi/src/services/platform_service/error_mapping.rs
+++ b/packages/rs-dapi/src/services/platform_service/error_mapping.rs
@@ -139,9 +139,25 @@ impl From<TenderdashStatus> for tonic::Response<WaitForStateTransitionResultResp
 
 impl From<TenderdashStatus> for StateTransitionBroadcastError {
     fn from(err: TenderdashStatus) -> Self {
+        let message = if let Some(msg) = err.message {
+            msg
+        } else {
+            // try to extract from consensus error
+            if let Some(consensus_error_bytes) = &err.consensus_error
+                && let Ok(consensus_error) =
+                    ConsensusError::deserialize_from_bytes(consensus_error_bytes).inspect_err(|e| {
+                        tracing::debug!("Failed to deserialize consensus error: {}", e);
+                    })
+            {
+                consensus_error.to_string()
+            } else {
+                "Unknown error".to_string()
+            }
+        };
+
         StateTransitionBroadcastError {
             code: err.code.clamp(0, u32::MAX as i64) as u32,
-            message: err.message.unwrap_or_else(|| "Unknown error".to_string()),
+            message,
             data: err.consensus_error.clone().unwrap_or_default(),
         }
     }

From b4408a5b1918078404263832ec6ee5b35175b8a7 Mon Sep 17 00:00:00 2001
From: Lukasz Klimek <842586+lklimek@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:46:30 +0100
Subject: [PATCH 2/3] test: data contract with wrong position

---
 .../functional/platform/DataContract.spec.js  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/platform-test-suite/test/functional/platform/DataContract.spec.js b/packages/platform-test-suite/test/functional/platform/DataContract.spec.js
index 348740129b..5329a6a7e6 100644
--- a/packages/platform-test-suite/test/functional/platform/DataContract.spec.js
+++ b/packages/platform-test-suite/test/functional/platform/DataContract.spec.js
@@ -59,6 +59,31 @@ describe('Platform', () => {
       expect(broadcastError.getCause()).to.be.an.instanceOf(IdentityNotFoundError);
     });
 
+    it('should expose validation error when document property positions are not contiguous', async () => {
+      // Additional wait time to mitigate testnet latency
+      await waitForSTPropagated();
+
+      const identityNonce = await client.platform.nonceManager
+        .bumpIdentityNonce(identity.getId());
+      const invalidDataContract = await getDataContractFixture(identityNonce, identity.getId());
+
+      const documentSchema = invalidDataContract.getDocumentSchema('niceDocument');
+      documentSchema.properties.name.position = 5;
+      invalidDataContract.setDocumentSchema('niceDocument', documentSchema);
+
+      let broadcastError;
+
+      try {
+        await client.platform.contracts.publish(invalidDataContract, identity);
+      } catch (e) {
+        broadcastError = e;
+      }
+
+      expect(broadcastError).to.be.an.instanceOf(StateTransitionBroadcastError);
+      expect(broadcastError.getCode()).to.equal(10411);
+      expect(broadcastError.getMessage()).to.equal('position field is not present for document type "niceDocument"');
+    });
+
     it('should create new data contract with previously created identity as an owner', async () => {
       // Additional wait time to mitigate testnet latency
       await waitForSTPropagated();

From 9dcd3ba41d3219776b011e5cbca6e94fb0078e92 Mon Sep 17 00:00:00 2001
From: Lukasz Klimek <842586+lklimek@users.noreply.github.com>
Date: Thu, 30 Oct 2025 14:57:41 +0100
Subject: [PATCH 3/3] test: fix failing test

---
 .../test/functional/platform/DataContract.spec.js               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/platform-test-suite/test/functional/platform/DataContract.spec.js b/packages/platform-test-suite/test/functional/platform/DataContract.spec.js
index 5329a6a7e6..18cf12f113 100644
--- a/packages/platform-test-suite/test/functional/platform/DataContract.spec.js
+++ b/packages/platform-test-suite/test/functional/platform/DataContract.spec.js
@@ -69,7 +69,7 @@ describe('Platform', () => {
 
       const documentSchema = invalidDataContract.getDocumentSchema('niceDocument');
       documentSchema.properties.name.position = 5;
-      invalidDataContract.setDocumentSchema('niceDocument', documentSchema);
+      invalidDataContract.setDocumentSchema('niceDocument', documentSchema, { skipValidation: true });
 
       let broadcastError;