fix: v3.1 phantom pendingInvestOrder (#242)

* fix: v3.1 phantom pendingInvestOrder
Fixes #238

* chore: remove unnecessary logging

Author: filo87

.cursorignore

@@ -0,0 +1,5 @@
+# Log files
+*.log
+**/*.log
+.env.*
+

.gitignore

@@ -27,4 +27,6 @@ src/registry.generated.ts
 tsconfig.tsbuildinfo
 
 /.vscode/
-/.idea/
+/.idea/
+
+**/*.sql.gz

compose.yaml

@@ -0,0 +1,20 @@
+volumes:
+  pgData:
+
+services:
+  db:
+    image: postgres:17
+    volumes:
+      - pgData:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: postgres
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: always

package.json

@@ -4,8 +4,9 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "predev": "pnpm update-registry",
+    "predev": "pnpm update-registry && docker compose up -d",
     "dev": "ponder dev --port 8000 --disable-ui",
+    "postdev": "docker compose down",
     "prestart": "pnpm update-registry",
     "start": "ponder start",
     "preserve": "pnpm update-registry",
@@ -22,7 +23,9 @@
     "prepare": "husky",
     "update-registry": "node scripts/fetch-registry.mjs",
     "evgrep": "scripts/evgrep.sh",
-    "compare-schema": "graphql-inspector diff https://api.centrifuge.io generated/schema.graphql --rule safeUnreachable --rule ignoreDescriptionChanges | grep 'Field.*removed'"
+    "compare-schema": "graphql-inspector diff https://api.centrifuge.io generated/schema.graphql --rule safeUnreachable --rule ignoreDescriptionChanges | grep 'Field.*removed'",
+    "sync:export": "docker compose exec -T db sh -lc 'pg_dump --dbname=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost:5432/$POSTGRES_DB --schema=ponder_sync --no-owner --no-privileges --clean --if-exists' | gzip > $(date +%Y%m%d)_ponder_sync.sql.gz",
+    "sync:restore": "LATEST=$(ls -t *_ponder_sync.sql.gz 2>/dev/null | head -n 1) && [ -n \"$LATEST\" ] && gzip -dc \"$LATEST\" | docker compose exec -T db sh -lc 'psql --dbname=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost:5432/$POSTGRES_DB'"
   },
   "dependencies": {
     "@ponder/utils": "^0.2.17",

ponder.config.ts

@@ -2,6 +2,7 @@ import { createConfig } from "ponder";
 import { chains, blocks } from "./src/chains";
 import { decorateDeploymentContracts } from "./src/contracts";
 import { ERC20Abi } from "./abis/ERC20";
+import { V3_1_MIGRATION_BLOCKS } from "./src/config";
 
 export const contractsV3 = decorateDeploymentContracts(
   "v3",
@@ -60,7 +61,8 @@ export const contractsV3 = decorateDeploymentContracts(
         eventParameter: "token",
       },
     },
-  } as const
+  } as const,
+  V3_1_MIGRATION_BLOCKS
 );
 
 export const contractsV3_1 = decorateDeploymentContracts(
@@ -122,8 +124,7 @@ export const contractsV3_1 = decorateDeploymentContracts(
         eventParameter: "token",
       },
     },
-  } as const,
-  240
+  } as const
 );
 
 export const contracts = { ...contractsV3, ...contractsV3_1 };

src/config.ts

