@stellar-expert/tx-meta-effects-parser 7.0.0-rc.10 → 7.0.0-rc.11

package/package.json

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

package/src/effects-analyzer.js

@@ -929,39 +929,41 @@ class EffectsAnalyzer {
     processInstanceDataChanges(before, after, restored) {
         const storageBefore = before?.storage || []
         const storageAfter = [...(after?.storage || [])]
-        for (const {key, val} of storageBefore) {
-            let newVal
-            for (let i = 0; i < storageAfter.length; i++) {
-                const afterValue = storageAfter[i]
-                if (afterValue.key === key) {
-                    newVal = afterValue.val //update new value
-                    storageAfter.splice(i, 1) //remove from array to simplify iteration
-                    break
+        if (!restored) {
+            for (const {key, val} of storageBefore) {
+                let newVal
+                for (let i = 0; i < storageAfter.length; i++) {
+                    const afterValue = storageAfter[i]
+                    if (afterValue.key === key) {
+                        newVal = afterValue.val //update new value
+                        storageAfter.splice(i, 1) //remove from array to simplify iteration
+                        break
+                    }
                 }
-            }
-            if (newVal === undefined) { //removed
+                if (newVal === undefined) { //removed
+                    const effect = {
+                        type: effectTypes.contractDataRemoved,
+                        owner: after?.owner || before.owner,
+                        key,
+                        prevValue: val,
+                        durability: 'instance'
+                    }
+                    this.addEffect(effect)
+                    continue
+                }
+                if (val === newVal) //value has not changed
+                    continue
+
                 const effect = {
-                    type: effectTypes.contractDataRemoved,
+                    type: effectTypes.contractDataUpdated,
                     owner: after?.owner || before.owner,
                     key,
+                    value: newVal,
                     prevValue: val,
                     durability: 'instance'
                 }
                 this.addEffect(effect)
-                continue
             }
-            if (val === newVal) //value has not changed
-                continue
-
-            const effect = {
-                type: effectTypes.contractDataUpdated,
-                owner: after?.owner || before.owner,
-                key,
-                value: newVal,
-                prevValue: val,
-                durability: 'instance'
-            }
-            this.addEffect(effect)
         }
         //iterate all storage items left
         for (const {key, val} of storageAfter) {

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

@@ -41,12 +41,16 @@ function parseLedgerEntryChanges(ledgerEntryChanges) {
             case 'updated':
                 if (type === 'contractCode')
                     throw new UnexpectedTxMetaChangeError({type, action})
+                if (!state && stateData.keyHash) { //likely, restored state
+                    const restored = changes.find(ch => ch.action === 'restored' && ch.type === stateData.entry && ch.after.keyHash === stateData.keyHash)
+                    state = restored?.after
+                }
                 change.before = state
                 change.after = stateData
                 change.type = stateData.entry
                 break
             case 'restored':
-                change.before = state
+                change.before = stateData
                 change.after = stateData
                 change.type = stateData.entry
                 break