envio 3.10.0-subgraph → 3.11.0

package/src/sources/Svm.res

@@ -80,54 +80,3 @@ let make = (~logger: Pino.t): Ecosystem.t => {
   },
   toRawEvent: _ => JsError.throwWithMessage("Raw events are not supported for SVM"),
 }
-
-module GetFinalizedSlot = {
-  let route = Rpc.makeRpcRoute(
-    "getSlot",
-    S.tuple(s => {
-      s.tag(0, {"commitment": "finalized"})
-      ()
-    }),
-    S.int,
-  )
-}
-
-let makeRPCSource = (~chainId, ~rpc: string, ~sourceFor: Source.sourceFor=Sync): Source.t => {
-  let client = Rest.client(rpc)
-
-  let urlHost = switch Utils.Url.getHostFromUrl(rpc) {
-  | None =>
-    JsError.throwWithMessage(
-      `The RPC url for chain ${chainId->ChainId.toString} is in incorrect format. The RPC url needs to start with either http:// or https://`,
-    )
-  | Some(host) => host
-  }
-  let name = `RPC (${urlHost})`
-
-  {
-    name,
-    sourceFor,
-    chainId,
-    poweredByHyperSync: false,
-    pollingInterval: 10_000,
-    getBlockHashes: (~blockNumbers as _, ~logger as _) =>
-      JsError.throwWithMessage("Svm does not support getting block hashes"),
-    getHeightOrThrow: async () => {
-      let timerRef = Performance.now()
-      let height = await GetFinalizedSlot.route->Rest.fetch((), ~client)
-      let seconds = timerRef->Performance.secondsSince
-      {Source.height, requestStats: [{Source.method: "getSlot", seconds}]}
-    },
-    getItemsOrThrow: (
-      ~fromBlock as _,
-      ~toBlock as _,
-      ~addressSet as _,
-      ~knownHeight as _,
-      ~partitionId as _,
-      ~selection as _,
-      ~itemsTarget as _,
-      ~retry as _,
-      ~logger as _,
-    ) => JsError.throwWithMessage("Svm does not support getting items"),
-  }
-}

package/src/sources/Svm.res.mjs

@@ -1,13 +1,8 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Rpc from "./Rpc.res.mjs";
-import * as Rest from "../vendored/Rest.res.mjs";
-import * as Utils from "../Utils.res.mjs";
-import * as ChainId from "../ChainId.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as Internal from "../Internal.res.mjs";
 import * as BlockStore from "./BlockStore.res.mjs";
-import * as Performance from "../bindings/Performance.res.mjs";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
@@ -79,45 +74,6 @@ function make(logger) {
   };
 }
 
