@stellar-expert/tx-meta-effects-parser 5.6.1 → 5.6.3

package/package.json

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

package/src/aggregation/asset-supply-analyzer.js

@@ -50,9 +50,9 @@ class AssetSupplyAnalyzer {
                 this.supplyChanges |= 1
             }
         }
-        if ((this.supplyChanges & 3) === 3) { //analyze possible collapsible mints only if both mint and burn effects recorded
+        /*if ((this.supplyChanges & 3) === 3) { //analyze possible collapsible mints only if both mint and burn effects recorded
             new CollapsibleMintsAnalyzer(this.effectsAnalyzer).removeCollapsingMints()
-        }
+        }*/
     }
 
     /**
@@ -181,7 +181,7 @@ class CollapsibleMintsAnalyzer {
             if (sum > 0n) { //asset minted
                 this.effectsAnalyzer.mint(asset, sum.toString(), true) //insert mint effect
             } else if (sum < 0n) { //asset burned
-                this.effectsAnalyzer.burn(asset, sum.toString(), position) //insert burn effect at the position of the last removed effect
+                this.effectsAnalyzer.burn(asset, (-sum).toString(), position) //insert burn effect at the position of the last removed effect
             }
             //if sum=0 then both effects were annihilated and removed
         }

package/src/aggregation/events-analyzer.js

@@ -158,13 +158,6 @@ class EventsAnalyzer {
                 if (classicAsset) {
                     if (classicAsset.includes(from)) {  //SAC transfer by asset issuer
                         this.effectsAnalyzer.mint(classicAsset, amount)
-                        this.effectsAnalyzer.credit(amount, classicAsset, to)
-                        return
-                    }
-                    if (classicAsset.includes(to)) {  //SAC transfer by asset issuer
-                        this.effectsAnalyzer.debit(amount, classicAsset, from)
-                        this.effectsAnalyzer.burn(classicAsset, amount)
-                        return
                     }
                     if (isContractAddress(from)) {
                         this.effectsAnalyzer.debit(amount, classicAsset, from)
@@ -172,6 +165,9 @@ class EventsAnalyzer {
                     if (isContractAddress(to)) {
                         this.effectsAnalyzer.credit(amount, classicAsset, to)
                     }
+                    if (classicAsset.includes(to)) {  //SAC transfer by asset issuer
+                        this.effectsAnalyzer.burn(classicAsset, amount)
+                    }
                 } else { //other cases
                     this.effectsAnalyzer.debit(amount, this.effectsAnalyzer.resolveAsset(contract), from)
                     this.effectsAnalyzer.credit(amount, this.effectsAnalyzer.resolveAsset(contract), to)

package/src/effects-analyzer.js

@@ -132,7 +132,7 @@ class EffectsAnalyzer {
             type: effectTypes.accountDebited,
             source,
             asset,
-            amount
+            amount: validateAmount(amount)
         }
         if (balance !== undefined) {
             effect.balance = balance
@@ -147,7 +147,7 @@ class EffectsAnalyzer {
             type: effectTypes.accountCredited,
             source,
             asset,
-            amount
+            amount: validateAmount(amount)
         }
         if (balance !== undefined) {
             effect.balance = balance
@@ -162,7 +162,7 @@ class EffectsAnalyzer {
         this.addEffect({
             type: effectTypes.assetMinted,
             asset,
-            amount
+            amount: validateAmount(amount)
         }, position)
     }
 
@@ -170,7 +170,7 @@ class EffectsAnalyzer {
         this.addEffect({
             type: effectTypes.assetBurned,
             asset,
-            amount
+            amount: validateAmount(amount)
         }, position)
     }
 
@@ -782,12 +782,21 @@ class EffectsAnalyzer {
     processContractChanges({action, before, after}) {
         if (action !== 'created' && action !== 'updated')
             throw new UnexpectedTxMetaChangeError({type: 'contract', action})
-        const {kind, contract, hash} = after
+        const {kind, contract} = after
         const effect = {
             type: effectTypes.contractCreated,
             contract,
-            kind,
-            wasmHash: hash
+            kind
+        }
+        switch (kind) {
+            case 'fromAsset':
+                effect.asset = after.asset
+                break
+            case 'wasm':
+                effect.wasmHash = after.hash
+                break
+            default:
+                throw new TxMetaEffectParserError('Unexpected contract type: ' + kind)
         }
         if (action === 'created') {
             if (this.effects.some(e => e.contract === contract))
@@ -798,7 +807,7 @@ class EffectsAnalyzer {
             if (before.storage?.length || after.storage?.length) {
                 this.processInstanceDataChanges(before, after)
             }
-            if (before.hash === hash) //skip if hash unchanged
+            if (before.hash === after.hash) //skip if hash unchanged
                 return
         }
         this.addEffect(effect)
@@ -998,6 +1007,12 @@ function encodeSponsorshipEffectName(action, type) {
     return effectTypes[`${type}Sponsorship${actionKey}`]
 }
 
+function validateAmount(amount) {
+    if (amount < 0)
+        throw new TxMetaEffectParserError('Negative balance change amount: ' + amount.toString())
+    return amount
+}
+
 function parseLargeInt(largeInt) {
     return largeInt._value.toString()
 }

package/src/parser/ledger-entry-changes-parser.js

@@ -246,52 +246,20 @@ function parseContractData(value) {
                 entry: 'contract',
                 contract: owner
             }
-            const type = valueAttr.instance().executable().switch().name
+            const instance = valueAttr.instance()._attributes
+            const type = instance.executable._switch.name
             switch (type) {
                 case 'contractExecutableStellarAsset':
-                    entry.type = 'token'
-                    /**
-                     * data._attributes.val._value._attributes.storage
-                     *
-                     * ScVal: [scvContractInstance]
-                     * instance
-                     * executable: [contractExecutableStellarAsset]
-                     * storage: Array[3]
-                     * [0]
-                     * key: [scvSymbol]
-                     * sym: METADATA
-                     * val: [scvMap]
-                     * map: Array[3]
-                     * [0]
-                     * key: [scvSymbol]
-                     * sym: decimal
-                     * val: [scvU32]
-                     * u32: 7
-                     * [1]
-                     * key: [scvSymbol]
-                     * sym: name
-                     * val: [scvString]
-                     * str: ICGVCWUQXIHO:GBD2ALDOSNTEW2QWQA6RGQXTZVWGFZYTT5DYZDCPPGNOYTXOAQ6RFUAC
-                     * [2]
-                     * key: [scvSymbol]
-                     * sym: symbol
-                     * val: [scvString]
-                     * str: ICGVCWUQXIHO
-                     * [1]
-                     * key: [scvVec]
-                     * vec: Array[1]
-                     * [0]: [scvSymbol]
-                     * sym: Admin
-                     * val: [scvAddress]
-                     * address: [scAddressTypeAccount]
-                     * accountId: [publicKeyTypeEd25519]
-                     * ed25519: GBD2ALDOSNTEW2QWQA6RGQXTZVWGFZYTT5DYZDCPPGNOYTXOAQ6RFUAC
-                     */
-                    return undefined
+                    entry.kind = 'fromAsset'
+                    if (!instance.storage.length)
+                        throw new TxMetaEffectParserError('Unexpected asset initialization metadata')
+                    const metaArgs = instance.storage[0]._attributes
+                    if (metaArgs.key._value.toString() !== 'METADATA')
+                        throw new TxMetaEffectParserError('Unexpected asset initialization metadata')
+                    entry.asset = xdrParseAsset(metaArgs.val._value[1]._attributes.val._value.toString())
                     break
                 case 'contractExecutableWasm':
                     entry.kind = 'wasm'
-                    const instance = valueAttr.instance()._attributes
                     entry.hash = instance.executable.wasmHash().toString('hex')
                     if (instance.storage?.length) {
                         entry.storage = instance.storage.map(entry => ({