Merge pull request #4803 from zeeshanakram3/fix_sendExtrinsic_functio…

…n_for_finalized_txs Fix send extrinsic function for finalized txs
Joystream · Jul 18, 2023 · 9a35c55 · 9a35c55
2 parents 3b3dc09 + 048f23c
commit 9a35c55
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@joystream/cli",
   "description": "Command Line Interface for Joystream community and governance activities",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": "Leszek Wiesner",
   "bin": {
     "joystream-cli": "./bin/run"

diff --git a/cli/src/base/ApiCommandBase.ts b/cli/src/base/ApiCommandBase.ts
@@ -529,7 +529,7 @@ export default abstract class ApiCommandBase extends StateAwareCommandBase {
           return
         }
 
-        if (result.status.isInBlock) {
+        if (result.status.isInBlock || result.status.isFinalized) {
           unsubscribe()
           result.events
             .filter(({ event }) => event.section === 'system')

diff --git a/distributor-node/CHANGELOG.md b/distributor-node/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.2.2
+
+- **FIX** `sendExtrinsic`: The send extrinsic function (which is a wrapper around PolkadotJS `tx.signAndSend` function) has been fixed to handle the case when tx has been finalized before the callback registered in `tx.signAndSend` would run.
+
 ### 1.2.1
 
 - Integrates OpenTelemetry API/SDK with Argus for exporting improved tracing logs & metrics to Elasticsearch. Adds `./start-elasticsearch-stack.sh` script to bootstrap elasticsearch services (Elasticsearch + Kibana + APM Server) with all the required configurations.

diff --git a/distributor-node/package.json b/distributor-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@joystream/distributor-cli",
   "description": "Joystream distributor node CLI",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "author": "Joystream contributors",
   "bin": {
     "joystream-distributor": "./bin/run"

diff --git a/distributor-node/src/services/networking/runtime/api.ts b/distributor-node/src/services/networking/runtime/api.ts
@@ -110,7 +110,7 @@ export class RuntimeApi {
           return
         }
 
-        if (result.status.isInBlock) {
+        if (result.status.isInBlock || result.status.isFinalized) {
           unsubscribe()
           result.events
             .filter(({ event }) => event.section === 'system')

diff --git a/storage-node/CHANGELOG.md b/storage-node/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 3.5.1
+
+- **FIX** `sendExtrinsic`: The send extrinsic function (which is a wrapper around PolkadotJS `tx.signAndSend` function) has been fixed to handle the case when tx has been finalized before the callback registered in `tx.signAndSend` would run.
+
 ### 3.5.0
 
 - Integrates OpenTelemetry API/SDK with Colossus for exporting improved tracing logs & metrics to Elasticsearch. Adds `./start-elasticsearch-stack.sh` script to bootstrap elasticsearch services (Elasticsearch + Kibana + APM Server) with all the required configurations.

diff --git a/storage-node/package.json b/storage-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "storage-node",
   "description": "Joystream storage subsystem.",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "author": "Joystream contributors",
   "bin": {
     "storage-node": "./bin/run"

diff --git a/storage-node/src/services/runtime/api.ts b/storage-node/src/services/runtime/api.ts
@@ -99,7 +99,7 @@ async function sendExtrinsic(
         return
       }
 
-      if (result.status.isInBlock) {
+      if (result.status.isInBlock || result.status.isFinalized) {
         unsubscribe()
         result.events
           .filter(({ event }) => event.section === 'system')