@@ -31,24 +31,34 @@ export const INITIAL_HOLDERS: Record<string, string[]> = {
     "0x2033B1D0714b5DDd66f78d8B75317F1a0d4440De",
     "0xb3DacC732509Ba6B7F25Ad149e56cA44fE901AB9",
     "0xB19Cdd566E5ee580E068ED099136d52906e2ca09",
-     "0x0000000005F458Fd6ba9EEb5f365D83b7dA913dD"
-    ],
+    "0x0000000005F458Fd6ba9EEb5f365D83b7dA913dD",
+  ],
   "281474976710663-0x00010000000000070000000000000001-1": [
     "0x491EDFB0B8b608044e227225C715981a30F3A44E",
     "0x227942bD9C3e4ECA1b76E8199e407e6c52fdacd6",
     "0xB0EC6c4482Ac1Ef77bE239C0AC833CF37A27c876",
     "0xb3DacC732509Ba6B7F25Ad149e56cA44fE901AB9",
     "0xcf5C83A12E0bd55a8c02fc7802203BC23e3efB30",
     "0xb5E93B4434e63B86A2e16e3C37732E24a6af68D6",
-    "0x0000000005F458Fd6ba9EEb5f365D83b7dA913dD"
+    "0x0000000005F458Fd6ba9EEb5f365D83b7dA913dD",
   ],
 };
 
 export const getInitialHolders = (
-    poolId: bigint,
-    tokenId: string,
-    centrifugeId: string
+  poolId: bigint,
+  tokenId: string,
+  centrifugeId: string
 ): string[] => {
-    const key = `${poolId}-${tokenId.toLowerCase()}-${centrifugeId.toLowerCase()}`;
-    return INITIAL_HOLDERS[key] || [];
-};
+  const key = `${poolId}-${tokenId.toLowerCase()}-${centrifugeId.toLowerCase()}`;
+  return INITIAL_HOLDERS[key] || [];
+};
+
+//https://coins.llama.fi/block/chainid/1770163200
+export const V3_1_MIGRATION_BLOCKS = {
+  "1": 24379763,
+  "42161": 428355962,
+  "43114": 77214282,
+  "8453": 41686927,
+  "98866": 49444791,
+  "56": 79150546,
+} as const;

src/contracts.ts

@@ -1,7 +1,7 @@
 import { factory, mergeAbis } from "ponder";
 import { type Abi, getAbiItem } from "viem";
 import fullRegistry from "../generated";
-import { skipBlocks, type RegistryVersions, type Registry, type NetworkNames } from "./chains";
+import { type RegistryVersions, type Registry, type NetworkNames } from "./chains";
 import { networkNames } from "./chains";
 
 // ============================================================================
@@ -270,7 +270,7 @@ export function decorateDeploymentContracts<
   registryVersion: V,
   selectedAbiNames: A,
   additionalMappings: AM,
-  overlappingHours?: number
+  endblocks?: Partial<Record<keyof typeof networkNames, number>>
 ): ContractsWithAdditionalMappings<V, A[number], AM, keyof AM & string> {
   // Validate registry version exists
   const abis = Abis[registryVersion];
@@ -297,7 +297,7 @@ export function decorateDeploymentContracts<
       `${toContractCase(abiName)}${registryVersion.toUpperCase()}`,
       {
         abi,
-        chain: getContractChain(registryVersion, abiName),
+        chain: getContractChain(registryVersion, abiName, endblocks),
       },
     ];
   });
