@lukso/transaction-decoder 1.3.6-dev.4a582bd → 1.3.6-dev.637d4ef

package/dist/server.d.cts

@@ -1,5 +1,5 @@
 import { Chain, Abi } from 'viem';
-import { b as DecoderResult, c as DataKey, E as EnhancedInfo, e as Info } from './index-BzXh7poJ.cjs';
+import { c as DecoderResult, b as DataKey, E as EnhancedInfo, e as Info } from './index-BWD9DaG6.cjs';
 import '@preact/signals-core';
 import '@erc725/erc725.js';
 

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 import { Chain, Abi } from 'viem';
-import { b as DecoderResult, c as DataKey, E as EnhancedInfo, e as Info } from './index-BzXh7poJ.js';
+import { c as DecoderResult, b as DataKey, E as EnhancedInfo, e as Info } from './index-BWD9DaG6.js';
 import '@preact/signals-core';
 import '@erc725/erc725.js';
 

package/dist/server.js

@@ -1,6 +1,6 @@
 import {
   fetchMultipleAddresses
-} from "./chunk-FKBKAWB3.js";
+} from "./chunk-HFBAO6YR.js";
 import {
   __name,
   collectDataKeys,
@@ -8,7 +8,7 @@ import {
   decodeTransaction,
   needsEnhancement,
   pluginRegistry
-} from "./chunk-T4H2HHIB.js";
+} from "./chunk-MGPLCACC.js";
 
 // src/server/addressResolver.ts
 var ServerAddressResolver = class {

package/dist/{utils-De_c6fUK.d.ts → utils-4Qdavg8r.d.ts}

@@ -1,4 +1,4 @@
-import { g as IDataModelConsumer, I as IDataModel, c as DataKey, b as DecoderResult, T as TransactionState, h as DecoderOptions, P as PluginOptions, i as EnhancerCallback, j as DecodeEventCallback, k as EnhancerAggregationKeyCallback, l as EnhancerSummarizeCallback, m as Aggregation, n as DecoderPlugin, e as Info, S as SchemaPlugin, o as ResultSetData, A as ArrayArgs, C as CustomDecodeFunctionDataReturn, E as EnhancedInfo } from './index-BzXh7poJ.js';
+import { g as IDataModelConsumer, I as IDataModel, b as DataKey, c as DecoderResult, T as TransactionState, h as DecoderOptions, P as PluginOptions, i as EnhancerCallback, j as DecodeEventCallback, k as EnhancerAggregationKeyCallback, l as EnhancerSummarizeCallback, m as Aggregation, n as DecoderPlugin, e as Info, S as SchemaPlugin, o as ResultSetData, A as ArrayArgs, C as CustomDecodeFunctionDataReturn, E as EnhancedInfo } from './index-BWD9DaG6.js';
 import { Signal } from '@preact/signals-core';
 import { Transaction, Abi, Hex, AbiParameter, DecodeFunctionDataParameters, Address, Chain, PublicClient } from 'viem';
 import { ERC725JSONSchema } from '@erc725/erc725.js';
@@ -105,4 +105,4 @@ declare function getPublicClient(chain: Chain): PublicClient;
  */
 declare function needsEnhancement(result: DecoderResult): boolean;
 
-export { type AddressResolver as A, type TransactionDecoderResult as T, decodeTransaction as a, decodeKeyValue as b, decodeKeyValueRaw as c, dataModel as d, createNamedArgs as e, customDecodeFunctionData as f, extractAddress as g, getPublicClient as h, consumerModel as i, createGlobalInstance as j, decodeTransactionAsync as k, createAggregationKey as l, defaultPlugins as m, defaultSchemaPlugins as n, standardPlugin as o, getArgByName as p, needsEnhancement as q, standardSchemaPlugin as s };
+export { type AddressResolver as A, type TransactionDecoderResult as T, customDecodeFunctionData as a, decodeKeyValue as b, createNamedArgs as c, dataModel as d, decodeKeyValueRaw as e, decodeTransaction as f, extractAddress as g, getPublicClient as h, consumerModel as i, createAggregationKey as j, createGlobalInstance as k, decodeTransactionAsync as l, defaultPlugins as m, defaultSchemaPlugins as n, getArgByName as o, needsEnhancement as p, standardPlugin as q, standardSchemaPlugin as s };

package/dist/{utils-BEpSreRR.d.cts → utils-OR-XzeYG.d.cts}

@@ -1,4 +1,4 @@
-import { g as IDataModelConsumer, I as IDataModel, c as DataKey, b as DecoderResult, T as TransactionState, h as DecoderOptions, P as PluginOptions, i as EnhancerCallback, j as DecodeEventCallback, k as EnhancerAggregationKeyCallback, l as EnhancerSummarizeCallback, m as Aggregation, n as DecoderPlugin, e as Info, S as SchemaPlugin, o as ResultSetData, A as ArrayArgs, C as CustomDecodeFunctionDataReturn, E as EnhancedInfo } from './index-BzXh7poJ.cjs';
+import { g as IDataModelConsumer, I as IDataModel, b as DataKey, c as DecoderResult, T as TransactionState, h as DecoderOptions, P as PluginOptions, i as EnhancerCallback, j as DecodeEventCallback, k as EnhancerAggregationKeyCallback, l as EnhancerSummarizeCallback, m as Aggregation, n as DecoderPlugin, e as Info, S as SchemaPlugin, o as ResultSetData, A as ArrayArgs, C as CustomDecodeFunctionDataReturn, E as EnhancedInfo } from './index-BWD9DaG6.cjs';
 import { Signal } from '@preact/signals-core';
 import { Transaction, Abi, Hex, AbiParameter, DecodeFunctionDataParameters, Address, Chain, PublicClient } from 'viem';
 import { ERC725JSONSchema } from '@erc725/erc725.js';
@@ -105,4 +105,4 @@ declare function getPublicClient(chain: Chain): PublicClient;
  */
 declare function needsEnhancement(result: DecoderResult): boolean;
 
-export { type AddressResolver as A, type TransactionDecoderResult as T, decodeTransaction as a, decodeKeyValue as b, decodeKeyValueRaw as c, dataModel as d, createNamedArgs as e, customDecodeFunctionData as f, extractAddress as g, getPublicClient as h, consumerModel as i, createGlobalInstance as j, decodeTransactionAsync as k, createAggregationKey as l, defaultPlugins as m, defaultSchemaPlugins as n, standardPlugin as o, getArgByName as p, needsEnhancement as q, standardSchemaPlugin as s };
+export { type AddressResolver as A, type TransactionDecoderResult as T, customDecodeFunctionData as a, decodeKeyValue as b, createNamedArgs as c, dataModel as d, decodeKeyValueRaw as e, decodeTransaction as f, extractAddress as g, getPublicClient as h, consumerModel as i, createAggregationKey as j, createGlobalInstance as k, decodeTransactionAsync as l, defaultPlugins as m, defaultSchemaPlugins as n, getArgByName as o, needsEnhancement as p, standardPlugin as q, standardSchemaPlugin as s };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lukso/transaction-decoder",
-  "version": "1.3.6-dev.4a582bd",
+  "version": "1.3.6-dev.637d4ef",
   "description": "Transaction decoder for LUKSO blockchain with reactive state management",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -47,19 +47,19 @@
     "@lukso/lsp8-contracts": "0.16.7",
     "@lukso/lsp9-contracts": "0.15.5",
     "@lukso/universalprofile-contracts": "0.15.5",
-    "@preact/signals-core": "^1.12.1",
+    "@preact/signals-core": "^1.13.0",
     "graphql-request": "^7.4.0",
-    "graphql-ws": "^6.0.6",
-    "lru-cache": "^11.2.4",
-    "viem": "^2.43.5"
+    "graphql-ws": "^6.0.7",
+    "lru-cache": "^11.2.6",
+    "viem": "^2.46.1"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.11",
+    "@biomejs/biome": "^2.4.2",
     "@types/debug": "^4.1.12",
-    "@types/node": "^25.0.3",
+    "@types/node": "^25.2.3",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.16"
+    "vitest": "^4.0.18"
   },
   "peerDependencies": {
     "viem": "^2.0.0"

package/src/decoder/lsp7Mint.test.ts

@@ -145,24 +145,31 @@ describe('LSP7 Mint Transaction Decoding', () => {
     expect(dataChangedLogs.length).toBeGreaterThan(0)
     console.log(`\nFound ${dataChangedLogs.length} DataChanged events`)
 
-    // Look for UniversalReceiver event (confirms the mint was received)
-    // UniversalReceiver signature: 0x9c3ba68eb5742b8e3961aea0afc7371a71bf433c8a67a831803b64c064a178c2
-    const universalReceiverLog = result?.logs?.find(
-      (log: any) => log.eventName === 'UniversalReceiver'
+    // Look for unwrapped URDTokensReceived event from UniversalReceiver (confirms the mint was received)
+    // The UniversalReceiver event is now unwrapped into URDTokensReceived with standard: LSP7DigitalAsset
+    const unwrappedTransferLog = result?.logs?.find(
+      (log: any) =>
+        log.eventName === 'URDTokensReceived' &&
+        log.standard === 'LSP7DigitalAsset'
     )
-    expect(universalReceiverLog).toBeDefined()
-    expect(universalReceiverLog?.address).toBe(
+    expect(unwrappedTransferLog).toBeDefined()
+    expect(unwrappedTransferLog?.address).toBe(
       '0xda9b727f1718f128008ad025828e7fecfaa8a37b'
     ) // LSP7 token contract
 
-    // Verify the UniversalReceiver typeId indicates this is a mint
-    // typeId 0x20804611b3e2ea21c480dc465142210acf4a2485947541770ec1fb87dee4a55c = _TYPEID_LSP7_TOKENSSENDER
-    expect(universalReceiverLog?.args?.[2]?.value).toBe(
+    // Verify the original UniversalReceiver is preserved in wrappers
+    const wrapper = (unwrappedTransferLog as any)?.wrappers?.[0]
+    expect(wrapper).toBeDefined()
+    expect(wrapper?.eventName).toBe('UniversalReceiver')
+
+    // Verify the UniversalReceiver typeId indicates this is a mint recipient notification
+    // typeId 0x20804611b3e2ea21c480dc465142210acf4a2485947541770ec1fb87dee4a55c = _TYPEID_LSP7_TOKENSRECIPIENT
+    expect(wrapper?.args?.[2]?.value).toBe(
       '0x20804611b3e2ea21c480dc465142210acf4a2485947541770ec1fb87dee4a55c'
     )
 
-    // Verify the 'from' address in UniversalReceiver (the minter, which is the UP)
-    expect(universalReceiverLog?.args?.[0]?.value).toBe(
+    // Verify the 'from' address in the wrapper (the minter, which is the UP)
+    expect(wrapper?.args?.[0]?.value).toBe(
       '0x81A904879F657142d9b5C7e875c786717e2125c0'
     )
 

package/src/decoder/plugins/enhanceLSP0ERC725Account.ts

@@ -1,5 +1,5 @@
 import { universalProfileAbi as UniversalProfile } from '@lukso/universalprofile-contracts/abi'
-import type { Address } from 'viem'
+import type { Address, Hex, Log } from 'viem'
 import { decodeEvent } from '../events'
 import { decodeTransaction } from '../transaction'
 import type {
@@ -15,6 +15,7 @@ import type {
 import { createNamedArgs } from '../utils'
 import { standardPlugin } from '.'
 import { enhanceSetData } from './enhanceSetData'
+import { unwrapUniversalReceiver } from './universalReceiverTypeIds'
 
 export const enhanceLSP0ERC725AccountPlugin = standardPlugin(
   UniversalProfile,
@@ -26,7 +27,43 @@ export const enhanceLSP0ERC725AccountPlugin = standardPlugin(
   {
     enhance: enhanceLSP0ERC725Account,
     decodeEvent: async (log: DecodeEventResult, options: DecoderOptions) => {
-      return decodeEvent(options.chain, UniversalProfile, log)
+      const decoded = decodeEvent(options.chain, UniversalProfile, log)
+      if (!decoded || decoded.eventName !== 'UniversalReceiver') {
+        return decoded
+      }
+
+      // Extract UniversalReceiver args
+      const typeId = decoded.args.find((a) => a.name === 'typeId')?.value as Hex
+      const receivedData = decoded.args.find((a) => a.name === 'receivedData')
+        ?.value as Hex
+      const from = decoded.args.find((a) => a.name === 'from')?.value as Address
+      const profileAddress = (decoded as unknown as Log).address as Address
+
+      if (!typeId || !receivedData || !from) {
+        return decoded
+      }
+
+      // Unwrap based on typeId (always succeeds — falls back to generic Notification)
+      const unwrapped = unwrapUniversalReceiver(
+        typeId,
+        receivedData,
+        from,
+        profileAddress
+      )
+
+      // Rewrite the event: inner event becomes the main event,
+      // original UniversalReceiver goes into wrappers.
+      // Topics and data are rewritten to match the inner event's ABI.
+      const { wrappers: _w, standard: _s, ...logBase } = decoded
+      return {
+        ...logBase,
+        eventName: unwrapped.eventName,
+        args: unwrapped.args,
+        standard: unwrapped.standard,
+        topics: unwrapped.topics,
+        data: unwrapped.data,
+        wrappers: [logBase],
+      } as DecodeEventResult
     },
   }
 )

package/src/decoder/plugins/universalReceiverTypeIds.ts

@@ -0,0 +1,277 @@
+import type { AbiParameter, Address, Hex } from 'viem'
+import {
+  decodeAbiParameters,
+  encodeAbiParameters,
+  getAddress,
+  keccak256,
+  slice,
+  toHex,
+} from 'viem'
+import type { ArrayArgs } from '../types'
+import { createNamedArgs } from '../utils'
+
+/**
+ * Result of unwrapping a UniversalReceiver event based on its typeId.
+ * Contains the inner event that was wrapped by the UniversalReceiver notification,
+ * including rewritten topics and data fields matching the inner event's ABI.
+ */
+export type UnwrapResult = {
+  eventName: string
+  args: ArrayArgs
+  standard?: string
+  topics: [Hex, ...Hex[]]
+  data: Hex
+}
+
+type UnwrapFn = (
+  receivedData: Hex,
+  from: Address,
+  profileAddress: Address,
+  eventName: string
+) => UnwrapResult | undefined
+
+/**
+ * Compute topic0 (event signature hash) and ABI-encode the data field
+ * for an event with all non-indexed parameters.
+ */
+function encodeEventLog(
+  eventName: string,
+  params: AbiParameter[],
+  values: unknown[]
+): { topics: [Hex, ...Hex[]]; data: Hex } {
+  const sig = `${eventName}(${params.map((p) => p.type).join(',')})`
+  const topic0 = keccak256(toHex(sig))
+  const data = encodeAbiParameters(params, values)
+  return { topics: [topic0], data }
+}
+
+// --- LSP26 FollowerSystem ---
+
+// keccak256('LSP26FollowerSystem_FollowNotification')
+const TYPEID_LSP26_FOLLOW: Hex =
+  '0x71e02f9f05bcd5816ec4f3134aa2e5a916669537ec6c77fe66ea595fabc2d51a'
+
+// keccak256('LSP26FollowerSystem_UnfollowNotification')
+const TYPEID_LSP26_UNFOLLOW: Hex =
+  '0x9d3c0b4012b69658977b099bdaa51eff0f0460f421fba96d15669506c00d1c4f'
+
+// --- LSP7 DigitalAsset ---
+
+// keccak256('LSP7Tokens_SenderNotification')
+const TYPEID_LSP7_TOKENSSENDER: Hex =
+  '0x429ac7a06903dbc9c13dfcb3c9d11df8194581fa047c96d7a4171fc7402958ea'
+
+// keccak256('LSP7Tokens_RecipientNotification')
+const TYPEID_LSP7_TOKENSRECIPIENT: Hex =
+  '0x20804611b3e2ea21c480dc465142210acf4a2485947541770ec1fb87dee4a55c'
+
+// --- LSP8 IdentifiableDigitalAsset ---
+
+// keccak256('LSP8Tokens_SenderNotification')
+const TYPEID_LSP8_TOKENSSENDER: Hex =
+  '0xb23eae7e6d1564b295b4c3e3be402d9a2f0776c57bdf365903496f6fa481ab00'
+
+// keccak256('LSP8Tokens_RecipientNotification')
+const TYPEID_LSP8_TOKENSRECIPIENT: Hex =
+  '0x0b084a55ebf70fd3c06fd755269dac2212c4d3f0f4d09079780bfa50c1b2984d'
+
+// --- Event parameter definitions ---
+
+const followParams: AbiParameter[] = [
+  { name: 'follower', type: 'address' },
+  { name: 'addr', type: 'address' },
+]
+
+const unfollowParams: AbiParameter[] = [
+  { name: 'unfollower', type: 'address' },
+  { name: 'addr', type: 'address' },
+]
+
+const lsp7TransferParams: AbiParameter[] = [
+  { name: 'operator', type: 'address' },
+  { name: 'from', type: 'address' },
+  { name: 'to', type: 'address' },
+  { name: 'amount', type: 'uint256' },
+  { name: 'force', type: 'bool' },
+  { name: 'data', type: 'bytes' },
+]
+
+const lsp8TransferParams: AbiParameter[] = [
+  { name: 'operator', type: 'address' },
+  { name: 'from', type: 'address' },
+  { name: 'to', type: 'address' },
+  { name: 'tokenId', type: 'bytes32' },
+  { name: 'force', type: 'bool' },
+  { name: 'data', type: 'bytes' },
+]
+
+const notificationParams: AbiParameter[] = [
+  { name: 'from', type: 'address' },
+  { name: 'typeId', type: 'bytes32' },
+  { name: 'data', type: 'bytes' },
+]
+
+/**
+ * Decode LSP26 Follow notification.
+ * receivedData is abi.encodePacked(followerAddress) — raw 20 bytes.
+ */
+function unwrapLSP26Follow(
+  receivedData: Hex,
+  _from: Address,
+  profileAddress: Address,
+  _eventName: string
+): UnwrapResult | undefined {
+  if (!receivedData || receivedData.length < 42) {
+    return undefined
+  }
+  const followerAddress = getAddress(slice(receivedData, 0, 20))
+  const values = [followerAddress, profileAddress]
+  return {
+    eventName: 'URDFollow',
+    ...createNamedArgs(values, followParams),
+    ...encodeEventLog('URDFollow', followParams, values),
+    standard: 'LSP26FollowerSystem',
+  }
+}
+
+/**
+ * Decode LSP26 Unfollow notification.
+ * receivedData is abi.encodePacked(unfollowerAddress) — raw 20 bytes.
+ */
+function unwrapLSP26Unfollow(
+  receivedData: Hex,
+  _from: Address,
+  profileAddress: Address,
+  _eventName: string
+): UnwrapResult | undefined {
+  if (!receivedData || receivedData.length < 42) {
+    return undefined
+  }
+  const unfollowerAddress = getAddress(slice(receivedData, 0, 20))
+  const values = [unfollowerAddress, profileAddress]
+  return {
+    eventName: 'URDUnfollow',
+    ...createNamedArgs(values, unfollowParams),
+    ...encodeEventLog('URDUnfollow', unfollowParams, values),
+    standard: 'LSP26FollowerSystem',
+  }
+}
+
+/**
+ * Decode LSP7 token transfer notification.
+ * receivedData is abi.encode(operator, from, to, amount, data).
+ */
+function unwrapLSP7Transfer(
+  receivedData: Hex,
+  _from: Address,
+  _profileAddress: Address,
+  eventName: string
+): UnwrapResult | undefined {
+  try {
+    const [operator, sender, recipient, amount, data] = decodeAbiParameters(
+      [
+        { name: 'operator', type: 'address' },
+        { name: 'from', type: 'address' },
+        { name: 'to', type: 'address' },
+        { name: 'amount', type: 'uint256' },
+        { name: 'data', type: 'bytes' },
+      ],
+      receivedData
+    )
+    const values = [operator, sender, recipient, amount, true, data]
+    return {
+      eventName,
+      ...createNamedArgs(values, lsp7TransferParams),
+      ...encodeEventLog(eventName, lsp7TransferParams, values),
+      standard: 'LSP7DigitalAsset',
+    }
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * Decode LSP8 token transfer notification.
+ * receivedData is abi.encode(operator, from, to, tokenId, data).
+ */
+function unwrapLSP8Transfer(
+  receivedData: Hex,
+  _from: Address,
+  _profileAddress: Address,
+  eventName: string
+): UnwrapResult | undefined {
+  try {
+    const [operator, sender, recipient, tokenId, data] = decodeAbiParameters(
+      [
+        { name: 'operator', type: 'address' },
+        { name: 'from', type: 'address' },
+        { name: 'to', type: 'address' },
+        { name: 'tokenId', type: 'bytes32' },
+        { name: 'data', type: 'bytes' },
+      ],
+      receivedData
+    )
+    const values = [operator, sender, recipient, tokenId, true, data]
+    return {
+      eventName,
+      ...createNamedArgs(values, lsp8TransferParams),
+      ...encodeEventLog(eventName, lsp8TransferParams, values),
+      standard: 'LSP8IdentifiableDigitalAsset',
+    }
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * Registry mapping typeId → unwrap function.
+ */
+const typeIdUnwrappers: Record<Hex, { fn: UnwrapFn; eventName: string }> = {
+  [TYPEID_LSP26_FOLLOW]: { fn: unwrapLSP26Follow, eventName: 'Follow' },
+  [TYPEID_LSP26_UNFOLLOW]: { fn: unwrapLSP26Unfollow, eventName: 'Unfollow' },
+  [TYPEID_LSP7_TOKENSSENDER]: {
+    fn: unwrapLSP7Transfer,
+    eventName: 'URDTokensSent',
+  },
+  [TYPEID_LSP7_TOKENSRECIPIENT]: {
+    fn: unwrapLSP7Transfer,
+    eventName: 'URDTokensReceived',
+  },
+  [TYPEID_LSP8_TOKENSSENDER]: {
+    fn: unwrapLSP8Transfer,
+    eventName: 'URDTokensSent',
+  },
+  [TYPEID_LSP8_TOKENSRECIPIENT]: {
+    fn: unwrapLSP8Transfer,
+    eventName: 'URDTokensReceived',
+  },
+}
+
+/**
+ * Unwrap a UniversalReceiver event based on its typeId.
+ * For known typeIds, decodes receivedData into specific event args.
+ * For unknown typeIds, returns a generic Notification with raw receivedData.
+ * Always rewrites topics and data to match the inner event's ABI.
+ */
+export function unwrapUniversalReceiver(
+  typeId: Hex,
+  receivedData: Hex,
+  from: Address,
+  profileAddress: Address
+): UnwrapResult {
+  const entry = typeIdUnwrappers[typeId]
+  if (entry) {
+    const result = entry.fn(receivedData, from, profileAddress, entry.eventName)
+    if (result) {
+      return result
+    }
+  }
+
+  // Fallback: generic notification with raw data
+  const values = [from, typeId, receivedData]
+  return {
+    eventName: 'URDNotification',
+    ...createNamedArgs(values, notificationParams),
+    ...encodeEventLog('Notification', notificationParams, values),
+  }
+}

package/src/decoder/types.ts

@@ -461,5 +461,7 @@ export type DecodeEventResult =
   | ({
       eventName: string
       args: ArrayArgs
+      wrappers?: Array<{ eventName: string; args: ArrayArgs } & Log>
+      standard?: string
     } & Log)
   | undefined