@stellar-expert/tx-meta-effects-parser 8.1.0 → 8.2.0

package/package.json

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

package/src/effects-analyzer.js

@@ -6,8 +6,7 @@ const {
     xdrParseAsset,
     xdrParseAccountAddress,
     xdrParseScVal,
-    xdrParseSacBalance,
-    xdrParseTokenBalance
+    xdrParseSacBalanceChange
 } = require('./parser/tx-xdr-parser-utils')
 const {contractIdFromPreimage} = require('./parser/contract-preimage-encoder')
 const {generateContractCodeEntryHash} = require('./parser/ledger-key')
@@ -885,14 +884,12 @@ class EffectsAnalyzer {
                 break
         }
         this.addEffect(effect)
-        const tokenBalance = xdrParseTokenBalance(effect)
+        const tokenBalance = xdrParseSacBalanceChange(effect.type, key, after?.value, before?.value)
         if (tokenBalance) {
             const balanceEffects = this.effects.filter(e => e.source === tokenBalance.address &&
                 (e.type === effectTypes.accountCredited || e.type === effectTypes.accountDebited) &&
                 (e.asset === effect.owner || e.asset === this.sacMap?.get(effect.owner)))
-            if (balanceEffects.length !== 1)
-                return //we can set balance only when we found 1-1 mapping, if there are several balance changes, we can't establish balance relation
-            balanceEffects[0].balance = tokenBalance.balance //set transfer effect balance
+            balanceEffects[balanceEffects.length - 1].balance = tokenBalance.balance //set latest transfer effect balance
         }
     }
 

package/src/parser/tx-xdr-parser-utils.js

@@ -293,7 +293,7 @@ function xdrParseScVal(value, treatBytesAsContractId = false) {
     }
 }
 
-function xdrParseTokenBalance({type, key, value}) {
+function xdrParseSacBalanceChange(changeEventType, key, value) {
     const parsedKey = xdr.ScVal.fromXDR(key, 'base64')
     if (parsedKey._arm !== 'vec')
         return null
@@ -302,20 +302,25 @@ function xdrParseTokenBalance({type, key, value}) {
         return null
     if (keyParts[0]._arm !== 'sym' || keyParts[1]._arm !== 'address' || keyParts[0]._value.toString() !== 'Balance')
         return null
-    let balance = '0'
-    if (type !== effectTypes.contractDataRemoved) { //TODO: handle evicted entries separately
-        const xdrVal = xdr.ScVal.fromXDR(value, 'base64')
-        if (xdrVal._arm !== 'map')
-            return null
-        const parsedValue = xdrParseScVal(xdrVal)
-        if (typeof parsedValue.amount !== 'string')
-            return null
-        balance = parsedValue.amount
-    }
-    return {
+    const res = {
         address: xdrParseScVal(keyParts[1]),
-        balance
+        balance: changeEventType===effectTypes.contractDataRemoved?
+            '0':
+            retrieveBalanceFromStateData(value)
     }
+    if (res.balance === undefined)
+        return null
+    return res
+}
+
+function retrieveBalanceFromStateData(value) {
+    const xdrVal = xdr.ScVal.fromXDR(value, 'base64')
+    if (xdrVal._arm !== 'map')
+        return undefined
+    const parsedValue = xdrParseScVal(xdrVal)
+    if (typeof parsedValue.amount !== 'string')
+        return undefined
+    return parsedValue.amount
 }
 
 module.exports = {
@@ -329,5 +334,5 @@ module.exports = {
     xdrParseSignerKey,
     xdrParsePrice,
     xdrParseScVal,
-    xdrParseTokenBalance
+    xdrParseSacBalanceChange
 }