@@ -398,7 +398,7 @@ export function decorateDeploymentContracts<
         mappingName,
         {
           abi: resolvedAbi,
-          chain: getContractChain(registryVersion, m.factory.abi, overlappingHours, {
+          chain: getContractChain(registryVersion, m.factory.abi, endblocks, {
             // Type assertion: event name is validated above to exist in factory ABI
             // Cast through unknown to satisfy type system while maintaining runtime safety
             event: m.factory.eventName,
@@ -427,7 +427,7 @@ export function decorateDeploymentContracts<
 function getContractChain<V extends RegistryVersions, N extends AbiName<V>>(
   registryVersion: V,
   abiName: N,
-  overlappingHours?: number,
+  endBlocks?: Partial<Record<keyof typeof networkNames, number | undefined>>,
   factoryConfig?: {
     event: AbiEventName<V, N>;
     parameter: AbiEventParameter<V, N, AbiEventName<V, N>>;
@@ -465,12 +465,7 @@ function getContractChain<V extends RegistryVersions, N extends AbiName<V>>(
     }
 
     const startBlock = chainValue.deployment.startBlock as number;
-    const endBlock = computeEndBlock(
-      chainId,
-      toContractCase(abiName),
-      registryVersion,
-      overlappingHours
-    );
+    const endBlock = computeEndBlock(chainId, toContractCase(abiName), registryVersion, endBlocks);
     return [chainName, { address, startBlock, endBlock }];
   });
 
@@ -496,62 +491,50 @@ function computeEndBlock(
   chainId: keyof typeof networkNames,
   contractName: string,
   startVersion: RegistryVersions,
-  overlappingHours?: number
+  endBlocks?: Partial<Record<keyof typeof networkNames, number | undefined>>
 ): number | undefined {
+  if (endBlocks) return endBlocks[chainId];
+
   // Get the versions array
   const versions = Object.keys(fullRegistry) as RegistryVersions[];
 
   // Find the index of startVersion in the versions array
-  const startVersionIndex = versions.indexOf(startVersion);
+  const currentVersionIndex = versions.indexOf(startVersion);
 
-  if (startVersionIndex === -1) {
+  if (currentVersionIndex === -1)
     throw new Error(`Start version "${startVersion}" not found in registry versions`);
-  }
 
-  // Get the next version after startVersion
-  const endVersionIndex = startVersionIndex + 1;
+  const nextVersionIndex = currentVersionIndex + 1;
 
-  if (endVersionIndex >= versions.length) {
-    return undefined;
-  }
+  if (nextVersionIndex >= versions.length) return undefined;
 
-  const endVersion = versions[endVersionIndex];
-  if (!endVersion) {
-    return undefined;
-  }
+  const nextVersion = versions[nextVersionIndex];
+  if (!nextVersion) return undefined;
 
   // Get the registry for the next version
-  const endRegistry = fullRegistry[endVersion] as Registry<RegistryVersions>;
+  const nextRegistry = fullRegistry[nextVersion] as Registry<RegistryVersions>;
 
   // Access the chain for the given chainId
   // Use Object.entries to safely access chains
-  const chainEntries = Object.entries(endRegistry.chains) as Entries<typeof endRegistry.chains>;
-  const chainEntry = chainEntries.find(([id]) => id === chainId);
-  if (!chainEntry) {
-    return undefined;
-  }
-  const chain = chainEntry[1];
+  const nextChainEntries = Object.entries(nextRegistry.chains) as Entries<
+    typeof nextRegistry.chains
+  >;
+  const nextChainEntry = nextChainEntries.find(([id]) => id === chainId);
+  if (!nextChainEntry) return undefined;
+
+  const nextChain = nextChainEntry[1];
 
   // Check if the contract exists in this version
-  const contract = chain.contracts[contractName as keyof typeof chain.contracts];
-  if (!contract) {
-    return undefined;
-  }
+  const newContract = nextChain.contracts[contractName as keyof typeof nextChain.contracts];
+  if (!newContract) return undefined;
 
   // Get the block number: use contract.blockNumber if available, otherwise fallback to chain.deployment.startBlock
-  const contractData = contract as { blockNumber?: number | null };
-  const startBlock = contractData.blockNumber ?? chain.deployment.startBlock;
-
-  if (startBlock === null || startBlock === undefined) {
-    return undefined;
-  }
+  const nextContractData = newContract as { blockNumber?: number | null };
+  const nextContractStartBlock = nextContractData.blockNumber ?? nextChain.deployment.startBlock;
 
-  const endBlock = overlappingHours
-    ? startBlock + overlappingHours * skipBlocks[chainId as keyof typeof skipBlocks]
-    : startBlock - 1;
+  if (!nextContractStartBlock) return undefined;
 
-  // Return the end block (start block of next version minus 1)
-  return endBlock;
+  return nextContractStartBlock - 1;
 }
 
 /** Ordered registry version keys (e.g. ["v3", "v3_1"]) for use as message/payload version index. */

src/handlers/gatewayHandlers.ts

@@ -1,6 +1,6 @@
 import { multiMapper } from "../helpers/multiMapper";
 import { logEvent, serviceError } from "../helpers/logger";
-import { BlockchainService } from "../services/BlockchainService";
+import { BlockchainService } from "../services";
 import { timestamper } from "../helpers/timestamper";
 
 import {