@lightsparkdev/lightspark-sdk 1.1.6 → 1.2.0

package/src/objects/LightsparkNode.ts

@@ -1,231 +1,141 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
 
 import { LightsparkException, type Query } from "@lightsparkdev/core";
-import autoBind from "auto-bind";
 import type LightsparkClient from "../client.js";
+import type Balances from "./Balances.js";
+import { BalancesFromJson, BalancesToJson } from "./Balances.js";
 import BitcoinNetwork from "./BitcoinNetwork.js";
 import type BlockchainBalance from "./BlockchainBalance.js";
-import { BlockchainBalanceFromJson } from "./BlockchainBalance.js";
+import {
+  BlockchainBalanceFromJson,
+  BlockchainBalanceToJson,
+} from "./BlockchainBalance.js";
 import type ChannelStatus from "./ChannelStatus.js";
 import type CurrencyAmount from "./CurrencyAmount.js";
-import { CurrencyAmountFromJson } from "./CurrencyAmount.js";
+import {
+  CurrencyAmountFromJson,
+  CurrencyAmountToJson,
+} from "./CurrencyAmount.js";
 import LightsparkNodeStatus from "./LightsparkNodeStatus.js";
 import type LightsparkNodeToChannelsConnection from "./LightsparkNodeToChannelsConnection.js";
-import { LightsparkNodeToChannelsConnectionFromJson } from "./LightsparkNodeToChannelsConnection.js";
 import LightsparkNodeWithOSK from "./LightsparkNodeWithOSK.js";
 import LightsparkNodeWithRemoteSigning from "./LightsparkNodeWithRemoteSigning.js";
-import type Node from "./Node.js";
 import type NodeAddressType from "./NodeAddressType.js";
 import type NodeToAddressesConnection from "./NodeToAddressesConnection.js";
-import { NodeToAddressesConnectionFromJson } from "./NodeToAddressesConnection.js";
-import { SecretFromJson } from "./Secret.js";
+import { SecretFromJson, SecretToJson } from "./Secret.js";
 
 /** This is an object representing a node managed by Lightspark and owned by the current connected account. This object contains information about the node’s configuration, state, and metadata. **/
