@stellar-expert/tx-meta-effects-parser 5.5.2 → 5.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar-expert/tx-meta-effects-parser",
-  "version": "5.5.2",
+  "version": "5.5.4",
   "description": "Low-level effects parser for Stellar transaction results and meta XDR",
   "main": "src/index.js",
   "scripts": {

package/src/aggregation/events-analyzer.js

@@ -64,15 +64,18 @@ class EventsAnalyzer {
         const {diagnosticEvents, processSystemEvents} = this.effectsAnalyzer
         if (!diagnosticEvents)
             return
+        const opContractId = this.effectsAnalyzer.retrieveOpContractId()
         //diagnostic events
         for (const evt of diagnosticEvents) {
             if (!processSystemEvents && !evt.inSuccessfulContractCall())
                 continue //throw new UnexpectedTxMetaChangeError({type: 'diagnostic_event', action: 'failed'})
             //parse event
             const event = evt.event()
-            const contractId = event.contractId() //contract id attached to the event itself
-                || this.effectsAnalyzer.operation.func._value.contractAddress()._value //retrieve from the operation
-            this.processDiagnosticEvent(event.body().value(), event.type().value, contractId ? StrKey.encodeContract(contractId) : null)
+            let contractId = event.contractId() || opContractId //contract id may be attached to the event itself, otherwise use contract from operation
+            if (contractId && typeof contractId !== 'string') {
+                contractId = StrKey.encodeContract(contractId)
+            }
+            this.processDiagnosticEvent(event.body().value(), event.type().value, contractId)
         }
     }
 

package/src/effects-analyzer.js

@@ -194,8 +194,7 @@ class EffectsAnalyzer {
                 refundable: parseLargeInt(attrs.totalRefundableResourceFeeCharged),
                 rent: parseLargeInt(attrs.rentFeeCharged)
             }
-            const contract = StrKey.encodeContract(this.operation.func._value.contractAddress()._value)
-            this.addMetric(contract, 'fee', fee)
+            this.addMetric(this.retrieveOpContractId(), 'fee', fee)
         }
     }
 
@@ -911,6 +910,18 @@ class EffectsAnalyzer {
                     throw new UnexpectedTxMetaChangeError(change)
             }
     }
+
+    retrieveOpContractId() {
+        const funcValue = this.operation.func._value._attributes
+        if (funcValue) {
+            if (funcValue.contractAddress)
+                return StrKey.encodeContract(funcValue.contractAddress._value)
+            const preimage = funcValue.contractIdPreimage
+            if (preimage)
+                return contractIdFromPreimage(preimage, this.network)
+        }
+        return null
+    }
 }
 
 /**