@arkiv-network/sdk 0.0.36-dev.0 → 0.0.36-dev.4

package/dist/_types/query/queryResult.d.ts

@@ -0,0 +1,15 @@
+import type { Entity } from "../types/entity";
+import type { QueryBuilder } from "./queryBuilder";
+export declare class QueryResult {
+    entities: Entity[];
+    private _endOfIteration;
+    private _cursor;
+    private _limit;
+    private _validAtBlock;
+    private _queryBuilder;
+    get queryBuilder(): QueryBuilder;
+    get cursor(): string | undefined;
+    constructor(entities: Entity[], queryBuilder: QueryBuilder, cursor: string | undefined, limit: number | undefined, validAtBlock: bigint | undefined);
+    next(): Promise<void>;
+}
+//# sourceMappingURL=queryResult.d.ts.map

package/dist/_types/query/queryResult.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryResult.d.ts","sourceRoot":"","sources":["../../../src/query/queryResult.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAElD,qBAAa,WAAW;IACvB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,aAAa,CAAoB;IACzC,OAAO,CAAC,aAAa,CAAc;IAGnC,IAAI,YAAY,IAAI,YAAY,CAE/B;IAED,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAE/B;gBAGA,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,MAAM,GAAG,SAAS;IAU3B,IAAI;CAoBV"}

package/dist/_types/types/annotation.d.ts

@@ -0,0 +1,5 @@
+export type Annotation = {
+    key: string;
+    value: string | number;
+};
+//# sourceMappingURL=annotation.d.ts.map

package/dist/_types/types/annotation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"annotation.d.ts","sourceRoot":"","sources":["../../../src/types/annotation.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG;IACxB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CACtB,CAAA"}

package/dist/_types/types/entity.d.ts

@@ -0,0 +1,13 @@
+import { type Hex } from "viem";
+import type { Annotation } from "./annotation";
+export declare class Entity {
+    key: Hex;
+    owner: Hex;
+    expiresAtBlock: bigint;
+    payload: Uint8Array;
+    annotations: Annotation[];
+    constructor(key: Hex, owner: Hex, expiresAtBlock: bigint, payload: Uint8Array, annotations: Annotation[]);
+    toText(): string;
+    toJson(): any;
+}
+//# sourceMappingURL=entity.d.ts.map

package/dist/_types/types/entity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../src/types/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,GAAG,EAAE,MAAM,MAAM,CAAA;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAE9C,qBAAa,MAAM;IAClB,GAAG,EAAE,GAAG,CAAA;IACR,KAAK,EAAE,GAAG,CAAA;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,UAAU,CAAA;IACnB,WAAW,EAAE,UAAU,EAAE,CAAA;gBAGxB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,GAAG,EACV,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,UAAU,EACnB,WAAW,EAAE,UAAU,EAAE;IAS1B,MAAM,IAAI,MAAM;IAIhB,MAAM,IAAI,GAAG;CASb"}

package/dist/_types/types/events.d.ts

@@ -0,0 +1,30 @@
+import type { Hex } from "viem";
+export type OnEntityCreatedEvent = {
+    entityKey: Hex;
+    owner: Hex;
+    expirationBlock: number;
+    cost: bigint;
+};
+export type OnEntityUpdatedEvent = {
+    entityKey: Hex;
+    owner: Hex;
+    oldExpirationBlock: number;
+    newExpirationBlock: number;
+    cost: bigint;
+};
+export type OnEntityDeletedEvent = {
+    entityKey: Hex;
+    owner: Hex;
+};
+export type OnEntityExpiredEvent = {
+    entityKey: Hex;
+    owner: Hex;
+};
+export type OnEntityExpiresInExtendedEvent = {
+    entityKey: Hex;
+    owner: Hex;
+    oldExpirationBlock: number;
+    newExpirationBlock: number;
+    cost: bigint;
+};
+//# sourceMappingURL=events.d.ts.map