-class LightsparkNode implements Node {
-  constructor(
-    public readonly id: string,
-    public readonly createdAt: string,
-    public readonly updatedAt: string,
-    public readonly bitcoinNetwork: BitcoinNetwork,
-    public readonly displayName: string,
-    public readonly ownerId: string,
-    public readonly umaPrescreeningUtxos: string[],
-    public readonly typename: string,
-    public readonly alias?: string,
-    public readonly color?: string,
-    public readonly conductivity?: number,
-    public readonly publicKey?: string,
-    public readonly status?: LightsparkNodeStatus,
-    public readonly totalBalance?: CurrencyAmount,
-    public readonly totalLocalBalance?: CurrencyAmount,
-    public readonly localBalance?: CurrencyAmount,
-    public readonly remoteBalance?: CurrencyAmount,
-    public readonly blockchainBalance?: BlockchainBalance,
-  ) {
-    autoBind(this);
-  }
+interface LightsparkNode {
+  /**
+   * The unique identifier of this entity across all Lightspark systems. Should be treated as an opaque
+   * string.
+   **/
+  id: string;
 
-  public async getAddresses(
-    client: LightsparkClient,
-    first: number | undefined = undefined,
-    types: NodeAddressType[] | undefined = undefined,
-  ): Promise<NodeToAddressesConnection> {
-    return (await client.executeRawQuery({
-      queryPayload: ` 
-query FetchNodeToAddressesConnection($entity_id: ID!, $first: Int, $types: [NodeAddressType!]) {
-    entity(id: $entity_id) {
-        ... on LightsparkNode {
-            addresses(, first: $first, types: $types) {
-                __typename
-                node_to_addresses_connection_count: count
-                node_to_addresses_connection_entities: entities {
-                    __typename
-                    node_address_address: address
-                    node_address_type: type
-                }
-            }
-        }
-    }
-}
-`,
-      variables: { entity_id: this.id, first: first, types: types },
-      constructObject: (json) => {
-        const connection = json["entity"]["addresses"];
-        return NodeToAddressesConnectionFromJson(connection);
-      },
-    }))!;
-  }
+  /** The date and time when the entity was first created. **/
+  createdAt: string;
 
-  public async getChannels(
-    client: LightsparkClient,
-    first: number | undefined = undefined,
-    statuses: ChannelStatus[] | undefined = undefined,
-    after: string | undefined = undefined,
-  ): Promise<LightsparkNodeToChannelsConnection> {
-    return (await client.executeRawQuery({
-      queryPayload: ` 
-query FetchLightsparkNodeToChannelsConnection($entity_id: ID!, $first: Int, $statuses: [ChannelStatus!], $after: String) {
-    entity(id: $entity_id) {
-        ... on LightsparkNode {
-            channels(, first: $first, statuses: $statuses, after: $after) {
-                __typename
-                lightspark_node_to_channels_connection_count: count
-                lightspark_node_to_channels_connection_page_info: page_info {
-                    __typename
-                    page_info_has_next_page: has_next_page
-                    page_info_has_previous_page: has_previous_page
-                    page_info_start_cursor: start_cursor
-                    page_info_end_cursor: end_cursor
-                }
-                lightspark_node_to_channels_connection_entities: entities {
-                    __typename
-                    channel_id: id
-                    channel_created_at: created_at
-                    channel_updated_at: updated_at
-                    channel_funding_transaction: funding_transaction {
-                        id
-                    }
-                    channel_capacity: capacity {
-                        __typename
-                        currency_amount_original_value: original_value
-                        currency_amount_original_unit: original_unit
-                        currency_amount_preferred_currency_unit: preferred_currency_unit
-                        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
-                        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
-                    }
-                    channel_local_balance: local_balance {
-                        __typename
-                        currency_amount_original_value: original_value
-                        currency_amount_original_unit: original_unit
-                        currency_amount_preferred_currency_unit: preferred_currency_unit
-                        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
-                        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
-                    }
-                    channel_local_unsettled_balance: local_unsettled_balance {
-                        __typename
-                        currency_amount_original_value: original_value
-                        currency_amount_original_unit: original_unit
-                        currency_amount_preferred_currency_unit: preferred_currency_unit
-                        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
-                        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
-                    }
-                    channel_remote_balance: remote_balance {
-                        __typename
-                        currency_amount_original_value: original_value
-                        currency_amount_original_unit: original_unit
-                        currency_amount_preferred_currency_unit: preferred_currency_unit
-                        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
-                        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
-                    }
-                    channel_remote_unsettled_balance: remote_unsettled_balance {
-                        __typename
-                        currency_amount_original_value: original_value
-                        currency_amount_original_unit: original_unit
-                        currency_amount_preferred_currency_unit: preferred_currency_unit
-                        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
-                        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
-                    }
-                    channel_unsettled_balance: unsettled_balance {
-                        __typename
-                        currency_amount_original_value: original_value
-                        currency_amount_original_unit: original_unit
-                        currency_amount_preferred_currency_unit: preferred_currency_unit
-                        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
-                        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
-                    }
-                    channel_total_balance: total_balance {
-                        __typename
-                        currency_amount_original_value: original_value
-                        currency_amount_original_unit: original_unit
-                        currency_amount_preferred_currency_unit: preferred_currency_unit
-                        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
-                        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
-                    }
-                    channel_status: status
-                    channel_estimated_force_closure_wait_minutes: estimated_force_closure_wait_minutes
-                    channel_commit_fee: commit_fee {
-                        __typename
-                        currency_amount_original_value: original_value
-                        currency_amount_original_unit: original_unit
-                        currency_amount_preferred_currency_unit: preferred_currency_unit
-                        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
-                        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
-                    }
-                    channel_fees: fees {
-                        __typename
-                        channel_fees_base_fee: base_fee {
-                            __typename
-                            currency_amount_original_value: original_value
-                            currency_amount_original_unit: original_unit
-                            currency_amount_preferred_currency_unit: preferred_currency_unit
-                            currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
-                            currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
-                        }
-                        channel_fees_fee_rate_per_mil: fee_rate_per_mil
-                    }
-                    channel_remote_node: remote_node {
-                        id
-                    }
-                    channel_local_node: local_node {
-                        id
-                    }
-                    channel_short_channel_id: short_channel_id
-                }
-            }
-        }
-    }
-}
-`,
-      variables: {
-        entity_id: this.id,
-        first: first,
-        statuses: statuses,
-        after: after,
-      },
-      constructObject: (json) => {
-        const connection = json["entity"]["channels"];
-        return LightsparkNodeToChannelsConnectionFromJson(connection);
-      },
-    }))!;
-  }
+  /** The date and time when the entity was last updated. **/
+  updatedAt: string;
 
-  static getLightsparkNodeQuery(id: string): Query<LightsparkNode> {
-    return {
-      queryPayload: `
-query GetLightsparkNode($id: ID!) {
-    entity(id: $id) {
-        ... on LightsparkNode {
-            ...LightsparkNodeFragment
-        }
-    }
-}
+  /** The Bitcoin Network this node is deployed in. **/
+  bitcoinNetwork: BitcoinNetwork;
 
-${FRAGMENT}    
-`,
-      variables: { id },
-      constructObject: (data: any) => LightsparkNodeFromJson(data.entity),
-    };
-  }
+  /**
+   * The name of this node in the network. It will be the most human-readable option possible, depending
+   * on the data available for this node.
+   **/
+  displayName: string;
+
+  /** The owner of this LightsparkNode. **/
+  ownerId: string;
+
+  /**
+   * The utxos of the channels that are connected to this node. This is used in uma flow for
+   * pre-screening.
+   **/
+  umaPrescreeningUtxos: string[];
+
+  /** The typename of the object **/
+  typename: string;
+
+  /**
+   * A name that identifies the node. It has no importance in terms of operating the node, it is just a
+   * way to identify and search for commercial services or popular nodes. This alias can be changed at
+   * any time by the node operator.
+   **/
+  alias?: string | undefined;
+
+  /**
+   * A hexadecimal string that describes a color. For example "#000000" is black, "#FFFFFF" is white. It
+   * has no importance in terms of operating the node, it is just a way to visually differentiate nodes.
+   * That color can be changed at any time by the node operator.
+   **/
+  color?: string | undefined;
+
+  /**
+   * A summary metric used to capture how well positioned a node is to send, receive, or route
+   * transactions efficiently. Maximizing a node's conductivity helps a node’s transactions to be
+   * capital efficient. The value is an integer ranging between 0 and 10 (bounds included).
+   **/
+  conductivity?: number | undefined;
+
+  /** The public key of this node. It acts as a unique identifier of this node in the Lightning Network. **/
+  publicKey?: string | undefined;
+
+  /** The current status of this node. **/
+  status?: LightsparkNodeStatus | undefined;
+
+  /**
+   * The sum of the balance on the Bitcoin Network, channel balances, and commit fees on this node.
+   *
+   * @deprecated Use `balances` instead.
+   **/
+  totalBalance?: CurrencyAmount | undefined;
+
+  /**
+   * The total sum of the channel balances (online and offline) on this node.
+   *
+   * @deprecated Use `balances` instead.
+   **/
+  totalLocalBalance?: CurrencyAmount | undefined;
+
+  /**
+   * The sum of the channel balances (online only) that are available to send on this node.
+   *
+   * @deprecated Use `balances` instead.
+   **/
+  localBalance?: CurrencyAmount | undefined;
+
+  /**
+   * The sum of the channel balances that are available to receive on this node.
+   *
+   * @deprecated Use `balances` instead.
+   **/
+  remoteBalance?: CurrencyAmount | undefined;
+
+  /**
+   * The details of the balance of this node on the Bitcoin Network.
+   *
+   * @deprecated Use `balances` instead.
+   **/
+  blockchainBalance?: BlockchainBalance | undefined;
+
+  /** The balances that describe the funds in this node. **/
+  balances?: Balances | undefined;
+
+  getAddresses(
+    client: LightsparkClient,
+    first?: number | undefined,
+    types?: NodeAddressType[] | undefined,
+  ): Promise<NodeToAddressesConnection>;
+
+  getChannels(
+    client: LightsparkClient,
+    first?: number | undefined,
+    statuses?: ChannelStatus[] | undefined,
+    after?: string | undefined,
+  ): Promise<LightsparkNodeToChannelsConnection>;
 }
 
 export const LightsparkNodeFromJson = (obj: any): LightsparkNode => {
@@ -273,6 +183,9 @@ export const LightsparkNodeFromJson = (obj: any): LightsparkNode => {
             obj["lightspark_node_with_o_s_k_blockchain_balance"],
           )
         : undefined,
+      !!obj["lightspark_node_with_o_s_k_balances"]
+        ? BalancesFromJson(obj["lightspark_node_with_o_s_k_balances"])
+        : undefined,
       !!obj["lightspark_node_with_o_s_k_encrypted_signing_private_key"]
         ? SecretFromJson(
             obj["lightspark_node_with_o_s_k_encrypted_signing_private_key"],
@@ -326,6 +239,9 @@ export const LightsparkNodeFromJson = (obj: any): LightsparkNode => {
             obj["lightspark_node_with_remote_signing_blockchain_balance"],
           )
         : undefined,
+      !!obj["lightspark_node_with_remote_signing_balances"]
+        ? BalancesFromJson(obj["lightspark_node_with_remote_signing_balances"])
+        : undefined,
     );
   }
   throw new LightsparkException(
@@ -333,6 +249,121 @@ export const LightsparkNodeFromJson = (obj: any): LightsparkNode => {
     `Couldn't find a concrete type for interface LightsparkNode corresponding to the typename=${obj["__typename"]}`,
   );
 };
+export const LightsparkNodeToJson = (obj: LightsparkNode): any => {
+  if (obj.typename == "LightsparkNodeWithOSK") {
+    const lightsparkNodeWithOSK = obj as LightsparkNodeWithOSK;
+    return {
+      __typename: "LightsparkNodeWithOSK",
+      lightspark_node_with_o_s_k_id: lightsparkNodeWithOSK.id,
+      lightspark_node_with_o_s_k_created_at: lightsparkNodeWithOSK.createdAt,
+      lightspark_node_with_o_s_k_updated_at: lightsparkNodeWithOSK.updatedAt,
+      lightspark_node_with_o_s_k_alias: lightsparkNodeWithOSK.alias,
+      lightspark_node_with_o_s_k_bitcoin_network:
+        lightsparkNodeWithOSK.bitcoinNetwork,
+      lightspark_node_with_o_s_k_color: lightsparkNodeWithOSK.color,
+      lightspark_node_with_o_s_k_conductivity:
+        lightsparkNodeWithOSK.conductivity,
+      lightspark_node_with_o_s_k_display_name:
+        lightsparkNodeWithOSK.displayName,
+      lightspark_node_with_o_s_k_public_key: lightsparkNodeWithOSK.publicKey,
+      lightspark_node_with_o_s_k_owner: { id: lightsparkNodeWithOSK.ownerId },
+      lightspark_node_with_o_s_k_status: lightsparkNodeWithOSK.status,
+      lightspark_node_with_o_s_k_total_balance:
+        lightsparkNodeWithOSK.totalBalance
+          ? CurrencyAmountToJson(lightsparkNodeWithOSK.totalBalance)
+          : undefined,
+      lightspark_node_with_o_s_k_total_local_balance:
+        lightsparkNodeWithOSK.totalLocalBalance
+          ? CurrencyAmountToJson(lightsparkNodeWithOSK.totalLocalBalance)
+          : undefined,
+      lightspark_node_with_o_s_k_local_balance:
+        lightsparkNodeWithOSK.localBalance
+          ? CurrencyAmountToJson(lightsparkNodeWithOSK.localBalance)
+          : undefined,
+      lightspark_node_with_o_s_k_remote_balance:
+        lightsparkNodeWithOSK.remoteBalance
+          ? CurrencyAmountToJson(lightsparkNodeWithOSK.remoteBalance)
+          : undefined,
+      lightspark_node_with_o_s_k_blockchain_balance:
+        lightsparkNodeWithOSK.blockchainBalance
+          ? BlockchainBalanceToJson(lightsparkNodeWithOSK.blockchainBalance)
+          : undefined,
+      lightspark_node_with_o_s_k_uma_prescreening_utxos:
+        lightsparkNodeWithOSK.umaPrescreeningUtxos,
+      lightspark_node_with_o_s_k_balances: lightsparkNodeWithOSK.balances
+        ? BalancesToJson(lightsparkNodeWithOSK.balances)
+        : undefined,
+      lightspark_node_with_o_s_k_encrypted_signing_private_key:
+        lightsparkNodeWithOSK.encryptedSigningPrivateKey
+          ? SecretToJson(lightsparkNodeWithOSK.encryptedSigningPrivateKey)
+          : undefined,
+    };
+  }
+  if (obj.typename == "LightsparkNodeWithRemoteSigning") {
+    const lightsparkNodeWithRemoteSigning =
+      obj as LightsparkNodeWithRemoteSigning;
+    return {
+      __typename: "LightsparkNodeWithRemoteSigning",
+      lightspark_node_with_remote_signing_id:
+        lightsparkNodeWithRemoteSigning.id,
+      lightspark_node_with_remote_signing_created_at:
+        lightsparkNodeWithRemoteSigning.createdAt,
+      lightspark_node_with_remote_signing_updated_at:
+        lightsparkNodeWithRemoteSigning.updatedAt,
+      lightspark_node_with_remote_signing_alias:
+        lightsparkNodeWithRemoteSigning.alias,
+      lightspark_node_with_remote_signing_bitcoin_network:
+        lightsparkNodeWithRemoteSigning.bitcoinNetwork,
+      lightspark_node_with_remote_signing_color:
+        lightsparkNodeWithRemoteSigning.color,
+      lightspark_node_with_remote_signing_conductivity:
+        lightsparkNodeWithRemoteSigning.conductivity,
+      lightspark_node_with_remote_signing_display_name:
+        lightsparkNodeWithRemoteSigning.displayName,
+      lightspark_node_with_remote_signing_public_key:
+        lightsparkNodeWithRemoteSigning.publicKey,
+      lightspark_node_with_remote_signing_owner: {
+        id: lightsparkNodeWithRemoteSigning.ownerId,
+      },
+      lightspark_node_with_remote_signing_status:
+        lightsparkNodeWithRemoteSigning.status,
+      lightspark_node_with_remote_signing_total_balance:
+        lightsparkNodeWithRemoteSigning.totalBalance
+          ? CurrencyAmountToJson(lightsparkNodeWithRemoteSigning.totalBalance)
+          : undefined,
+      lightspark_node_with_remote_signing_total_local_balance:
+        lightsparkNodeWithRemoteSigning.totalLocalBalance
+          ? CurrencyAmountToJson(
+              lightsparkNodeWithRemoteSigning.totalLocalBalance,
+            )
+          : undefined,
+      lightspark_node_with_remote_signing_local_balance:
+        lightsparkNodeWithRemoteSigning.localBalance
+          ? CurrencyAmountToJson(lightsparkNodeWithRemoteSigning.localBalance)
+          : undefined,
+      lightspark_node_with_remote_signing_remote_balance:
+        lightsparkNodeWithRemoteSigning.remoteBalance
+          ? CurrencyAmountToJson(lightsparkNodeWithRemoteSigning.remoteBalance)
+          : undefined,
+      lightspark_node_with_remote_signing_blockchain_balance:
+        lightsparkNodeWithRemoteSigning.blockchainBalance
+          ? BlockchainBalanceToJson(
+              lightsparkNodeWithRemoteSigning.blockchainBalance,
+            )
+          : undefined,
+      lightspark_node_with_remote_signing_uma_prescreening_utxos:
+        lightsparkNodeWithRemoteSigning.umaPrescreeningUtxos,
+      lightspark_node_with_remote_signing_balances:
+        lightsparkNodeWithRemoteSigning.balances
+          ? BalancesToJson(lightsparkNodeWithRemoteSigning.balances)
+          : undefined,
+    };
+  }
+  throw new LightsparkException(
+    "DeserializationError",
+    `Couldn't find a concrete type for interface LightsparkNode corresponding to the typename=${obj.typename}`,
+  );
+};
 
 export const FRAGMENT = `
 fragment LightsparkNodeFragment on LightsparkNode {
@@ -436,6 +467,33 @@ fragment LightsparkNodeFragment on LightsparkNode {
             }
         }
         lightspark_node_with_o_s_k_uma_prescreening_utxos: uma_prescreening_utxos
+        lightspark_node_with_o_s_k_balances: balances {
+            __typename
+            balances_owned_balance: owned_balance {
+                __typename
+                currency_amount_original_value: original_value
+                currency_amount_original_unit: original_unit
+                currency_amount_preferred_currency_unit: preferred_currency_unit
+                currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+                currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+            }
+            balances_available_to_send_balance: available_to_send_balance {
+                __typename
+                currency_amount_original_value: original_value
+                currency_amount_original_unit: original_unit
+                currency_amount_preferred_currency_unit: preferred_currency_unit
+                currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+                currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+            }
+            balances_available_to_withdraw_balance: available_to_withdraw_balance {
+                __typename
+                currency_amount_original_value: original_value
+                currency_amount_original_unit: original_unit
+                currency_amount_preferred_currency_unit: preferred_currency_unit
+                currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+                currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+            }
+        }
         lightspark_node_with_o_s_k_encrypted_signing_private_key: encrypted_signing_private_key {
             __typename
             secret_encrypted_value: encrypted_value
@@ -541,7 +599,52 @@ fragment LightsparkNodeFragment on LightsparkNode {
             }
         }
         lightspark_node_with_remote_signing_uma_prescreening_utxos: uma_prescreening_utxos
+        lightspark_node_with_remote_signing_balances: balances {
+            __typename
+            balances_owned_balance: owned_balance {
+                __typename
+                currency_amount_original_value: original_value
+                currency_amount_original_unit: original_unit
+                currency_amount_preferred_currency_unit: preferred_currency_unit
+                currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+                currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+            }
+            balances_available_to_send_balance: available_to_send_balance {
+                __typename
+                currency_amount_original_value: original_value
+                currency_amount_original_unit: original_unit
+                currency_amount_preferred_currency_unit: preferred_currency_unit
+                currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+                currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+            }
+            balances_available_to_withdraw_balance: available_to_withdraw_balance {
+                __typename
+                currency_amount_original_value: original_value
+                currency_amount_original_unit: original_unit
+                currency_amount_preferred_currency_unit: preferred_currency_unit
+                currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+                currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+            }
+        }
     }
 }`;
 
+export const getLightsparkNodeQuery = (id: string): Query<LightsparkNode> => {
+  return {
+    queryPayload: `
+query GetLightsparkNode($id: ID!) {
+    entity(id: $id) {
+        ... on LightsparkNode {
+            ...LightsparkNodeFragment
+        }
+    }
+}
+
+${FRAGMENT}    
+`,
+    variables: { id },
+    constructObject: (data: any) => LightsparkNodeFromJson(data.entity),
+  };
+};
+
 export default LightsparkNode;

package/src/objects/LightsparkNodeOwner.ts

@@ -2,13 +2,12 @@
 
 import { LightsparkException, type Query } from "@lightsparkdev/core";
 import Account from "./Account.js";
-import { BalancesFromJson } from "./Balances.js";
-import type Entity from "./Entity.js";
+import { BalancesFromJson, BalancesToJson } from "./Balances.js";
 import Wallet from "./Wallet.js";
 import WalletStatus from "./WalletStatus.js";
 
 /** This is an object representing the owner of a LightsparkNode. **/
-type LightsparkNodeOwner = Entity & {
+interface LightsparkNodeOwner {
   /**
    * The unique identifier of this entity across all Lightspark systems. Should be treated as an opaque
    * string.
@@ -23,7 +22,7 @@ type LightsparkNodeOwner = Entity & {
 
   /** The typename of the object **/
   typename: string;
-};
+}
 
 export const LightsparkNodeOwnerFromJson = (obj: any): LightsparkNodeOwner => {
   if (obj["__typename"] == "Account") {
@@ -55,6 +54,38 @@ export const LightsparkNodeOwnerFromJson = (obj: any): LightsparkNodeOwner => {
     `Couldn't find a concrete type for interface LightsparkNodeOwner corresponding to the typename=${obj["__typename"]}`,
   );
 };
+export const LightsparkNodeOwnerToJson = (obj: LightsparkNodeOwner): any => {
+  if (obj.typename == "Account") {
+    const account = obj as Account;
+    return {
+      __typename: "Account",
+      account_id: account.id,
+      account_created_at: account.createdAt,
+      account_updated_at: account.updatedAt,
+      account_name: account.name,
+    };
+  }
+  if (obj.typename == "Wallet") {
+    const wallet = obj as Wallet;
+    return {
+      __typename: "Wallet",
+      wallet_id: wallet.id,
+      wallet_created_at: wallet.createdAt,
+      wallet_updated_at: wallet.updatedAt,
+      wallet_last_login_at: wallet.lastLoginAt,
+      wallet_balances: wallet.balances
+        ? BalancesToJson(wallet.balances)
+        : undefined,
+      wallet_third_party_identifier: wallet.thirdPartyIdentifier,
+      wallet_account: { id: wallet.accountId } ?? undefined,
+      wallet_status: wallet.status,
+    };
+  }
+  throw new LightsparkException(
+    "DeserializationError",
+    `Couldn't find a concrete type for interface LightsparkNodeOwner corresponding to the typename=${obj.typename}`,
+  );
+};
 
 export const FRAGMENT = `
 fragment LightsparkNodeOwnerFragment on LightsparkNodeOwner {

package/src/objects/LightsparkNodeToChannelsConnection.ts

@@ -2,11 +2,10 @@
 
 import type Channel from "./Channel.js";
 import { ChannelFromJson } from "./Channel.js";
-import type Connection from "./Connection.js";
 import type PageInfo from "./PageInfo.js";
-import { PageInfoFromJson } from "./PageInfo.js";
+import { PageInfoFromJson, PageInfoToJson } from "./PageInfo.js";
 
-type LightsparkNodeToChannelsConnection = Connection & {
+interface LightsparkNodeToChannelsConnection {
   /**
    * The total count of objects in this connection, using the current filters. It is different from the
    * number of objects returned in the current page (in the `entities` field).
@@ -21,7 +20,7 @@ type LightsparkNodeToChannelsConnection = Connection & {
 
   /** The typename of the object **/
   typename: string;
-};
+}
 
 export const LightsparkNodeToChannelsConnectionFromJson = (
   obj: any,
@@ -37,6 +36,20 @@ export const LightsparkNodeToChannelsConnectionFromJson = (
     typename: "LightsparkNodeToChannelsConnection",
   } as LightsparkNodeToChannelsConnection;
 };
+export const LightsparkNodeToChannelsConnectionToJson = (
+  obj: LightsparkNodeToChannelsConnection,
+): any => {
+  return {
+    __typename: "LightsparkNodeToChannelsConnection",
+    lightspark_node_to_channels_connection_count: obj.count,
+    lightspark_node_to_channels_connection_page_info: PageInfoToJson(
+      obj.pageInfo,
+    ),
+    lightspark_node_to_channels_connection_entities: obj.entities.map((e) =>
+      e.toJson(),
+    ),
+  };
+};
 
 export const FRAGMENT = `
 fragment LightsparkNodeToChannelsConnectionFragment on LightsparkNodeToChannelsConnection {