-let route = Rpc.makeRpcRoute("getSlot", S$RescriptSchema.tuple(s => {
-  s.tag(0, {
-    commitment: "finalized"
-  });
-}), S$RescriptSchema.int);
-
-let GetFinalizedSlot = {
-  route: route
-};
-
-function makeRPCSource(chainId, rpc, sourceForOpt) {
-  let sourceFor = sourceForOpt !== undefined ? sourceForOpt : "Sync";
-  let client = Rest.client(rpc, undefined);
-  let host = Utils.Url.getHostFromUrl(rpc);
-  let urlHost = host !== undefined ? host : Stdlib_JsError.throwWithMessage(`The RPC url for chain ` + ChainId.toString(chainId) + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
-  let name = `RPC (` + urlHost + `)`;
-  return {
-    name: name,
-    sourceFor: sourceFor,
-    chainId: chainId,
-    poweredByHyperSync: false,
-    pollingInterval: 10000,
-    getBlockHashes: (param, param$1) => Stdlib_JsError.throwWithMessage("Svm does not support getting block hashes"),
-    getHeightOrThrow: async () => {
-      let timerRef = Performance.now();
-      let height = await Rest.fetch(route, undefined, client);
-      let seconds = Performance.secondsSince(timerRef);
-      return {
-        height: height,
-        requestStats: [{
-            method: "getSlot",
-            seconds: seconds
-          }]
-      };
-    },
-    getItemsOrThrow: (param, param$1, param$2, param$3, param$4, param$5, param$6, param$7, param$8) => Stdlib_JsError.throwWithMessage("Svm does not support getting items")
-  };
-}
-
 let transactionFields = Internal.allSvmTransactionFields;
 
 export {
@@ -127,7 +83,5 @@ export {
   eventBlockFieldMask,
   attachAccountActivities,
   make,
-  GetFinalizedSlot,
-  makeRPCSource,
 }
 /* eventTransactionFieldMask Not a pure module */

package/src/sources/SvmHyperSyncSource.res

@@ -10,13 +10,17 @@ type options = {
   addressStore: AddressStore.t,
 }
 
-let namedAccounts = (~idlNames: array<string>, ~accountArguments: array<string>): dict<
-  Envio.svmInstructionAccount,
-> => {
+let namedAccounts = (
+  ~slots: array<Internal.svmAccountSlot>,
+  ~accountArguments: array<string>,
+  ~programId: string,
+): dict<Envio.svmInstructionAccount> => {
   let out = Dict.make()
-  idlNames->Array.forEachWithIndex((name, i) =>
-    switch accountArguments->Array.get(i) {
-    | Some(address) =>
+  slots->Array.forEachWithIndex((slot, i) =>
+    switch (slot, accountArguments->Array.get(i)) {
+    | (Unnamed, _) | (_, None) => ()
+    | (Optional(_), Some(address)) if address === programId => ()
+    | (Required(name), Some(address)) | (Optional(name), Some(address)) =>
       out->Dict.set(
         name,
         {
@@ -25,7 +29,6 @@ let namedAccounts = (~idlNames: array<string>, ~accountArguments: array<string>)
           instructionAccountIndex: i,
         },
       )
-    | None => ()
     }
   )
   out
@@ -94,7 +97,11 @@ let toSvmInstruction = (
   if hasSelection("accounts") {
     out->setField(
       "accounts",
-      namedAccounts(~idlNames=eventConfig.accounts, ~accountArguments=item.accounts),
+      namedAccounts(
+        ~slots=eventConfig.accounts,
+        ~accountArguments=item.accounts,
+        ~programId=item.programId,
+      ),
     )
   }
   if hasSelection("accountArguments") {
@@ -123,12 +130,14 @@ let make = (
 ): t => {
   let name = "SvmHyperSync"
 
+  let apiToken = apiToken->HyperSync.requireApiToken
+
   // The whole per-(instruction, chain) registration set crosses the boundary
   // once at construction; the client derives instruction selections, field
   // selections, Borsh decoders, and the routing index from it.
   let client = SvmHyperSyncClient.make(
     ~url=endpointUrl,
-    ~apiToken?,
+    ~apiToken,
     ~httpReqTimeoutMillis=clientTimeoutMillis,
     ~programs=SvmHyperSyncClient.Registration.fromOnEventRegistrations(onEventRegistrations),
     ~addressStore,
@@ -257,5 +266,7 @@ let make = (
       {height, requestStats: [{method: "getHeight", seconds}]}
     },
     getItemsOrThrow,
+    createHeightSubscription: (~onHeight, ~onStatus) =>
+      HyperSyncSSE.subscribe(~hyperSyncUrl=endpointUrl, ~apiToken, ~onHeight, ~onStatus),
   }
 }

package/src/sources/SvmHyperSyncSource.res.mjs

@@ -4,23 +4,42 @@ import * as Source from "./Source.res.mjs";
 import * as HyperSync from "./HyperSync.res.mjs";
 import * as Performance from "../bindings/Performance.res.mjs";
 import * as Stdlib_Null from "@rescript/runtime/lib/es6/Stdlib_Null.js";
+import * as HyperSyncSSE from "./HyperSyncSSE.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as SvmHyperSyncClient from "./SvmHyperSyncClient.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 
-function namedAccounts(idlNames, accountArguments) {
+function namedAccounts(slots, accountArguments, programId) {
   let out = {};
-  idlNames.forEach((name, i) => {
-    let address = accountArguments[i];
-    if (address !== undefined) {
-      out[name] = {
-        address: address,
-        accountName: name,
-        instructionAccountIndex: i
-      };
+  slots.forEach((slot, i) => {
+    let match = accountArguments[i];
+    let name;
+    let address;
+    if (typeof slot !== "object") {
       return;
     }
+    if (slot.TAG === "Required") {
+      if (match === undefined) {
+        return;
+      }
+      name = slot._0;
+      address = match;
+    } else {
+      if (match === undefined) {
+        return;
+      }
+      if (match === programId) {
+        return;
+      }
+      name = slot._0;
+      address = match;
+    }
+    out[name] = {
+      address: address,
+      accountName: name,
+      instructionAccountIndex: i
+    };
   });
   return out;
 }
@@ -70,7 +89,7 @@ function toSvmInstruction(item, programName, instructionName, eventConfig, field
     setField(out, "args", args);
   }
   if (fieldSelection.instructionFields.has("accounts")) {
-    setField(out, "accounts", namedAccounts(eventConfig.accounts, item.accounts));
+    setField(out, "accounts", namedAccounts(eventConfig.accounts, item.accounts, item.programId));
   }
   if (fieldSelection.instructionFields.has("accountArguments")) {
     setField(out, "accountArguments", item.accounts);
@@ -83,8 +102,10 @@ function toSvmInstruction(item, programName, instructionName, eventConfig, field
 
 function make(param) {
   let onEventRegistrations = param.onEventRegistrations;
+  let endpointUrl = param.endpointUrl;
   let chainId = param.chainId;
-  let client = SvmHyperSyncClient.make(param.endpointUrl, param.apiToken, param.clientTimeoutMillis, undefined, undefined, SvmHyperSyncClient.Registration.fromOnEventRegistrations(onEventRegistrations), param.addressStore);
+  let apiToken = HyperSync.requireApiToken(param.apiToken);
+  let client = SvmHyperSyncClient.make(endpointUrl, apiToken, param.clientTimeoutMillis, undefined, undefined, SvmHyperSyncClient.Registration.fromOnEventRegistrations(onEventRegistrations), param.addressStore);
   let getItemsOrThrow = async (fromBlock, toBlock, addressSet, knownHeight, param, selection, itemsTarget, retry, param$1) => {
     let totalTimeRef = Performance.now();
     let pageFetchRef = Performance.now();
@@ -178,7 +199,8 @@ function make(param) {
           }]
       };
     },
-    getItemsOrThrow: getItemsOrThrow
+    getItemsOrThrow: getItemsOrThrow,
+    createHeightSubscription: (onHeight, onStatus) => HyperSyncSSE.subscribe(endpointUrl, apiToken, onHeight, onStatus)
   };
 }
 

package/svm.schema.json

@@ -66,6 +66,13 @@
       "items": {
         "$ref": "#/$defs/Chain"
       }
+    },
+    "programs": {
+      "description": "Solana programs to index. Programs are defined once for the whole project; `program_id` says where each one lives on every chain.",
+      "type": "array",
+      "items": {
+        "$ref": "#/$defs/Program"
+      }
     }
   },
   "additionalProperties": false,
@@ -224,20 +231,18 @@
           ]
         },
         "rpc": {
-          "description": "RPC endpoint URL for connecting to the Svm cluster to fetch blockchain data. Required unless `experimental` is set, in which case it is ignored in favour of the experimental HyperSync source.",
+          "description": "RPC endpoint URL for the Svm cluster. Accepted but unused: instruction sync is served by HyperSync.",
           "type": [
             "string",
             "null"
           ]
         },
-        "start_block": {
-          "description": "The slot number at which the indexer should start ingesting data",
-          "type": "integer",
-          "format": "uint64",
-          "minimum": 0
+        "start_slot": {
+          "description": "The slot at which the indexer should start ingesting data, or \"latest\" to start from the chain's current slot when the indexer is first deployed. Once resolved, the concrete slot is persisted and reused every time the indexer resumes normally (for example recovering from a crash), so downtime is backfilled instead of skipped. Running `envio start`/`dev` with -r (--restart) resets this like any other config change: \"latest\" resolves again, against the head at that time.",
+          "$ref": "#/$defs/StartBlock"
         },
-        "end_block": {
-          "description": "The slot number at which the indexer should terminate.",
+        "end_slot": {
+          "description": "The slot at which the indexer should terminate.",
           "type": [
             "integer",
             "null"
@@ -254,11 +259,11 @@
           "format": "uint32",
           "minimum": 0
         },
-        "experimental": {
-          "description": "Experimental HyperSync-backed instruction indexing. This config shape Veil change in future releases.",
+        "hypersync_config": {
+          "description": "HyperSync Config for fetching historical instructions on this chain. Optional for the `solana` and `solana-devnet` chain ids, which default to their public HyperSync endpoints; required for any other chain id.",
           "anyOf": [
             {
-              "$ref": "#/$defs/Experimental"
+              "$ref": "#/$defs/HypersyncConfig"
             },
             {
               "type": "null"
@@ -269,7 +274,7 @@
       "additionalProperties": false,
       "required": [
         "id",
-        "start_block"
+        "start_slot"
       ]
     },
     "ChainId": {
@@ -293,31 +298,23 @@
         "solana-devnet"
       ]
     },
-    "Experimental": {
-      "type": "object",
-      "properties": {
-        "hypersync_config": {
-          "description": "HyperSync Config for fetching historical instructions on this chain. Optional for the `solana` and `solana-devnet` chain ids, which default to their public HyperSync endpoints; required for any other chain id.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/HypersyncConfig"
-            },
-            {
-              "type": "null"
-            }
-          ]
+    "StartBlock": {
+      "description": "A chain's configured start block: either a concrete block number or the\nliteral \"latest\". Config parsing never touches the network, so `Latest`\nstays unresolved here — it's resolved once at runtime, right before the\nindexer's first-ever persisted state is written, and never re-resolved\non a normal resume (see packages/envio/src/sources/StartBlockResolver.res).\nNote: this repo's `-r`/`--restart` CLI flag wipes the DB and re-deploys\nfrom scratch, so it re-resolves \"latest\" too — \"resume\" here means the\nopposite: recovering from a crash or process restart without `-r`.",
+      "anyOf": [
+        {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0
         },
-        "programs": {
-          "description": "Solana programs to index on this chain.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/Program"
-          }
+        {
+          "$ref": "#/$defs/StartBlockTag"
         }
-      },
-      "additionalProperties": false,
-      "required": [
-        "programs"
+      ]
+    },
+    "StartBlockTag": {
+      "type": "string",
+      "enum": [
+        "latest"
       ]
     },
     "HypersyncConfig": {
@@ -341,8 +338,8 @@
           "type": "string"
         },
         "program_id": {
-          "description": "Base58-encoded program id (32 bytes).",
-          "type": "string"
+          "description": "Base58-encoded program id (32 bytes). A single value is allowed only when the config defines one chain; with several, give a mapping keyed by chain id that names every one of them, writing `_` for a chain the program is not deployed on.",
+          "$ref": "#/$defs/SvmProgramId"
         },
         "handler": {
           "description": "Optional relative path to a file where handlers are registered for the given program. If not provided, handlers can be auto-loaded from the src directory.",
@@ -359,7 +356,7 @@
           ]
         },
         "instructions": {
-          "description": "Instructions to index. With `idl:`, omit this list to take the full usable IDL catalog. A YAML row overwrites the IDL instruction of the same name, or adds a new name to the catalog, and must set `discriminator` plus both `accounts` and `args`. Without `idl:`, omit `discriminator` to match every instruction of the program; set both `accounts` and `args`, or omit both.",
+          "description": "Instructions to index. With `idl:`, omit this list to take the full usable IDL catalog. A row whose name the IDL declares replaces that instruction, and must spell out `accounts` and `args`; every other row adds one. Give `accounts` where you want the slots named — an empty list names none, the same as leaving it out. `args` is not the same shape: setting it attaches a decoder that also filters, so leaving it out and setting it to `[]` are different asks.",
           "type": "array",
           "items": {
             "$ref": "#/$defs/Instruction"
@@ -372,6 +369,28 @@
         "program_id"
       ]
     },
+    "SvmProgramId": {
+      "title": "Program id",
+      "description": "Base58-encoded program id (32 bytes).\nA single value is allowed only when the config defines one chain.\nWith several chains, give a mapping keyed by chain id that names every one of them; write `_` for a chain the program is not deployed on.",
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        }
+      ],
+      "examples": [
+        "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s",
+        {
+          "solana": "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s",
+          "solana-devnet": "_"
+        }
+      ]
+    },
     "Instruction": {
       "type": "object",
       "properties": {
@@ -380,24 +399,21 @@
           "type": "string"
         },
         "discriminator": {
-          "description": "Hex-encoded instruction-data prefix used as the discriminator (\"0x\" optional), of any whole number of bytes; an 8-byte value matches the standard Anchor discriminator. With `idl:` on the program, this field is required on every YAML row. Without `idl:`, omit it to match every instruction of the program. Every instruction whose prefix an on-chain call carries receives it, so a program-wide entry fires alongside a keyed one, and two entries may share a prefix (say, the layouts before and after a program upgrade): each decodes with its own `args`, and one whose layout rejects the data is skipped for that call.",
-          "type": [
-            "string",
-            "null"
-          ]
+          "description": "0x-prefixed hex instruction-data prefix to dispatch on, of any whole number of bytes; an 8-byte value matches the standard Anchor discriminator. The empty prefix, written \"0x\", is carried by every call, so it is how a row matches every instruction of the program. This is the form `instruction.discriminator` reads back, so a config value and a handler comparison are the same string. Every instruction whose prefix an on-chain call carries receives it, so a program-wide entry fires alongside a keyed one, and two entries may share a prefix (say, the layouts before and after a program upgrade): each decodes with its own `args`, and one whose layout rejects the data is skipped for that call.",
+          "type": "string"
         },
         "accounts": {
-          "description": "Optional positional account names. The Nth entry names account slot N on the dispatched instruction; surfaces as `instruction.accounts.<name>` when `fields.instruction` includes `accounts`.",
+          "description": "Optional positional account slots, in the order the program expects them. The Nth entry names account slot N on the dispatched instruction; named slots surface as `instruction.accounts.<name>` when `fields.instruction` includes `accounts`. The raw slots are available either way, so this only adds the names. Required on a row that replaces an instruction the IDL declares.",
           "type": [
             "array",
             "null"
           ],
           "items": {
-            "type": "string"
+            "$ref": "#/$defs/SvmAccountSlot"
           }
         },
         "args": {
-          "description": "Optional Borsh argument schema. Each entry names one arg and gives its type; the decoder walks the instruction data after the discriminator in declared order. Must be set together with `accounts` when either is present.",
+          "description": "Borsh argument schema. Each entry names one arg and gives its type; the decoder walks the instruction data after the discriminator in declared order, and a call whose data the layout rejects is skipped. Setting it is therefore also a filter: `[]` says the instruction takes no arguments, so only calls carrying nothing past the discriminator are indexed. Omit it instead to attach no decoder at all — every matched call is indexed and the payload stays raw, reachable as `instruction.data`. An `idl` always declares the layout of the instructions it names, empty included. Required on a row that replaces an instruction the IDL declares.",
           "type": [
             "array",
             "null"
@@ -409,7 +425,19 @@
       },
       "additionalProperties": false,
       "required": [
-        "name"
+        "name",
+        "discriminator"
+      ]
+    },
+    "SvmAccountSlot": {
+      "title": "Account slot",
+      "description": "One positional account slot of the instruction.\n- `payer` names a slot the call always carries; it surfaces as `instruction.accounts.payer`.\n- `?authority` names an optional slot: the key is absent from `instruction.accounts` when the call leaves the slot out or fills it with the program id.\n- `_` holds a position without naming it, so the slots after it keep theirs. It is never surfaced and never filterable, and the list may not end with one.",
+      "type": "string",
+      "pattern": "^(?:_|\\??[A-Za-z0-9_]*[A-Za-z][A-Za-z0-9_]*)$",
+      "examples": [
+        "payer",
+        "?authority",
+        "_"
       ]
     },
     "ArgDef": {
@@ -432,7 +460,7 @@
       ]
     },
     "ArgType": {
-      "description": "User-facing Borsh type grammar. Mirrors\n`hypersync_client_solana::decode::FieldType`. The YAML accepts either:\n- A bare string for primitives (`\"u64\"`, `\"pubkey\"`, `\"bool\"`, ...).\n- A tagged object for composites (`{ vec: u8 }`, `{ option: pubkey }`,\n  `{ array: [u8, 32] }`, `{ defined: \"DataV2\" }`).\n- An object with `kind: struct` or `kind: enum` for nominal types\n  declared inline on this field. Most users will use `defined` and\n  declare the nominal types under the program's `types:` block (Anchor\n  IDL shape) once that lands; for now inline `struct` / `enum` is the\n  only way to express nominal shapes ad-hoc.",
+      "description": "User-facing Borsh type grammar. Mirrors\n`hypersync_client_solana::decode::FieldType`. The YAML accepts either:\n- A bare string for a primitive (`u64`, `pubkey`, `bool`, ...).\n- A one-key mapping for a composite (`{ vec: u8 }`, `{ option: pubkey }`,\n  `{ array: [u8, 32] }`, `{ struct: [...] }`, `{ enum: [...] }`).\n\nA nominal type is declared inline with `struct` / `enum` at the field\nthat uses it. There is no way to name one and refer to it: attach an\n`idl` to the program when its types are shared between instructions.",
       "anyOf": [
         {
           "$ref": "#/$defs/ArgPrimitive"
@@ -516,20 +544,7 @@
           "additionalProperties": false
         },
         {
-          "description": "Reference to a nominal type defined in the program-level\n`defined_types` registry (populated from an Anchor IDL `types:`\nblock).",
-          "type": "object",
-          "properties": {
-            "defined": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "defined"
-          ],
-          "additionalProperties": false
-        },
-        {
-          "description": "Inline-or-registry struct. Used as a nominal type definition in\nthe `defined_types` registry; rarely seen at the field level.",
+          "description": "A struct, declared inline at the field that uses it or held in the\n`defined_types` registry.",
           "type": "object",
           "properties": {
             "struct": {
@@ -545,7 +560,7 @@
           "additionalProperties": false
         },
         {
-          "description": "Inline-or-registry enum. Same role as `Struct`: a nominal type\ndefinition in the `defined_types` registry.",
+          "description": "An enum, declared inline at the field that uses it or held in the\n`defined_types` registry. Borsh selects a variant by its position\nhere, with a one-byte tag.",
           "type": "object",
           "properties": {
             "enum": {