package/dist/_types/types/events.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/types/events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAE/B,MAAM,MAAM,oBAAoB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IACd,KAAK,EAAE,GAAG,CAAA;IACV,eAAe,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IACd,KAAK,EAAE,GAAG,CAAA;IACV,kBAAkB,EAAE,MAAM,CAAA;IAC1B,kBAAkB,EAAE,MAAM,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IACd,KAAK,EAAE,GAAG,CAAA;CACV,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IACd,KAAK,EAAE,GAAG,CAAA;CACV,CAAA;AAED,MAAM,MAAM,8BAA8B,GAAG;IAC5C,SAAS,EAAE,GAAG,CAAA;IACd,KAAK,EAAE,GAAG,CAAA;IACV,kBAAkB,EAAE,MAAM,CAAA;IAC1B,kBAAkB,EAAE,MAAM,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;CACZ,CAAA"}

package/dist/_types/types/index.d.ts

@@ -0,0 +1,4 @@
+export type { Annotation } from "./annotation";
+export type { Entity } from "./entity";
+export type { TxParams } from "./txParams";
+//# sourceMappingURL=index.d.ts.map

package/dist/_types/types/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACtC,YAAY,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA"}

package/dist/_types/types/rpcSchema.d.ts

@@ -0,0 +1,76 @@
+import type { Hex, PublicRpcSchema } from "viem";
+export type RpcEntity = {
+    key: Hex;
+    value: string;
+    expiresAt: bigint;
+    owner: Hex;
+    stringAnnotations?: [{
+        key: string;
+        value: string;
+    }];
+    numericAnnotations?: [{
+        key: string;
+        value: number;
+    }];
+};
+export type RpcQueryOptions = {
+    atBlock?: bigint;
+    includeData?: RpcIncludeData;
+    resultsPerPage?: number;
+    cursor?: string;
+};
+export type RpcIncludeData = {
+    key: boolean;
+    annotations: boolean;
+    payload: boolean;
+    expiration: boolean;
+    owner: boolean;
+};
+export type ArkivRpcSchema = [
+    {
+        Method: "golembase_getStorageValue";
+        Parameters?: [entityId: Hex];
+        ReturnType: string;
+    },
+    {
+        Method: "arkiv_query";
+        Parameters?: [query: string, queryOptions?: RpcQueryOptions];
+        ReturnType: {
+            data: [RpcEntity];
+            blockNumber: bigint;
+            cursor: string;
+        };
+    },
+    {
+        Method: "golembase_getEntityMetaData";
+        Parameters?: [entityId: Hex];
+        ReturnType: {
+            expiresAtBlock: number;
+            owner: Hex;
+            numericAnnotations: [{
+                key: string;
+                value: number;
+            }];
+            stringAnnotations: [{
+                key: string;
+                value: string;
+            }];
+        };
+    },
+    {
+        Method: "arkiv_getBlockTiming";
+        Parameters?: [];
+        ReturnType: {
+            current_block: bigint;
+            current_block_time: number;
+            duration: number;
+        };
+    },
+    {
+        Method: "arkiv_getEntityCount";
+        Parameters?: [];
+        ReturnType: number;
+    }
+];
+export type PublicArkivRpcSchema = [...PublicRpcSchema, ...ArkivRpcSchema];
+//# sourceMappingURL=rpcSchema.d.ts.map

