@stellar-expert/tx-meta-effects-parser 9.2.0 → 9.3.1

package/package.json

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

package/src/effects-analyzer.js

@@ -414,6 +414,30 @@ class EffectsAnalyzer {
             }
             case 'createContract':
             case 'createContractV2': //handled in entry changes
+                const executable = value.executable()
+                const executableType = executable.switch().name
+                if (executableType !== 'contractExecutableWasm') {
+                    const preimage = value.contractIdPreimage()
+                    const preimageParams = preimage.value()
+                    const effect = {
+                        type: effectTypes.contractCreated,
+                        contract: contractIdFromPreimage(preimage, this.network)
+                    }
+                    switch (preimage.switch().name) {
+                        case 'contractIdPreimageFromAddress':
+                            effect.kind = 'fromAddress'
+                            effect.issuer = xdrParseAccountAddress(preimageParams.address().value())
+                            effect.salt = preimageParams.salt().toString('base64')
+                            break
+                        case 'contractIdPreimageFromAsset':
+                            effect.kind = 'fromAsset'
+                            effect.asset = xdrParseAsset(preimageParams)
+                            break
+                        default:
+                            throw new TxMetaEffectParserError('Unknown preimage type: ' + preimage.switch().name)
+                    }
+                    this.addEffect(effect)
+                }
                 break
             default:
                 throw new TxMetaEffectParserError('Unknown host function call type: ' + func.arm())
@@ -788,6 +812,8 @@ class EffectsAnalyzer {
             case 'wasm':
                 effect.wasmHash = after.wasmHash
                 break
+            case 'fromAddress':
+                break
             default:
                 throw new TxMetaEffectParserError('Unexpected contract type: ' + kind)
         }
@@ -808,7 +834,17 @@ class EffectsAnalyzer {
                 throw new UnexpectedTxMetaChangeError({type: 'contract', action})
         }
         if (effect) {
-            this.addEffect(effect, effect.type === effectTypes.contractCreated ? this.effects.findIndex(e => e.contract === effect.contract || e.owner === effect.contract) : undefined)
+            if (effect.type === effectTypes.contractCreated) {
+                const existing = this.effects.find(e => e.type === effectTypes.contractCreated && e.contract === effect.contract)
+                if (!existing) { //the effect might be already emitted from the op call
+                    this.addEffect(effect, this.effects.findIndex(e => e.contract === effect.contract || e.owner === effect.contract))
+                } else {
+                    existing.keyHash = effect.keyHash //assign keyHash, can't be calculated directly
+                }
+            } else {
+
+                this.addEffect(effect)
+            }
         }
         if (before?.storage?.length || after?.storage?.length) {
             this.processInstanceDataChanges(before, after, action === 'restored')

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

@@ -278,12 +278,14 @@ function parseContractData(value) {
         const type = instance.executable._switch.name
         switch (type) {
             case 'contractExecutableStellarAsset':
-                entry.kind = 'fromAsset'
                 if (instance.storage?.length) { //if not -- the asset has been created "fromAddress" - no metadata in this case
+                    entry.kind = 'fromAsset'
                     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())
+                } else {
+                    entry.kind = 'fromAddress'
                 }
                 break
             case 'contractExecutableWasm':