@effectstream/sync 0.103.2 → 0.104.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectstream/sync",
-  "version": "0.103.2",
+  "version": "0.104.0",
   "license": "(MIT OR Apache-2.0)",
   "homepage": "https://effectstream.github.io/docs/",
   "repository": {
@@ -13,10 +13,10 @@
   },
   "exports": "./src/mod.ts",
   "dependencies": {
-    "@effectstream/config": "0.103.2",
-    "@effectstream/db": "0.103.2",
-    "@effectstream/log": "0.103.2",
-    "@effectstream/utils": "0.103.2",
+    "@effectstream/config": "0.104.0",
+    "@effectstream/db": "0.104.0",
+    "@effectstream/log": "0.104.0",
+    "@effectstream/utils": "0.104.0",
     "@midnight-ntwrk/ledger-v8": "8.1.0",
     "@midnight-ntwrk/midnight-js-indexer-public-data-provider": "4.1.1",
     "@midnight-ntwrk/onchain-runtime": "npm:@midnight-ntwrk/onchain-runtime-v3@3.0.0",

package/src/sync-protocols/midnight/fetcher.ts

@@ -415,19 +415,31 @@ export class MidnightFetcher extends BaseDataFetcher<
         return c.address.padStart(longest, '0') === contractAddress.padStart(longest, '0');
       })!.state!;
       const primitive = primitiveEntry.primitive;
-      const f = primitive.contract ?? { ledger: (_: StateValue): Record<string, any> => ({}) };
+      const f = primitive.contract;
       const ledgerFromTxStateHex = (f as {
         ledgerFromTxStateHex?: (rawHexState: string) => Record<string, any>;
-      }).ledgerFromTxStateHex;
+      } | undefined)?.ledgerFromTxStateHex;
       let state: Record<string, any>;
-      if (typeof ledgerFromTxStateHex === "function") {
-        state = ledgerFromTxStateHex(rawState);
-      } else {
-        const byteState = new Uint8Array(rawState.match(/.{1,2}/g)!.map(byte => parseInt(byte, 16)));
-        const contractState = ContractState.deserialize(byteState);
-        const stateValue = contractState.data.state;
-        const additionalFields = primitive.parseAdditionalLedgerFields?.(stateValue) ?? {};
-        state = { ...f.ledger(stateValue), ...additionalFields };
+      try {
+        if (typeof ledgerFromTxStateHex === "function") {
+          state = ledgerFromTxStateHex(rawState);
+        } else {
+          const hexBytes = rawState.match(/.{1,2}/g);
+          if (!hexBytes) throw new Error("contract state is empty");
+          const byteState = new Uint8Array(hexBytes.map(byte => parseInt(byte, 16)));
+          const contractState = ContractState.deserialize(byteState);
+          const stateValue = contractState.data.state;
+          const generatedFields = f?.ledger(stateValue) ?? {};
+          const schemaFields = primitive.parseAdditionalLedgerFields?.(stateValue) ?? {};
+          state = { ...generatedFields, ...schemaFields };
+        }
+      } catch (error) {
+        throw new Error(
+          `Failed to decode Midnight contract ${contractAddress} at block ${height}, transaction ${t.hash}: ${
+            error instanceof Error ? error.message : String(error)
+          }`,
+          { cause: error },
+        );
       }
       return {
         syncProtocol: {

package/src/syncProtocolFactory.ts

@@ -17,7 +17,8 @@ import { UtxoRpcSyncState } from "./sync-protocols/utxorpc/state.ts";
 import { isEffectiveServerPredicate, predicateKey } from "./sync-protocols/utxorpc/utils.ts";
 import type { UtxorpcTxPredicate } from "@effectstream/config";
 import type { PrimitiveEntryType } from "./sync-protocols/utxorpc/types.ts";
-import { MidnightFetcher, MidnightSyncState } from "@effectstream/sync";
+import { MidnightFetcher } from "./sync-protocols/midnight/fetcher.ts";
+import { MidnightSyncState } from "./sync-protocols/midnight/state.ts";
 import { AvailFetcher } from "./sync-protocols/avail/fetcher.ts";
 import { AvailSyncState } from "./sync-protocols/avail/state.ts";
 import { NtpFetcher } from "./sync-protocols/ntp/fetcher.ts";