package/dist/_types/types/rpcSchema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpcSchema.d.ts","sourceRoot":"","sources":["../../../src/types/rpcSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAEhD,MAAM,MAAM,SAAS,GAAG;IACvB,GAAG,EAAE,GAAG,CAAA;IACR,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,GAAG,CAAA;IACV,iBAAiB,CAAC,EAAE,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACpD,kBAAkB,CAAC,EAAE,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACrD,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,cAAc,CAAA;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC5B,GAAG,EAAE,OAAO,CAAA;IACZ,WAAW,EAAE,OAAO,CAAA;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,EAAE,OAAO,CAAA;IACnB,KAAK,EAAE,OAAO,CAAA;CACd,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC5B;QACC,MAAM,EAAE,2BAA2B,CAAA;QACnC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;QAC5B,UAAU,EAAE,MAAM,CAAA;KAClB;IACD;QACC,MAAM,EAAE,aAAa,CAAA;QACrB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,eAAe,CAAC,CAAA;QAC5D,UAAU,EAAE;YACX,IAAI,EAAE,CAAC,SAAS,CAAC,CAAA;YACjB,WAAW,EAAE,MAAM,CAAA;YACnB,MAAM,EAAE,MAAM,CAAA;SACd,CAAA;KACD;IACD;QACC,MAAM,EAAE,6BAA6B,CAAA;QACrC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;QAC5B,UAAU,EAAE;YACX,cAAc,EAAE,MAAM,CAAA;YACtB,KAAK,EAAE,GAAG,CAAA;YACV,kBAAkB,EAAE,CAAC;gBAAE,GAAG,EAAE,MAAM,CAAC;gBAAC,KAAK,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;YACpD,iBAAiB,EAAE,CAAC;gBAAE,GAAG,EAAE,MAAM,CAAC;gBAAC,KAAK,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SACnD,CAAA;KACD;IACD;QACC,MAAM,EAAE,sBAAsB,CAAA;QAC9B,UAAU,CAAC,EAAE,EAAE,CAAA;QACf,UAAU,EAAE;YACX,aAAa,EAAE,MAAM,CAAA;YACrB,kBAAkB,EAAE,MAAM,CAAA;YAC1B,QAAQ,EAAE,MAAM,CAAA;SAChB,CAAA;KACD;IACD;QACC,MAAM,EAAE,sBAAsB,CAAA;QAC9B,UAAU,CAAC,EAAE,EAAE,CAAA;QACf,UAAU,EAAE,MAAM,CAAA;KAClB;CACD,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,cAAc,CAAC,CAAA"}

package/dist/_types/types/txParams.d.ts

@@ -0,0 +1,14 @@
+export type TxParams = {
+    gas?: bigint;
+    nonce?: number;
+    gasPrice?: bigint;
+    maxFeePerGas?: never;
+    maxPriorityFeePerGas?: never;
+} | {
+    gas?: bigint;
+    nonce?: number;
+    maxFeePerGas?: bigint;
+    maxPriorityFeePerGas?: bigint;
+    gasPrice?: never;
+};
+//# sourceMappingURL=txParams.d.ts.map

package/dist/_types/types/txParams.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"txParams.d.ts","sourceRoot":"","sources":["../../../src/types/txParams.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GACjB;IACA,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,KAAK,CAAA;IACpB,oBAAoB,CAAC,EAAE,KAAK,CAAA;CAC3B,GACD;IACA,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,EAAE,KAAK,CAAA;CACf,CAAA"}

package/dist/_types/utils/arkivTransactions.d.ts

@@ -0,0 +1,15 @@
+import { type Hex } from "viem";
+import type { CreateEntityParameters } from "../actions/wallet/createEntity";
+import type { DeleteEntityParameters } from "../actions/wallet/deleteEntity";
+import type { ExtendEntityParameters } from "../actions/wallet/extendEntity";
+import type { UpdateEntityParameters } from "../actions/wallet/updateEntity";
+import type { ArkivClient } from "../clients/baseClient";
+import type { TxParams } from "../types";
+export declare function opsToTxData({ creates, updates, deletes, extensions, }: {
+    creates?: CreateEntityParameters[];
+    updates?: UpdateEntityParameters[];
+    deletes?: DeleteEntityParameters[];
+    extensions?: ExtendEntityParameters[];
+}): `0x${string}`;
+export declare function sendArkivTransaction(client: ArkivClient, data: Hex, txParams?: TxParams): Promise<import("viem").TransactionReceipt>;
+//# sourceMappingURL=arkivTransactions.d.ts.map

package/dist/_types/utils/arkivTransactions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"arkivTransactions.d.ts","sourceRoot":"","sources":["../../../src/utils/arkivTransactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAgB,MAAM,MAAM,CAAA;AAC7C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAC5E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAC5E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAC5E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAExC,wBAAgB,WAAW,CAAC,EAC3B,OAAO,EACP,OAAO,EACP,OAAO,EACP,UAAU,GACV,EAAE;IACF,OAAO,CAAC,EAAE,sBAAsB,EAAE,CAAA;IAClC,OAAO,CAAC,EAAE,sBAAsB,EAAE,CAAA;IAClC,OAAO,CAAC,EAAE,sBAAsB,EAAE,CAAA;IAClC,UAAU,CAAC,EAAE,sBAAsB,EAAE,CAAA;CACrC,iBAyCA;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,QAAQ,8CA2B7F"}

