fix: resolve data loss bugs in farm IP, node interface, and contract mapping handlers

- B1: Replace async forEach with for...of in farmUpdated to fix race conditions on IP saves/removals
- B2: Append IP string to PublicIp ID in farmStored/farmUpdated to prevent overwrites when multiple IPs exist
- B3: Append interface name to Interfaces ID in nodeStored (matching nodeUpdated pattern) to prevent overwrites
- B4: Add undefined guard for contractID in grace period handlers to prevent unpredictable queries
- B5: Fix handlePublicConfigV105 fallthrough creating ghost PublicConfig with null fields when config is undefined
- B6: Save inline PublicConfig in nodeStored for spec v9 nodes that carried publicConfig at creation time
- Fix cross-farm duplicate IP handling: properly skip instead of silently overwriting gateway
- Add '-' separator to composite IDs for readability (interfaces and public IPs)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: sameh-farouk

src/mappings/contracts.ts

@@ -469,6 +469,11 @@ export async function contractGracePeriodStarted(
         contractID = contractGracePeriodStartedEvent.asV105.contractId
     }
 
+    if (contractID === undefined) {
+        ctx.log.error({ eventName: item.name }, `found ContractGracePeriodStarted with unknown version! make sure types are updated`);
+        return
+    }
+
     const savedNodeContract = await ctx.store.get(NodeContract, { where: { contractID } })
     if (savedNodeContract) {
         savedNodeContract.state = ContractState.GracePeriod
@@ -505,6 +510,11 @@ export async function contractGracePeriodEnded(
         contractID = contractGracePeriodEnded.asV105.contractId
     }
 
+    if (contractID === undefined) {
+        ctx.log.error({ eventName: item.name }, `found ContractGracePeriodEnded with unknown version! make sure types are updated`);
+        return
+    }
+
     const savedNodeContract = await ctx.store.get(NodeContract, { where: { contractID } })
     if (savedNodeContract) {
         savedNodeContract.state = ContractState.Created

src/mappings/farms.ts

@@ -67,7 +67,7 @@ export async function farmStored(
 
         const newIP = new PublicIp()
 
-        newIP.id = item.event.id
+        newIP.id = item.event.id + '-' + validateString(ctx, ip.ip.toString())
 
         newIP.ip = validateString(ctx, ip.ip.toString())
         newIP.gateway = validateString(ctx, ip.gateway.toString())
@@ -167,26 +167,26 @@ export async function farmUpdated(
     savedFarm.certification = certification
 
     let eventPublicIPs = farmUpdatedEventParsed.publicIps
-    farmUpdatedEventParsed.publicIps.forEach(async ip => {
+    for (const ip of farmUpdatedEventParsed.publicIps) {
         if (!checkIPs(ctx, ip.ip.toString(), ip.gateway.toString())) {
-            return
+            continue
         }
         if (ip.ip.toString().indexOf('\x00') >= 0) {
-            return
+            continue
         }
         const savedIP = await ctx.store.get(PublicIp, { where: { ip: ip.ip.toString() }, relations: { farm: true } })
-        // ip is already there in storage, don't save it again
         if (savedIP) {
-            savedIP.ip = validateString(ctx, ip.ip.toString()) // not effective, but for since we already check for \x00
-            savedIP.gateway = validateString(ctx, ip.gateway.toString())
             if (savedIP.farm.id !== savedFarm.id) {
-                ctx.log.error({ eventName: item.name, ip: ip.ip.toString() }, `PublicIP: ${ip.ip.toString()} already exists on farm: ${savedIP.farm.farmID}, skiped adding it to farm with ID: ${savedFarm.farmID}`);
+                ctx.log.error({ eventName: item.name, ip: ip.ip.toString() }, `PublicIP: ${ip.ip.toString()} already exists on farm: ${savedIP.farm.farmID}, skipped adding it to farm with ID: ${savedFarm.farmID}`);
+                continue
             }
+            // Same farm — update gateway
+            savedIP.gateway = validateString(ctx, ip.gateway.toString())
+            savedIP.contractId = ip.contractId
             await ctx.store.save<PublicIp>(savedIP)
         } else {
-
             const newIP = new PublicIp()
-            newIP.id = item.event.id
+            newIP.id = item.event.id + '-' + validateString(ctx, ip.ip.toString())
             newIP.ip = validateString(ctx, ip.ip.toString())
             newIP.gateway = validateString(ctx, ip.gateway.toString())
             newIP.contractId = ip.contractId
@@ -198,21 +198,18 @@ export async function farmUpdated(
             savedFarm.publicIPs.push(newIP)
             ctx.log.debug({ eventName: item.name, ip: ip.ip.toString() }, `PublicIP: ${ip.ip.toString()} added with farm id: ${savedFarm.farmID}`);
         }
-    })
+    }
 
     await ctx.store.save<Farm>(savedFarm)
 
     const publicIPsOfFarm = await ctx.store.find<PublicIp>(PublicIp, { where: { farm: { id: savedFarm.id } }, relations: { farm: true } })
-    publicIPsOfFarm.forEach(async ip => {
+    for (const ip of publicIPsOfFarm) {
         if (eventPublicIPs.filter(eventIp => validateString(ctx, eventIp.ip.toString()) === ip.ip).length === 0) {
             // IP got removed from farm
             await ctx.store.remove<PublicIp>(ip)
-            // remove ip from savedFarm.publicIPs
-            // savedFarm.publicIPs = savedFarm.publicIPs.filter(savedIP => savedIP.id !== ip.id)
-            // TODO: check if we need this code above? or Cascade delete involving here?
             ctx.log.debug({ eventName: item.name, ip: ip.ip.toString() }, `PublicIP: ${ip.ip.toString()} in farm: ${savedFarm.farmID} removed from publicIPs`);
         }
-    })
+    }
 
     let farm = item.event.args as Farm
     if (farm.dedicatedFarm) {

src/mappings/nodes.ts

@@ -79,13 +79,16 @@ export async function nodeStored(
     await ctx.store.save<Node>(newNode)
 
     const pubConfig = getNodePublicConfig(ctx, node)
-    const newPubConfig = new PublicConfig()
-    newPubConfig.id = item.event.id
-    newPubConfig.ipv4 = pubConfig?.ip4
-    newPubConfig.gw4 = pubConfig?.gw4
-    newPubConfig.ipv6 = pubConfig?.ip6
-    newPubConfig.gw6 = pubConfig?.gw6
-    newPubConfig.node = newNode
+    if (pubConfig) {
+        const newPubConfig = new PublicConfig()
+        newPubConfig.id = item.event.id
+        newPubConfig.ipv4 = pubConfig.ip4
+        newPubConfig.gw4 = pubConfig.gw4
+        newPubConfig.ipv6 = pubConfig.ip6
+        newPubConfig.gw6 = pubConfig.gw6
+        newPubConfig.node = newNode
+        await ctx.store.save<PublicConfig>(newPubConfig)
+    }
 
     if (node.isV43) {
         const nodeAsV43 = node.asV43
@@ -138,7 +141,7 @@ export async function nodeStored(
 
     const interfacesPromisses = nodeEvent.interfaces.map(async intf => {
         const newInterface = new Interfaces()
-        newInterface.id = item.event.id
+        newInterface.id = item.event.id + '-' + validateString(ctx, intf.name.toString())
         newInterface.node = newNode
         newInterface.name = validateString(ctx, intf.name.toString())
         newInterface.mac = validateString(ctx, intf.mac.toString())
@@ -327,7 +330,7 @@ export async function nodeUpdated(
     // Save ones from update event
     await Promise.all(nodeEvent.interfaces.map(async intf => {
         const newInterface = new Interfaces()
-        newInterface.id = item.event.id + validateString(ctx, intf.name.toString())
+        newInterface.id = item.event.id + '-' + validateString(ctx, intf.name.toString())
         newInterface.name = validateString(ctx, intf.name.toString())
         newInterface.mac = validateString(ctx, intf.mac.toString())
         newInterface.ips = intf.ips.map(ip => validateString(ctx, ip.toString())).join(',')
@@ -462,8 +465,9 @@ async function handlePublicConfigV105(ctx: Ctx, eventID: string, nodeID: number,
     if (!config) {
         const pubConfig = await ctx.store.get(PublicConfig, { where: { node: { nodeID } }, relations: { node: true } })
         if (pubConfig) {
-            return await ctx.store.remove(pubConfig)
+            await ctx.store.remove(pubConfig)
         }
+        return
     }
 
     const savedNode = await ctx.store.get(Node, { where: { nodeID: nodeID }, relations: { location: true, interfaces: true } })