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

package/package.json

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

package/src/aggregation/events-analyzer.js

@@ -1,6 +1,7 @@
 const {StrKey} = require('@stellar/stellar-base')
 const effectTypes = require('../effect-types')
 const {xdrParseScVal, xdrParseAsset, isContractAddress} = require('../parser/tx-xdr-parser-utils')
+const {contractIdFromPreimage} = require('../parser/contract-preimage-encoder')
 const {mapSacContract} = require('./sac-contract-mapper')
 
 const EVENT_TYPES = {
@@ -64,15 +65,18 @@ class EventsAnalyzer {
         const {diagnosticEvents, processSystemEvents} = this.effectsAnalyzer
         if (!diagnosticEvents)
             return
+        const opContractId = retrieveOpContractId(this.effectsAnalyzer.operation, this.effectsAnalyzer.network)
         //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)
         }
     }
 
@@ -301,4 +305,18 @@ function processEventBodyValue(value) {
     return xdrParseScVal(value) //other scValue
 }
 
+function retrieveOpContractId(operation, network) {
+    const funcValue = operation.func._value._attributes
+    if (!funcValue)
+        return null //WASM upload
+    let address = funcValue.contractAddress?._value
+    if (!address) {
+        const preimage = funcValue.contractIdPreimage
+        if (preimage) {
+            address = contractIdFromPreimage(preimage, network)
+        }
+    }
+    return address
+}
+
 module.exports = EventsAnalyzer