package/dist/_types/utils/entities.d.ts

@@ -0,0 +1,4 @@
+import { Entity } from "../types/entity";
+import type { RpcEntity } from "../types/rpcSchema";
+export declare function entityFromRpcResult(rpcEntity: RpcEntity): Promise<Entity>;
+//# sourceMappingURL=entities.d.ts.map

package/dist/_types/utils/entities.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entities.d.ts","sourceRoot":"","sources":["../../../src/utils/entities.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEnD,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,SAAS,mBAW7D"}

package/dist/_types/utils/expirationTime.d.ts

@@ -0,0 +1,12 @@
+export declare const ExpirationTime: {
+    fromSeconds: (seconds: number) => number;
+    fromMinutes: (minutes: number) => number;
+    fromHours: (hours: number) => number;
+    fromDays: (days: number) => number;
+    fromWeeks: (weeks: number) => number;
+    fromMonths: (months: number) => number;
+    fromYears: (years: number) => number;
+    fromBlocks: (blocks: number) => number;
+    fromDate: (date: Date) => number;
+};
+//# sourceMappingURL=expirationTime.d.ts.map

package/dist/_types/utils/expirationTime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"expirationTime.d.ts","sourceRoot":"","sources":["../../../src/utils/expirationTime.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc;2BACH,MAAM;2BACN,MAAM;uBACV,MAAM;qBACR,MAAM;uBACJ,MAAM;yBACJ,MAAM;uBACR,MAAM;yBACJ,MAAM;qBACV,IAAI;CACrB,CAAA"}

package/dist/_types/utils/index.d.ts

@@ -0,0 +1,4 @@
+export * from "viem/utils";
+export * from "./expirationTime";
+export * from "./payload";
+//# sourceMappingURL=index.d.ts.map

package/dist/_types/utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA"}

package/dist/_types/utils/payload.d.ts

@@ -0,0 +1,3 @@
+export declare function jsonToPayload(json: object): Uint8Array;
+export declare function stringToPayload(data: string): Uint8Array;
+//# sourceMappingURL=payload.d.ts.map

