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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar-expert/tx-meta-effects-parser",
-  "version": "5.5.3",
+  "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

@@ -1,7 +1,6 @@
 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 = {
@@ -65,7 +64,7 @@ class EventsAnalyzer {
         const {diagnosticEvents, processSystemEvents} = this.effectsAnalyzer
         if (!diagnosticEvents)
             return
-        const opContractId = retrieveOpContractId(this.effectsAnalyzer.operation, this.effectsAnalyzer.network)
+        const opContractId = this.effectsAnalyzer.retrieveOpContractId()
         //diagnostic events
         for (const evt of diagnosticEvents) {
             if (!processSystemEvents && !evt.inSuccessfulContractCall())
@@ -305,18 +304,4 @@ 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

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
+    }
 }
 
 /**