package/dist/_types/utils/payload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"payload.d.ts","sourceRoot":"","sources":["../../../src/utils/payload.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAEtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAExD"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@arkiv-network/sdk",
-	"version": "0.0.36-dev.0",
+	"version": "0.0.36-dev.4",
 	"description": "TypeScript-only client library for Arkiv blockchain interactions",
 	"type": "module",
 	"main": "./dist/_cjs/index.js",
@@ -77,10 +77,11 @@
 		"lint:fix": "biome check --write src/",
 		"package": "rimraf arkiv-network-sdk-*.tgz && bun run build && bun pm pack --no-cache",
 		"package:test": "bun run package && mv arkiv-network-sdk-*.tgz arkiv-network-sdk-latest.tgz",
-		"publish-main": "npm publish --access public",
-		"publish-main:dry": "npm publish --access public --dry-run",
-		"publish-dev": "npm version prerelease --preid=dev && npm publish --access public --tag dev",
-		"publish-dev:dry": "npm version prerelease --preid=dev && npm publish --access public --tag dev --dry-run"
+		"prepublishOnly": "bun run build && bun run package && mv arkiv-network-sdk-*.tgz arkiv-network-sdk-latest.tgz",
+		"publish-main": "npm publish ./arkiv-network-sdk-latest.tgz --access public",
+		"publish-main:dry": "npm publish ./arkiv-network-sdk-latest.tgz --access public --dry-run",
+		"publish-dev": "npm version prerelease --preid=dev && npm publish ./arkiv-network-sdk-latest.tgz --access public --tag dev",
+		"publish-dev:dry": "npm version prerelease --preid=dev && npm publish ./arkiv-network-sdk-latest.tgz --access public --tag dev --dry-run"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.2.4",

package/src/actions/public/getEntity.ts

@@ -1,13 +1,18 @@
 import type { Hex } from "viem"
 import type { ArkivClient } from "../../clients/baseClient"
+import { NoEntityFoundError } from "../../query/errors"
 import { entityFromRpcResult } from "../../utils/entities"
 
 export async function getEntity(client: ArkivClient, key: Hex) {
-	const payload = await client.request({
-		method: "golembase_getStorageValue",
-		params: [key],
+	const result = await client.request({
+		method: "arkiv_query",
+		params: [`$key = ${key}`],
 	})
-	console.debug("Payload", payload)
+	console.debug("GetEntity result", result)
 
-	return entityFromRpcResult(client, key, payload)
+	if (!result.data) {
+		throw new NoEntityFoundError()
+	}
+
+	return entityFromRpcResult(result.data[0])
 }

package/src/actions/public/getEntityCount.ts

@@ -0,0 +1,10 @@
+import type { ArkivClient } from "../../clients/baseClient"
+
+export async function getEntityCount(client: ArkivClient) {
+	const count = await client.request({
+		method: "arkiv_getEntityCount",
+		params: [],
+	})
+
+	return count
+}

package/src/actions/public/query.ts

@@ -3,13 +3,11 @@ import { entityFromRpcResult } from "../../utils/entities"
 
 export async function query(client: ArkivClient, query: string) {
 	const result = await client.request({
-		method: "golembase_queryEntities",
+		method: "arkiv_query",
 		params: [query],
 	})
 
-	const entities = await Promise.all(
-		result.map((entity) => entityFromRpcResult(client, entity.key, entity.value)),
-	)
+	const entities = await Promise.all(result.data.map((entity) => entityFromRpcResult(entity)))
 
 	return entities
 }

package/src/clients/decorators/arkivPublic.ts

@@ -1,6 +1,7 @@
 import type { Account, Chain, Client, Hex, PublicActions, Transport } from "viem"
 import { getBlockTiming } from "../../actions/public/getBlockTiming"
 import { getEntity } from "../../actions/public/getEntity"
+import { getEntityCount } from "../../actions/public/getEntityCount"
 import { query } from "../../actions/public/query"
 import { subscribeEntityEvents } from "../../actions/public/subscribeEntityEvents"
 import { QueryBuilder } from "../../query/queryBuilder"
@@ -95,6 +96,42 @@ export type PublicArkivActions<
 	 */
 	query: (query: string) => Promise<Entity[]>
 
+	/**
+	 * Returns the number of entities in the DBChain.
+	 * @returns The number of entities in the DBChain. {@link number}
+	 *
+	 * @example
+	 * import { createPublicClient, http } from 'arkiv'
+	 * import { kaolin } from 'arkiv/chains'
+	 *
+	 * const client = createPublicClient({
+	 *   chain: kaolin,
+	 *   transport: http(),
+	 * })
+	 * const entityCount = await client.getEntityCount()
+	 * // entityCount = 0
+	 */
+	getEntityCount: () => Promise<number>
+
+	/**
+	 * Returns the current block timing.
+	 * @returns The current block timing. {@link GetBlockTimingReturnType}
+	 *
+	 * @example
+	 * import { createPublicClient, http } from 'arkiv'
+	 * import { kaolin } from 'arkiv/chains'
+	 *
+	 * const client = createPublicClient({
+	 *   chain: kaolin,
+	 *   transport: http(),
+	 * })
+	 * const blockTiming = await client.getBlockTiming()
+	 * // {
+	 * //   currentBlock: 10n, // block number
+	 * //   currentBlockTime: 1234567890, // block timestamp
+	 * //   blockDuration: 2, // in seconds
+	 * // }
+	 */
 	getBlockTiming: () => Promise<{
 		currentBlock: bigint
 		currentBlockTime: number
@@ -131,6 +168,7 @@ export function publicArkivActions<
 		query: (rawQuery: string) => query(client, rawQuery),
 		buildQuery: () => new QueryBuilder(client),
 		getBlockTiming: () => getBlockTiming(client),
+		getEntityCount: () => getEntityCount(client),
 		subscribeEntityEvents: (
 			{
 				onError,

package/src/query/engine.ts

@@ -1,5 +1,6 @@
 import type { Hex } from "viem"
 import type { ArkivClient } from "../clients/baseClient"
+import type { RpcQueryOptions } from "../types/rpcSchema"
 import type { Predicate } from "./predicate"
 
 function processPredicates(predicates: Predicate[]): string {
@@ -42,31 +43,33 @@ export async function processQuery(
 	queryParams: {
 		predicates: Predicate[]
 		limit: number | undefined
-		offset: number | undefined
+		cursor: string | undefined
 		ownedBy: Hex | undefined
-		validBeforeBlock?: number | undefined
+		validAtBlock?: bigint | undefined
 		withAnnotations?: boolean | undefined
 		withMetadata?: boolean | undefined
+		withPayload?: boolean | undefined
 	},
 ) {
-	const { predicates, limit, offset, ownedBy, validBeforeBlock, withAnnotations, withMetadata } =
-		queryParams
+	const {
+		predicates,
+		limit,
+		cursor,
+		ownedBy,
+		validAtBlock,
+		withAnnotations,
+		withMetadata,
+		withPayload,
+	} = queryParams
 
 	console.debug(
-		`Processing query with params: predicates: ${predicates}, limit: ${limit}, offset: ${offset}, ownedBy: ${ownedBy}, validBeforeBlock: ${validBeforeBlock}, withAnnotations: ${withAnnotations}, withMetadata: ${withMetadata}`,
+		`Processing query with params: predicates: ${predicates}, cursor: ${cursor}, limit: ${limit}, ownedBy: ${ownedBy}, validAtBlock: ${validAtBlock}, withAnnotations: ${withAnnotations}, withMetadata: ${withMetadata}, withPayload: ${withPayload}`,
 	)
 
 	let query = processPredicates(predicates)
 	if (ownedBy) {
 		query += ` && $owner=${ownedBy}`
 	}
-	if (limit) {
-		query += ` limit=${limit}`
-	}
-
-	if (offset) {
-		query += ` offset=${offset}`
-	}
 
 	// remove leading and trailing spaces and leading &&
 	query = query.trim()
@@ -74,11 +77,31 @@ export async function processQuery(
 		query = query.slice(3)
 	}
 
-	console.debug(`Built query to send: ${query}`)
+	const queryOptions: RpcQueryOptions = {
+		includeData: {
+			key: true,
+			annotations: withAnnotations ?? false,
+			payload: withPayload ?? false,
+			expiration: withMetadata ?? false,
+			owner: withMetadata ?? false,
+		},
+	}
+
+	if (validAtBlock !== undefined) {
+		queryOptions.atBlock = validAtBlock
+	}
+	if (limit !== undefined) {
+		queryOptions.resultsPerPage = limit
+	}
+	if (cursor !== undefined) {
+		queryOptions.cursor = cursor
+	}
+
+	console.debug(`Built query to send: ${query}, queryOptions: ${JSON.stringify(queryOptions)}`)
 
 	const result = await client.request({
-		method: "golembase_queryEntities",
-		params: [query],
+		method: "arkiv_query",
+		params: [query, queryOptions],
 	})
 	console.debug("Raw result from query: ", result)
 

package/src/query/errors.ts

@@ -4,9 +4,9 @@ export class NoMoreResultsError extends Error {
 	}
 }
 
-export class NoOffsetOrLimitError extends Error {
+export class NoCursorOrLimitError extends Error {
 	constructor() {
-		super("Offset and limit must be defined to fetch next or previous")
+		super("Cursor and limit must be defined to fetch next")
 	}
 }
 
@@ -15,3 +15,9 @@ export class OffsetCannotBeLessThanZeroError extends Error {
 		super("Offset cannot be less than 0")
 	}
 }
+
+export class NoEntityFoundError extends Error {
+	constructor() {
+		super("No entity found")
+	}
+}

package/src/query/queryBuilder.ts

@@ -14,11 +14,12 @@ import { QueryResult } from "./queryResult"
 export class QueryBuilder {
 	private _client: ArkivClient
 	private _ownedBy: Hex | undefined
-	private _validBeforeBlock: number | undefined
+	private _validAtBlock: bigint | undefined
 	private _withAnnotations: boolean | undefined
 	private _withMetadata: boolean | undefined
+	private _withPayload: boolean | undefined
 	private _limit: number | undefined
-	private _offset: number | undefined
+	private _cursor: string | undefined
 	private _predicates: Predicate[]
 
 	constructor(client: ArkivClient) {
@@ -68,6 +69,20 @@ export class QueryBuilder {
 		return this
 	}
 
+	/**
+	 * Sets the withPayload flag which will return the payload for the entities if true
+	 * @param withPayload - The boolean value to set
+	 * @returns The QueryBuilder instance
+	 *
+	 * @example
+	 * const builder = new QueryBuilder(client)
+	 * builder.withPayload(true)
+	 */
+	withPayload(withPayload: boolean = true) {
+		this._withPayload = withPayload
+		return this
+	}
+
 	/**
 	 * Sets the limit for the query
 	 * @param limit - The number of entities to return
@@ -83,16 +98,31 @@ export class QueryBuilder {
 	}
 
 	/**
-	 * Sets the offset for the query
-	 * @param offset - The number of entities to skip
+	 * Sets the cursor for the query - it is advances setting which rather shouldn't be used manually but it is provided from query result if limit is used (pagination).
+	 * @param cursor - The cursor to set which tells to RPC Query server where to start or continue the query.
 	 * @returns The QueryBuilder instance
 	 *
 	 * @example
 	 * const builder = new QueryBuilder(client)
 	 * builder.offset(10)
 	 */
-	offset(offset: number) {
-		this._offset = offset
+	cursor(cursor: string) {
+		this._cursor = cursor
+		return this
+	}
+
+	/**
+	 * Sets the validAtBlock for the query which tells at which block height the state we are intested.
+	 * If not set, the latest block is  used.
+	 * @param validAtBlock - The block number to set
+	 * @returns The QueryBuilder instance
+	 *
+	 * @example
+	 * const builder = new QueryBuilder(client)
+	 * builder.validAtBlock(10000)
+	 */
+	validAtBlock(validAtBlock: bigint) {
+		this._validAtBlock = validAtBlock
 		return this
 	}
 
@@ -135,18 +165,22 @@ export class QueryBuilder {
 		const queryResult = await processQuery(this._client, {
 			predicates: this._predicates,
 			limit: this._limit,
-			offset: this._offset,
+			cursor: this._cursor,
 			ownedBy: this._ownedBy,
-			validBeforeBlock: this._validBeforeBlock,
+			validAtBlock: this._validAtBlock,
 			withAnnotations: this._withAnnotations,
 			withMetadata: this._withMetadata,
+			withPayload: this._withPayload,
 		})
 
 		const entities = await Promise.all(
-			queryResult.map((entity) => entityFromRpcResult(this._client, entity.key, entity.value)),
+			queryResult.data.map((entity) => entityFromRpcResult(entity)),
 		)
 
-		return new QueryResult(entities, this, this._limit, this._offset)
+		this.cursor(queryResult.cursor)
+		this.validAtBlock(queryResult.blockNumber)
+
+		return new QueryResult(entities, this, this._cursor, this._limit, this._validAtBlock)
 	}
 
 	/**
@@ -162,13 +196,14 @@ export class QueryBuilder {
 		const queryResult = await processQuery(this._client, {
 			predicates: this._predicates,
 			limit: this._limit,
-			offset: this._offset,
+			cursor: this._cursor,
 			ownedBy: this._ownedBy,
-			validBeforeBlock: this._validBeforeBlock,
-			withAnnotations: this._withAnnotations,
-			withMetadata: this._withMetadata,
+			validAtBlock: this._validAtBlock,
+			withAnnotations: false,
+			withMetadata: false,
+			withPayload: false,
 		})
 
-		return queryResult.length
+		return queryResult.data.length ?? 0
 	}
 }