From a9c9a81b5ab895a7e0867eae37c2ca44cab68d33 Mon Sep 17 00:00:00 2001
From: zaelgohary <zainabelgohary96@gmail.com>
Date: Thu, 19 Feb 2026 15:26:16 +0200
Subject: [PATCH 1/2] Support opt out from billing, stop propagation on icon
 click in node actions

---
 .../src/clients/tf-grid/contracts.ts          |    7 +
 packages/grid_client/src/modules/contracts.ts |   22 +
 packages/grid_client/src/modules/models.ts    |    5 +
 .../components/opt_out_v3_billing.vue         |   71 +
 .../dashboard/components/public_config.vue    |    6 +-
 .../dashboard/components/set_extra_fee.vue    |    6 +-
 .../src/dashboard/components/user_nodes.vue   |   15 +-
 packages/tfchain_client/src/contracts.ts      | 1287 +++++++++--------
 8 files changed, 771 insertions(+), 648 deletions(-)
 create mode 100644 packages/playground/src/dashboard/components/opt_out_v3_billing.vue

diff --git a/packages/grid_client/src/clients/tf-grid/contracts.ts b/packages/grid_client/src/clients/tf-grid/contracts.ts
index be5084abd1..1f709823ea 100644
--- a/packages/grid_client/src/clients/tf-grid/contracts.ts
+++ b/packages/grid_client/src/clients/tf-grid/contracts.ts
@@ -12,6 +12,7 @@ import {
   ExtrinsicResult,
   GetDedicatedNodePriceOptions,
   NodeContractUsedResources,
+  OptOutV3BillingOptions,
   SetDedicatedNodeExtraFeesOptions,
 } from "@threefold/tfchain_client";
 import { GridClientError } from "@threefold/types";
@@ -707,6 +708,12 @@ class TFContracts extends Contracts {
       extraFee: feeUSD,
     });
   }
+
+  async optOutV3Billing(options: OptOutV3BillingOptions) {
+    return await super.optOutV3Billing({
+      nodeId: options.nodeId,
+    });
+  }
 }
 
 export { TFContracts };
diff --git a/packages/grid_client/src/modules/contracts.ts b/packages/grid_client/src/modules/contracts.ts
index 1a75795bd3..2a122c9413 100644
--- a/packages/grid_client/src/modules/contracts.ts
+++ b/packages/grid_client/src/modules/contracts.ts
@@ -47,6 +47,7 @@ import {
   NameContractGetModel,
   NodeContractCreateModel,
   NodeContractUpdateModel,
+  OptOutV3BillingModel,
   RentContractCreateModel,
   RentContractGetModel,
   ServiceContractApproveModel,
@@ -526,6 +527,27 @@ class Contracts {
   async setDedicatedNodeExtraFee(options: SetDedicatedNodeExtraFeesModel) {
     return (await this.client.contracts.setDedicatedNodeExtraFee(options)).apply();
   }
+
+  /**
+   * Opts out of billing for a v3 node.
+   *
+   * This method allows farmers to stop billing flows for a specific v3 node.
+   * After opting out, only Threefold admins will be able to create contracts on that node.
+   *
+   * @param {OptOutV3BillingModel} options - The options object containing the nodeId to opt out of billing.
+   * @returns {Promise<number>} A promise that resolves to the node ID for opting out of billing.
+   * @decorators
+   * - `@expose`: Exposes the method for external use.
+   * - `@validateInput`: Validates the input options.
+   * - `@checkBalance`: Checks the balance before proceeding.
+   */
+  @expose
+  @validateInput
+  @checkBalance
+  async optOutV3Billing(options: OptOutV3BillingModel) {
+    return (await this.client.contracts.optOutV3Billing(options)).apply();
+  }
+
   /**
    * Get contract discount package
    * @param {ContractDiscountPackage} options
diff --git a/packages/grid_client/src/modules/models.ts b/packages/grid_client/src/modules/models.ts
index 8ca86e5735..3a19a2fc89 100644
--- a/packages/grid_client/src/modules/models.ts
+++ b/packages/grid_client/src/modules/models.ts
@@ -861,6 +861,10 @@ class SetDedicatedNodeExtraFeesModel {
   @Expose() @IsNumber() @IsNotEmpty() @Min(0) extraFee: number;
 }
 
+class OptOutV3BillingModel {
+  @Expose() @IsInt() @IsNotEmpty() @Min(1) nodeId: number;
+}
+
 class GetDedicatedNodePriceModel {
   @Expose() @IsInt() @IsNotEmpty() @Min(1) nodeId: number;
 }
@@ -1067,6 +1071,7 @@ export {
   NetworkGetModel,
   NodeGetModel,
   SetDedicatedNodeExtraFeesModel,
+  OptOutV3BillingModel,
   GetDedicatedNodePriceModel,
   SwapToStellarModel,
   ListenToMintCompletedModel,
diff --git a/packages/playground/src/dashboard/components/opt_out_v3_billing.vue b/packages/playground/src/dashboard/components/opt_out_v3_billing.vue
new file mode 100644
index 0000000000..a31b56a5ca
--- /dev/null
+++ b/packages/playground/src/dashboard/components/opt_out_v3_billing.vue
@@ -0,0 +1,71 @@
+<template>
+  <span>
+    <v-tooltip text="Opt Out of V3 Billing">
+      <template #activator="{ props: tooltipProps }">
+        <v-icon
+          class="mx-1"
+          v-bind="tooltipProps"
+          size="large"
+          :disabled="loading"
+          :loading="loading"
+          @click.stop="showDialog = true"
+        >
+          mdi-cash-off
+        </v-icon>
+      </template>
+    </v-tooltip>
+
+    <v-dialog v-model="showDialog" max-width="600" attach="#modals">
+      <v-card>
+        <v-card-title class="bg-primary">Opt Out of V3 Billing</v-card-title>
+        <v-card-text>
+          <v-alert type="warning" class="mb-4"> <strong>Warning:</strong> This action cannot be undone. </v-alert>
+          <p>
+            By opting out of billing for node {{ nodeId }}, you are giving up control of the node to Threefold admins.
+            Billing flows will be stopped, and only users in the Threefold admin list will be able to create contracts
+            on this node.
+          </p>
+        </v-card-text>
+        <v-card-actions class="justify-end my-1 mr-2">
+          <v-btn color="anchor" :disabled="loading" @click="showDialog = false">Cancel</v-btn>
+          <v-btn color="error" :loading="loading" :disabled="loading" @click="handleOptOut">Opt Out</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+  </span>
+</template>
+
+<script lang="ts">
+import { ref } from "vue";
+
+import { useGrid } from "../../stores";
+import { createCustomToast, ToastType } from "../../utils/custom_toast";
+
+export default {
+  name: "OptOutV3Billing",
+  props: {
+    nodeId: { type: Number, required: true },
+  },
+  setup(props) {
+    const showDialog = ref(false);
+    const loading = ref(false);
+    const gridStore = useGrid();
+
+    async function handleOptOut() {
+      try {
+        loading.value = true;
+        await gridStore.grid.contracts.optOutV3Billing({ nodeId: props.nodeId });
+        createCustomToast("Successfully opted out of billing for this node.", ToastType.success);
+        showDialog.value = false;
+      } catch (error) {
+        console.error("Opt out billing error:", error);
+        createCustomToast("Failed to opt out of billing.", ToastType.danger);
+      } finally {
+        loading.value = false;
+      }
+    }
+
+    return { showDialog, loading, handleOptOut };
+  },
+};
+</script>
diff --git a/packages/playground/src/dashboard/components/public_config.vue b/packages/playground/src/dashboard/components/public_config.vue
index 1a0de2adfa..8110a40c51 100644
--- a/packages/playground/src/dashboard/components/public_config.vue
+++ b/packages/playground/src/dashboard/components/public_config.vue
@@ -1,14 +1,14 @@
 <template>
   <span>
     <v-tooltip location="bottom" text="Add a public config">
-      <template #activator="{ props }">
+      <template #activator="{ props: tooltipProps }">
         <v-icon
           class="mx-1"
-          v-bind="props"
+          v-bind="tooltipProps"
           size="large"
           :disabled="isAdding"
           :loading="isAdding"
-          @click="showDialogue = true"
+          @click.stop="showDialogue = true"
         >
           mdi-earth
         </v-icon>
diff --git a/packages/playground/src/dashboard/components/set_extra_fee.vue b/packages/playground/src/dashboard/components/set_extra_fee.vue
index bd33426712..660e1a9b8c 100644
--- a/packages/playground/src/dashboard/components/set_extra_fee.vue
+++ b/packages/playground/src/dashboard/components/set_extra_fee.vue
@@ -1,14 +1,14 @@
 <template>
   <span>
     <v-tooltip text="Set Additional Fees">
-      <template #activator="{ props }">
+      <template #activator="{ props: tooltipProps }">
         <v-icon
           class="mx-1"
-          v-bind="props"
+          v-bind="tooltipProps"
           size="large"
           :disabled="isAdding"
           :loading="isAdding"
-          @click="setupDialog()"
+          @click.stop="setupDialog()"
         >
           mdi-currency-usd
         </v-icon>
diff --git a/packages/playground/src/dashboard/components/user_nodes.vue b/packages/playground/src/dashboard/components/user_nodes.vue
index a9a741ad61..9c3ec00451 100644
--- a/packages/playground/src/dashboard/components/user_nodes.vue
+++ b/packages/playground/src/dashboard/components/user_nodes.vue
@@ -1,9 +1,7 @@
 <template v-if="nodes">
   <div class="my-6">
     <v-card color="primary rounded-0">
-      <v-card-title class="py-1 text-subtitle-1 text-center">
-        Your Nodes
-      </v-card-title>
+      <v-card-title class="py-1 text-subtitle-1 text-center"> Your Nodes </v-card-title>
     </v-card>
     <v-data-table-server
       v-model:page="page"
@@ -46,9 +44,7 @@
 
             <v-card class="mt-4">
               <v-alert class="pa-5" style="height: 20px">
-                <h4 class="text-center font-weight-medium">
-                  Resource Units Reserved
-                </h4>
+                <h4 class="text-center font-weight-medium">Resource Units Reserved</h4>
               </v-alert>
               <v-card-text class="pb-8">
                 <NodeResources :node="item" />
@@ -57,9 +53,7 @@
 
             <v-card v-if="network == 'main'" class="mt-4" focusable single model-value>
               <v-alert class="pa-5" style="height: 20px">
-                <h4 class="text-center font-weight-medium">
-                  Node Statistics
-                </h4>
+                <h4 class="text-center font-weight-medium">Node Statistics</h4>
               </v-alert>
               <v-card-item>
                 <NodeMintingDetails :node="item" />
@@ -84,6 +78,7 @@
           @add-config="config => toggleConfig(item, config)"
         />
         <SetExtraFee class="me-2" :node-id="item.nodeId" />
+        <OptOutV3Billing class="me-2" :node-id="item.nodeId" />
       </template>
 
       <template #[`item.country`]="{ item }">
@@ -112,6 +107,7 @@ import { calculateUptime, getNodeAvailability, getNodeMintingFixupReceipts, type
 
 import NodeResources from "../../components/node_resources.vue";
 import NodeMintingDetails from "./NodeMintingDetails.vue";
+import OptOutV3Billing from "./opt_out_v3_billing.vue";
 import PublicConfig from "./public_config.vue";
 import SetExtraFee from "./set_extra_fee.vue";
 
@@ -119,6 +115,7 @@ export default {
   name: "UserNodes",
   components: {
     NodeMintingDetails,
+    OptOutV3Billing,
     PublicConfig,
     SetExtraFee,
     CardDetails,
diff --git a/packages/tfchain_client/src/contracts.ts b/packages/tfchain_client/src/contracts.ts
index 811e5883cc..eeb4fa6ad4 100644
--- a/packages/tfchain_client/src/contracts.ts
+++ b/packages/tfchain_client/src/contracts.ts
@@ -1,633 +1,654 @@
-import { Decimal } from "decimal.js";
-
-import { Client, QueryClient } from "./client";
-import { TFChainError } from "./errors";
-import { NodeResources } from "./nodes";
-import { ExtrinsicResult, PublicIp } from "./types";
-import { checkConnection, requireCouncil } from "./utils";
-
-const TWO_WEEKS = 1209600000;
-
-interface State {
-  created: null;
-  gracePeriod: number;
-}
-interface NameContract {
-  name: string;
-}
-
-export interface ContractLockOptions {
-  id: number;
-}
-
-export interface ContractLock {
-  extraAmountLocked: number;
-  amountLocked: number;
-  lockUpdated: number;
-  cycles: number;
-}
-export interface ContractPaymentState {
-  standardReserve: Decimal;
-  additionalReserve: Decimal;
-  standardOverdraft: Decimal;
-  additionalOverdraft: Decimal;
-  lastUpdatedSeconds: number;
-  cycles: number;
-}
-
-/** For getting network usage billing info */
-export interface BillingInformation {
-  previousNuReported: number;
-  lastUpdated: number;
-  amountUnbilled: number;
-}
-interface NodeContract {
-  nodeId: number;
-  deploymentHash: string;
-  deploymentData: string;
-  publicIps: number;
-  publicIpsList: PublicIp[];
-}
-
-interface RentContract {
-  nodeId: number;
-}
-interface ContractType {
-  nameContract: NameContract;
-  nodeContract: NodeContract;
-  rentContract: RentContract;
-}
-
-interface Contract {
-  version: number;
-  state: State;
-  contractId: number;
-  twinId: number;
-  contractType: ContractType;
-  solutionProviderId: number;
-}
-
-export interface NodeContractUsedResources {
-  contractId: number;
-  used: NodeResources;
-}
-enum ServiceState {
-  Created = "Created",
-  AgreementReady = "AgreementReady",
-  ApprovedByBoth = "ApprovedByBoth",
-}
-interface ServiceContract {
-  serviceContractId: number;
-  serviceTwinId: number;
-  consumerTwinId: number;
-  baseFee: number;
-  variableFee: number;
-  metadata: string;
-  acceptedByService: boolean;
-  acceptedByConsumer: boolean;
-  lastBill: number;
-  state: ServiceState;
-}
-
-interface QueryContractsGetOptions {
-  id: number;
-}
-
-interface ActiveContractsOptions {
-  nodeId: number;
-}
-
-interface QueryContractsGetContractByActiveRentOptions {
-  nodeId: number;
-}
-
-interface QueryContractGetContractByNameOptions {
-  name: string;
-}
-
-interface QueryContractGetContractByIdAndHashOptions {
-  nodeId: number;
-  hash: string;
-}
-
-interface QueryContractGetServiceOptions {
-  serviceId: number;
-}
-
-class QueryContracts {
-  /**
-   * Represents a class that handles querying contracts on the `TFChain`.
-   * Provides methods to interact with smart contracts related to contracts on the chain.
-   */
-  constructor(public client: QueryClient) {
-    this.client = client;
-  }
-
-  /**
-   * Retrieves a contract based on the provided options.
-   *
-   * @param options - The options to specify which contract to retrieve.
-   * @returns {Promise<Contract>} A Promise that resolves to the retrieved contract.
-   */
-  @checkConnection
-  async get(options: QueryContractsGetOptions): Promise<Contract> {
-    const res = await this.client.api.query.smartContractModule.contracts(options.id);
-    return res.toPrimitive() as unknown as Contract;
-  }
-  /**
-   * Retrieves the resources used by a node contract.
-   *
-   * This function queries the `smartContractModule` to get the resource usage of a specified node contract
-   * based on the provided contract ID. The result is converted to a primitive form and returned as `NodeContractUsedResources`.
-   *
-   * @param {QueryContractsGetOptions} options - Options object containing the contract ID.
-   * @returns {Promise<NodeContractUsedResources>} - The resources used by the node contract.
-   */
-  @checkConnection
-  async getNodeContractResources(options: QueryContractsGetOptions) {
-    const res = await this.client.api.query.smartContractModule.nodeContractResources(options.id);
-    return res.toPrimitive() as unknown as NodeContractUsedResources;
-  }
-
-  /**
-   * Retrieves the `contract ID` for the active `rent contract` associated with a specific node.
-   *
-   * @param options - The options specifying the node ID for which to retrieve the active `rent contract`.
-   * @returns {Promise<number>} A Promise that resolves to the `contract ID` of the active `rent contract` for the specified node.
-   */
-  @checkConnection
-  async getContractIdByActiveRentForNode(options: QueryContractsGetContractByActiveRentOptions): Promise<number> {
-    const res = await this.client.api.query.smartContractModule.activeRentContractForNode(options.nodeId);
-    return res.toPrimitive() as number;
-  }
-
-  /**
-   * Retrieves the active contracts associated with a specific node.
-   *
-   * @param options - The options specifying the node ID for which to retrieve the active contracts.
-   * @returns {Promise<number[]>} A Promise that resolves to an array of contract IDs representing the active contracts for the specified node.
-   */
-  @checkConnection
-  async getActiveContracts(options: ActiveContractsOptions): Promise<number[]> {
-    const res = await this.client.api.query.smartContractModule.activeNodeContracts(options.nodeId);
-    return res.toPrimitive() as number[];
-  }
-
-  /**
-   * Retrieves the `contract ID` by the provided `contract name`.
-   *
-   * @param options - The options specifying the `contract name` to retrieve the `contract ID`.
-   * @returns {Promise<number> } A Promise that resolves to the `contract ID` of the specified `contract name`.
-   */
-  @checkConnection
-  async getContractIdByName(options: QueryContractGetContractByNameOptions): Promise<number> {
-    const res = await this.client.api.query.smartContractModule.contractIDByNameRegistration(options.name);
-    return res.toPrimitive() as number;
-  }
-
-  /**
-   * Retrieves the `contract ID` based on the provided `node ID` and hash.
-   *
-   * @param options - The options specifying the `node ID` and hash to retrieve the `contract ID`.
-   * @returns {Promise<number>} A Promise that resolves to the `contract ID` based on the provided `node ID` and hash.
-   */
-  @checkConnection
-  async getContractIdByNodeIdAndHash(options: QueryContractGetContractByIdAndHashOptions): Promise<number> {
-    const res = await this.client.api.query.smartContractModule.contractIDByNodeIDAndHash(options.nodeId, options.hash);
-    return res.toPrimitive() as number;
-  }
-
-  /**
-   * Retrieves the `lock details` of a contract based on the provided `contract ID`.
-   *
-   * @param options - The options specifying the `contract ID` for which to retrieve the `lock details`.
-   * @returns {Promise<ContractLock>} A Promise that resolves to the `lock details` of the specified contract.
-   */
-  @checkConnection
-  async contractLock(options: ContractLockOptions): Promise<ContractLock> {
-    const res = await this.client.api.query.smartContractModule.contractLock(options.id);
-    return res.toPrimitive() as unknown as ContractLock;
-  }
-  /**
-   * Retrieves the `payment state` of a contract based on the provided `contract ID`.
-   *
-   * @param contractID - The ID for which contract to retrieve its `payment state`.
-   * @returns {Promise<ContractLock>} A Promise that resolves to the `ContractPaymentState` of the specified contract.
-   */
-  @checkConnection
-  async getContractPaymentState(contractID: number) {
-    const res = await this.client.api.query.smartContractModule.contractPaymentState(contractID);
-    return res.toPrimitive() as unknown as ContractPaymentState;
-  }
-
-  /**
-   * Retrieves the deletion time for a contract based on the provided options.
-   *
-   * @param options - The options to specify which contract to retrieve the deletion time for.
-   * @returns {Promise<number>} A Promise that resolves to the deletion time of the contract.
-   */
-  @checkConnection
-  async getDeletionTime(options: QueryContractsGetOptions): Promise<number> {
-    const contract = await this.get(options);
-    if (!contract || contract.state.created === null) return 0;
-
-    const blockNumber = contract.state.gracePeriod;
-
-    try {
-      const currentBlockNumber = +(await this.client.api.query.system.number());
-
-      // each block takes 6 seconds
-      const gracePeriodStartTime = new Date().getTime() - (currentBlockNumber - blockNumber) * 6000;
-
-      return gracePeriodStartTime + TWO_WEEKS;
-    } catch (err) {
-      throw new TFChainError({
-        message: `Error getting current block number for contract ${options.id} deletion: ${err}`,
-      });
-    }
-  }
-
-  /**
-   * Retrieves the `service contract` details based on the provided `service ID`.
-   *
-   * @param options - The options specifying the `service ID` for which to retrieve the `service contract` details.
-   * @returns {Promise<ServiceContract>} A Promise that resolves to the `service contract` details.
-   */
-  @checkConnection
-  async getService(options: QueryContractGetServiceOptions): Promise<ServiceContract> {
-    const res = await this.client.api.query.smartContractModule.serviceContracts(options.serviceId);
-    return res.toPrimitive() as unknown as ServiceContract;
-  }
-
-  /**
-   * Retrieves the `extra fee` associated with a `dedicated node` based on the provided `node ID`.
-   *
-   * @param options - The options specifying the `node ID` for which to retrieve the `extra fee`.
-   * @returns {Promise<number>} A Promise that resolves to the `extra fee` amount for the `dedicated node`.
-   */
-  @checkConnection
-  async getDedicatedNodeExtraFee(options: GetDedicatedNodePriceOptions): Promise<number> {
-    const res = await this.client.api.query.smartContractModule.dedicatedNodesExtraFee(options.nodeId);
-    return res.toPrimitive() as number;
-  }
-  /**
-   * Retrieves the billing information for network usage of a specific contract by its ID.
-   *
-   * This asynchronous function queries the smart contract module to fetch the billing details
-   * associated with the network usage of the given contract ID.
-   *
-   * @param {number} contractId - The contract id to get its billing information.
-   * @returns {Promise<any>} A promise that resolves to the billing information of the contract
-   * related to network usage.
-   */
-  async getContractBillingInformationByID(contractId: number): Promise<BillingInformation> {
-    const res = await this.client.api.query.smartContractModule.contractBillingInformationByID(contractId);
-    return res.toPrimitive() as unknown as BillingInformation;
-  }
-}
-
-export interface CreateNodeOptions {
-  nodeId: number;
-  hash: string;
-  data: string;
-  numberOfPublicIps: number;
-  solutionProviderId: number;
-}
-
-export interface UpdateNodeOptions {
-  id: number;
-  hash: string;
-  data: string;
-}
-
-export interface CreateRentOptions {
-  nodeId: number;
-  solutionProviderId?: number;
-}
-
-export interface CreateServiceOptions {
-  serviceAccount: string;
-  consumerAccount: string;
-}
-
-export interface ApproveServiceOptions {
-  serviceId: number;
-  approve: boolean;
-}
-
-export interface BillServiceOptions {
-  serviceId: number;
-  variableAmount: number;
-  metadata: string;
-}
-
-export interface SetServiceFeesOptions {
-  serviceId: number;
-  baseFee: number;
-  variableFee: number;
-}
-export interface SetDedicatedNodeExtraFeesOptions {
-  nodeId: number;
-  extraFee: number;
-}
-
-export interface GetDedicatedNodePriceOptions {
-  nodeId: number;
-}
-
-export interface SetServiceMetadataOptions {
-  serviceId: number;
-  metadata: string;
-}
-
-export interface CreateNameOptions {
-  name: string;
-}
-
-export interface CancelOptions {
-  id: number;
-}
-
-export interface CancelServiceOptions {
-  serviceId: number;
-}
-
-class Contracts extends QueryContracts {
-  /**
-   * Contracts class represents a collection of methods for interacting with smart contracts.
-   * It extends the QueryContracts class and provides functionalities for creating, updating, canceling, and managing different types of contracts.
-   *
-   * @class Contracts
-   */
-  constructor(public client: Client) {
-    super(client);
-    this.client = client;
-  }
-
-  /**
-   * Creates a node contract.
-   * This method creates a node contract extrinsic with the specified `nodeId`, `hash`, `data`, `numberOfPublicIps`, and `solutionProviderId`.
-   *
-   * @param {CreateNodeOptions} options - The options object containing the `nodeId`, `hash`, `data`, `numberOfPublicIps`, and `solutionProviderId` for creating the node contract.
-   * @returns {Promise<ExtrinsicResult<Contract>>} A promise that resolves to the created Contract extrinsic.
-
-   * @returns {Promise<ExtrinsicResult<Contract>>} A promise that resolves to the created Contract object.
-   */
-  @checkConnection
-  async createNode(options: CreateNodeOptions): Promise<ExtrinsicResult<Contract>> {
-    const extrinsic = await this.client.api.tx.smartContractModule.createNodeContract(
-      options.nodeId,
-      options.hash,
-      options.data,
-      options.numberOfPublicIps,
-      options.solutionProviderId,
-    );
-    return this.client.patchExtrinsic<Contract>(extrinsic);
-  }
-
-  /**
-   * Updates a node contract.
-   *
-   * This method updates a node contract identified by the provided `id` with the new `hash` and `data`.
-   *
-   * @param {UpdateNodeOptions} options - The options object containing the `id`, `hash`, and `data` for updating the node contract.
-   * @returns {Promise<ExtrinsicResult<Contract>>} A promise that resolves to the updated Contract extrinsic.
-   */
-  @checkConnection
-  async updateNode(options: UpdateNodeOptions): Promise<ExtrinsicResult<Contract>> {
-    const extrinsic = await this.client.api.tx.smartContractModule.updateNodeContract(
-      options.id,
-      options.hash,
-      options.data,
-    );
-    return this.client.patchExtrinsic<Contract>(extrinsic);
-  }
-
-  /**
-   * Creates a name contract extrinsic.
-   *
-   * This method creates a name contract with the specified `name`.
-   *
-   * @param {CreateNameOptions} options - The options object containing the `name` for creating the name contract.
-   * @returns {Promise<ExtrinsicResult<Contract>>} A promise that resolves to the created Contract extrinsic.
-   */
-  @checkConnection
-  async createName(options: CreateNameOptions): Promise<ExtrinsicResult<Contract>> {
-    const extrinsic = await this.client.api.tx.smartContractModule.createNameContract(options.name);
-    return this.client.patchExtrinsic<Contract>(extrinsic);
-  }
-
-  /**
-   * Creates a rent contract extrinsic.
-   *
-   * This method creates a rent contract for the specified `nodeId` and `solutionProviderId`.
-   *
-   * @param {CreateRentOptions} options - The options object containing the `nodeId` and optional `solutionProviderId`.
-   * @returns {Promise<ExtrinsicResult<Contract>>} A promise that resolves to the created Contract extrinsic.
-   */
-  @checkConnection
-  async createRent(options: CreateRentOptions): Promise<ExtrinsicResult<Contract>> {
-    const extrinsic = await this.client.api.tx.smartContractModule.createRentContract(
-      options.nodeId,
-      options.solutionProviderId,
-    );
-    return this.client.patchExtrinsic<Contract>(extrinsic);
-  }
-
-  /**
-   * Cancels a contract.
-   *
-   * This method cancels a contract identified by the provided `ID`.
-   *
-   * It first retrieves the contract using the `get` method,
-   * and if the contract exists, it cancels the contract by calling the `cancelContract` extrinsic. It then patches the extrinsic
-   * result with the `contract ID` and specific result events related to contract cancellation.
-   *
-   * @param {CancelOptions} options - The options object containing the `ID` of the contract to be canceled.
-   * @returns {Promise<ExtrinsicResult<number> | undefined>} A promise that resolves with the contract cancelling extrinsic,
-   * * or `undefined` if the contract does not exist.
-   */
-  @checkConnection
-  async cancel(options: CancelOptions): Promise<ExtrinsicResult<number> | undefined> {
-    const contract = await this.get(options);
-    if (!contract) {
-      return;
-    }
-    const extrinsic = await this.client.api.tx.smartContractModule.cancelContract(options.id);
-    return this.client.patchExtrinsic(extrinsic, {
-      resultEvents: ["NodeContractCanceled", "NameContractCanceled", "RentContractCanceled", "ContractCanceled"],
-    });
-  }
-
-  /**
-   * Cancels a contract.
-   *
-   * This method cancels a contract identified by the provided `ID` for any user.
-   * It's a council call that can't be executed by a normal user.
-   *
-   * @param {CancelOptions} options - The options object containing the `ID` of the contract to be canceled.
-   * @returns {Promise<ExtrinsicResult<number> | undefined>} A promise that resolves with the contract cancelling extrinsic,
-   * * or `undefined` if the contract does not exist.
-   */
-  @checkConnection
-  @requireCouncil
-  async cancelCollective(options: CancelOptions) {
-    const contract = await this.get(options);
-    if (!contract) {
-      return;
-    }
-    const extrinsic = await this.client.api.tx.smartContractModule.cancelContractCollective(options.id);
-    return this.client.patchExtrinsic(extrinsic, {
-      map: () => options.id,
-      resultEvents: ["NodeContractCanceled", "NameContractCanceled", "RentContractCanceled", "ContractCanceled"],
-    });
-  }
-
-  /** Creates a new service contract extrinsic.
-   *
-   * This method creates a new service contract extrinsic with the provided `serviceAccount` and `consumerAccount`.
-   *
-   * @param {CreateServiceOptions} options - The options object containing the `serviceAccount` and `consumerAccount` for creating the service contract.
-   * @returns {Promise<ExtrinsicResult<ServiceContract>>} A promise that resolves to the created ServiceContract extrinsic.
-   */
-  @checkConnection
-  async createService(options: CreateServiceOptions): Promise<ExtrinsicResult<ServiceContract>> {
-    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractCreate(
-      options.serviceAccount,
-      options.consumerAccount,
-    );
-    return this.client.patchExtrinsic<ServiceContract>(extrinsic);
-  }
-
-  /**
-   * Approves or rejects a service contract.
-   *
-   * This method either approves or rejects a service contract based on the provided `approve` flag in the `options` object.
-   *
-   * @param {ApproveServiceOptions} options - The options object containing the `serviceId` of the service contract and a boolean `approve` flag indicating whether to approve or reject the contract.
-   * @returns {Promise<ExtrinsicResult<ServiceContract>>} A promise that resolves to the updated ServiceContract extrinsic.
-   */
-  @checkConnection
-  async approveService(options: ApproveServiceOptions): Promise<ExtrinsicResult<ServiceContract>> {
-    let extrinsic: any;
-    if (options.approve) {
-      extrinsic = await this.client.api.tx.smartContractModule.serviceContractApprove(options.serviceId);
-    } else {
-      extrinsic = await this.client.api.tx.smartContractModule.serviceContractReject(options.serviceId);
-    }
-    return this.client.patchExtrinsic<ServiceContract>(extrinsic);
-  }
-
-  /**
-   * Creates an extrinsic for Billing a service contract.
-   *
-   * This method bills a service contract identified by the provided `serviceId` with the specified `variableAmount` and `metadata`.
-   *
-   * @param {BillServiceOptions} options - The options object containing the `serviceId`, `variableAmount`, and `metadata` for billing the service contract.
-   * @returns {Promise<ExtrinsicResult<ServiceContract>>} A promise that resolves to the extrinsic for billing the service contract.
-   */
-  @checkConnection
-  async billService(options: BillServiceOptions): Promise<ExtrinsicResult<ServiceContract>> {
-    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractBill(
-      options.serviceId,
-      options.variableAmount,
-      options.metadata,
-    );
-    return this.client.patchExtrinsic<ServiceContract>(extrinsic);
-  }
-
-  /**
-   * Creates an extrinsic for canceling a service contract.
-   *
-   * This method cancels a service contract identified by the provided `serviceId`.
-   *
-   * @param {CancelServiceOptions} options - The options object containing the `serviceId` of the service contract to be canceled.
-   * @returns {Promise<ExtrinsicResult<any>>} A promise that resolves to the extrinsic of the `service ID` for canceling the service contract.
-   */
-  @checkConnection
-  async cancelService(options: CancelServiceOptions): Promise<ExtrinsicResult<number>> {
-    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractCancel(options.serviceId);
-    return this.client.patchExtrinsic(extrinsic, { map: () => options.serviceId });
-  }
-
-  /**
-   * Sets the service fees for a service contract.
-   *
-   * This method sets the base fee and variable fee for a service contract identified by the provided `serviceId`.
-   *
-   * @param {SetServiceFeesOptions} options - The options object containing the `serviceId`, `baseFee`, and `variableFee` to be set.
-   * @returns {Promise<ExtrinsicResult<ServiceContract>>} A promise that resolves to the extrinsic for setting the fees.
-   */
-  @checkConnection
-  async setServiceFees(options: SetServiceFeesOptions): Promise<ExtrinsicResult<ServiceContract>> {
-    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractSetFees(
-      options.serviceId,
-      options.baseFee,
-      options.variableFee,
-    );
-    return this.client.patchExtrinsic<ServiceContract>(extrinsic);
-  }
-
-  /**
-   * Sets the extra fee for a dedicated node.
-   *
-   * This method sets the extra fee for a dedicated node identified by the provided nodeId.
-   *
-   * @param {SetDedicatedNodeExtraFeesOptions} options - The options object containing the nodeId and extraFee to be set.
-   * @returns {Promise<number>} A promise that resolves to the extrinsic `node ID` for setting the extra fee for the dedicated node.
-   */
-  @checkConnection
-  async setDedicatedNodeExtraFee(options: SetDedicatedNodeExtraFeesOptions): Promise<ExtrinsicResult<number>> {
-    const extrinsic = this.client.api.tx.smartContractModule.setDedicatedNodeExtraFee(options.nodeId, options.extraFee);
-    return this.client.patchExtrinsic<number>(extrinsic);
-  }
-
-  /**
-   * Sets the metadata for a service contract.
-   *
-   * This method sets the metadata for a service contract identified by the provided serviceId.
-   *
-   * @param {SetServiceMetadataOptions} options - The options object containing the serviceId and metadata to be set.
-   * @returns {Promise<ExtrinsicResult<ServiceContract>>} A promise that resolves to the extrinsic for setting the metadata.
-   */
-  @checkConnection
-  async setServiceMetadata(options: SetServiceMetadataOptions): Promise<ExtrinsicResult<ServiceContract>> {
-    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractSetMetadata(
-      options.serviceId,
-      options.metadata,
-    );
-    return this.client.patchExtrinsic<ServiceContract>(extrinsic);
-  }
-
-  /**
-   * unlocks a smart contract by triggering the billing of a contract on this block.
-   *
-   *
-   * @param {number} contractId - Contract ID to be unlocked.
-   * @returns {Promise<ExtrinsicResult<number>>} A promise that resolves to a `ExtrinsicResult<number>` as the `contract ID`.
-   * @note This call doesn't guarantee that the contract will be resumed, it just triggers the billing of it,
-   * if the accounts has enough funds the contract will be resumed
-   *
-   */
-  @checkConnection
-  async unlock(contractId: number): Promise<ExtrinsicResult<number>> {
-    const extrinsic = await this.client.api.tx.smartContractModule.billContractForBlock(contractId);
-    return this.client.patchExtrinsic(extrinsic, {
-      map: () => contractId,
-      resultEvents: ["ContractGracePeriodEnded"],
-    });
-  }
-}
-
-export {
-  Contracts,
-  Contract,
-  QueryContracts,
-  ContractType,
-  State,
-  ServiceContract,
-  NameContract,
-  NodeContract,
-  RentContract,
-  ServiceState,
-};
+import { Decimal } from "decimal.js";
+
+import { Client, QueryClient } from "./client";
+import { TFChainError } from "./errors";
+import { NodeResources } from "./nodes";
+import { ExtrinsicResult, PublicIp } from "./types";
+import { checkConnection, requireCouncil } from "./utils";
+
+const TWO_WEEKS = 1209600000;
+
+interface State {
+  created: null;
+  gracePeriod: number;
+}
+interface NameContract {
+  name: string;
+}
+
+export interface ContractLockOptions {
+  id: number;
+}
+
+export interface ContractLock {
+  extraAmountLocked: number;
+  amountLocked: number;
+  lockUpdated: number;
+  cycles: number;
+}
+export interface ContractPaymentState {
+  standardReserve: Decimal;
+  additionalReserve: Decimal;
+  standardOverdraft: Decimal;
+  additionalOverdraft: Decimal;
+  lastUpdatedSeconds: number;
+  cycles: number;
+}
+
+/** For getting network usage billing info */
+export interface BillingInformation {
+  previousNuReported: number;
+  lastUpdated: number;
+  amountUnbilled: number;
+}
+interface NodeContract {
+  nodeId: number;
+  deploymentHash: string;
+  deploymentData: string;
+  publicIps: number;
+  publicIpsList: PublicIp[];
+}
+
+interface RentContract {
+  nodeId: number;
+}
+interface ContractType {
+  nameContract: NameContract;
+  nodeContract: NodeContract;
+  rentContract: RentContract;
+}
+
+interface Contract {
+  version: number;
+  state: State;
+  contractId: number;
+  twinId: number;
+  contractType: ContractType;
+  solutionProviderId: number;
+}
+
+export interface NodeContractUsedResources {
+  contractId: number;
+  used: NodeResources;
+}
+enum ServiceState {
+  Created = "Created",
+  AgreementReady = "AgreementReady",
+  ApprovedByBoth = "ApprovedByBoth",
+}
+interface ServiceContract {
+  serviceContractId: number;
+  serviceTwinId: number;
+  consumerTwinId: number;
+  baseFee: number;
+  variableFee: number;
+  metadata: string;
+  acceptedByService: boolean;
+  acceptedByConsumer: boolean;
+  lastBill: number;
+  state: ServiceState;
+}
+
+interface QueryContractsGetOptions {
+  id: number;
+}
+
+interface ActiveContractsOptions {
+  nodeId: number;
+}
+
+interface QueryContractsGetContractByActiveRentOptions {
+  nodeId: number;
+}
+
+interface QueryContractGetContractByNameOptions {
+  name: string;
+}
+
+interface QueryContractGetContractByIdAndHashOptions {
+  nodeId: number;
+  hash: string;
+}
+
+interface QueryContractGetServiceOptions {
+  serviceId: number;
+}
+
+class QueryContracts {
+  /**
+   * Represents a class that handles querying contracts on the `TFChain`.
+   * Provides methods to interact with smart contracts related to contracts on the chain.
+   */
+  constructor(public client: QueryClient) {
+    this.client = client;
+  }
+
+  /**
+   * Retrieves a contract based on the provided options.
+   *
+   * @param options - The options to specify which contract to retrieve.
+   * @returns {Promise<Contract>} A Promise that resolves to the retrieved contract.
+   */
+  @checkConnection
+  async get(options: QueryContractsGetOptions): Promise<Contract> {
+    const res = await this.client.api.query.smartContractModule.contracts(options.id);
+    return res.toPrimitive() as unknown as Contract;
+  }
+  /**
+   * Retrieves the resources used by a node contract.
+   *
+   * This function queries the `smartContractModule` to get the resource usage of a specified node contract
+   * based on the provided contract ID. The result is converted to a primitive form and returned as `NodeContractUsedResources`.
+   *
+   * @param {QueryContractsGetOptions} options - Options object containing the contract ID.
+   * @returns {Promise<NodeContractUsedResources>} - The resources used by the node contract.
+   */
+  @checkConnection
+  async getNodeContractResources(options: QueryContractsGetOptions) {
+    const res = await this.client.api.query.smartContractModule.nodeContractResources(options.id);
+    return res.toPrimitive() as unknown as NodeContractUsedResources;
+  }
+
+  /**
+   * Retrieves the `contract ID` for the active `rent contract` associated with a specific node.
+   *
+   * @param options - The options specifying the node ID for which to retrieve the active `rent contract`.
+   * @returns {Promise<number>} A Promise that resolves to the `contract ID` of the active `rent contract` for the specified node.
+   */
+  @checkConnection
+  async getContractIdByActiveRentForNode(options: QueryContractsGetContractByActiveRentOptions): Promise<number> {
+    const res = await this.client.api.query.smartContractModule.activeRentContractForNode(options.nodeId);
+    return res.toPrimitive() as number;
+  }
+
+  /**
+   * Retrieves the active contracts associated with a specific node.
+   *
+   * @param options - The options specifying the node ID for which to retrieve the active contracts.
+   * @returns {Promise<number[]>} A Promise that resolves to an array of contract IDs representing the active contracts for the specified node.
+   */
+  @checkConnection
+  async getActiveContracts(options: ActiveContractsOptions): Promise<number[]> {
+    const res = await this.client.api.query.smartContractModule.activeNodeContracts(options.nodeId);
+    return res.toPrimitive() as number[];
+  }
+
+  /**
+   * Retrieves the `contract ID` by the provided `contract name`.
+   *
+   * @param options - The options specifying the `contract name` to retrieve the `contract ID`.
+   * @returns {Promise<number> } A Promise that resolves to the `contract ID` of the specified `contract name`.
+   */
+  @checkConnection
+  async getContractIdByName(options: QueryContractGetContractByNameOptions): Promise<number> {
+    const res = await this.client.api.query.smartContractModule.contractIDByNameRegistration(options.name);
+    return res.toPrimitive() as number;
+  }
+
+  /**
+   * Retrieves the `contract ID` based on the provided `node ID` and hash.
+   *
+   * @param options - The options specifying the `node ID` and hash to retrieve the `contract ID`.
+   * @returns {Promise<number>} A Promise that resolves to the `contract ID` based on the provided `node ID` and hash.
+   */
+  @checkConnection
+  async getContractIdByNodeIdAndHash(options: QueryContractGetContractByIdAndHashOptions): Promise<number> {
+    const res = await this.client.api.query.smartContractModule.contractIDByNodeIDAndHash(options.nodeId, options.hash);
+    return res.toPrimitive() as number;
+  }
+
+  /**
+   * Retrieves the `lock details` of a contract based on the provided `contract ID`.
+   *
+   * @param options - The options specifying the `contract ID` for which to retrieve the `lock details`.
+   * @returns {Promise<ContractLock>} A Promise that resolves to the `lock details` of the specified contract.
+   */
+  @checkConnection
+  async contractLock(options: ContractLockOptions): Promise<ContractLock> {
+    const res = await this.client.api.query.smartContractModule.contractLock(options.id);
+    return res.toPrimitive() as unknown as ContractLock;
+  }
+  /**
+   * Retrieves the `payment state` of a contract based on the provided `contract ID`.
+   *
+   * @param contractID - The ID for which contract to retrieve its `payment state`.
+   * @returns {Promise<ContractLock>} A Promise that resolves to the `ContractPaymentState` of the specified contract.
+   */
+  @checkConnection
+  async getContractPaymentState(contractID: number) {
+    const res = await this.client.api.query.smartContractModule.contractPaymentState(contractID);
+    return res.toPrimitive() as unknown as ContractPaymentState;
+  }
+
+  /**
+   * Retrieves the deletion time for a contract based on the provided options.
+   *
+   * @param options - The options to specify which contract to retrieve the deletion time for.
+   * @returns {Promise<number>} A Promise that resolves to the deletion time of the contract.
+   */
+  @checkConnection
+  async getDeletionTime(options: QueryContractsGetOptions): Promise<number> {
+    const contract = await this.get(options);
+    if (!contract || contract.state.created === null) return 0;
+
+    const blockNumber = contract.state.gracePeriod;
+
+    try {
+      const currentBlockNumber = +(await this.client.api.query.system.number());
+
+      // each block takes 6 seconds
+      const gracePeriodStartTime = new Date().getTime() - (currentBlockNumber - blockNumber) * 6000;
+
+      return gracePeriodStartTime + TWO_WEEKS;
+    } catch (err) {
+      throw new TFChainError({
+        message: `Error getting current block number for contract ${options.id} deletion: ${err}`,
+      });
+    }
+  }
+
+  /**
+   * Retrieves the `service contract` details based on the provided `service ID`.
+   *
+   * @param options - The options specifying the `service ID` for which to retrieve the `service contract` details.
+   * @returns {Promise<ServiceContract>} A Promise that resolves to the `service contract` details.
+   */
+  @checkConnection
+  async getService(options: QueryContractGetServiceOptions): Promise<ServiceContract> {
+    const res = await this.client.api.query.smartContractModule.serviceContracts(options.serviceId);
+    return res.toPrimitive() as unknown as ServiceContract;
+  }
+
+  /**
+   * Retrieves the `extra fee` associated with a `dedicated node` based on the provided `node ID`.
+   *
+   * @param options - The options specifying the `node ID` for which to retrieve the `extra fee`.
+   * @returns {Promise<number>} A Promise that resolves to the `extra fee` amount for the `dedicated node`.
+   */
+  @checkConnection
+  async getDedicatedNodeExtraFee(options: GetDedicatedNodePriceOptions): Promise<number> {
+    const res = await this.client.api.query.smartContractModule.dedicatedNodesExtraFee(options.nodeId);
+    return res.toPrimitive() as number;
+  }
+  /**
+   * Retrieves the billing information for network usage of a specific contract by its ID.
+   *
+   * This asynchronous function queries the smart contract module to fetch the billing details
+   * associated with the network usage of the given contract ID.
+   *
+   * @param {number} contractId - The contract id to get its billing information.
+   * @returns {Promise<any>} A promise that resolves to the billing information of the contract
+   * related to network usage.
+   */
+  async getContractBillingInformationByID(contractId: number): Promise<BillingInformation> {
+    const res = await this.client.api.query.smartContractModule.contractBillingInformationByID(contractId);
+    return res.toPrimitive() as unknown as BillingInformation;
+  }
+}
+
+export interface CreateNodeOptions {
+  nodeId: number;
+  hash: string;
+  data: string;
+  numberOfPublicIps: number;
+  solutionProviderId: number;
+}
+
+export interface UpdateNodeOptions {
+  id: number;
+  hash: string;
+  data: string;
+}
+
+export interface CreateRentOptions {
+  nodeId: number;
+  solutionProviderId?: number;
+}
+
+export interface CreateServiceOptions {
+  serviceAccount: string;
+  consumerAccount: string;
+}
+
+export interface ApproveServiceOptions {
+  serviceId: number;
+  approve: boolean;
+}
+
+export interface BillServiceOptions {
+  serviceId: number;
+  variableAmount: number;
+  metadata: string;
+}
+
+export interface SetServiceFeesOptions {
+  serviceId: number;
+  baseFee: number;
+  variableFee: number;
+}
+export interface SetDedicatedNodeExtraFeesOptions {
+  nodeId: number;
+  extraFee: number;
+}
+
+export interface OptOutV3BillingOptions {
+  nodeId: number;
+}
+
+export interface GetDedicatedNodePriceOptions {
+  nodeId: number;
+}
+
+export interface SetServiceMetadataOptions {
+  serviceId: number;
+  metadata: string;
+}
+
+export interface CreateNameOptions {
+  name: string;
+}
+
+export interface CancelOptions {
+  id: number;
+}
+
+export interface CancelServiceOptions {
+  serviceId: number;
+}
+
+class Contracts extends QueryContracts {
+  /**
+   * Contracts class represents a collection of methods for interacting with smart contracts.
+   * It extends the QueryContracts class and provides functionalities for creating, updating, canceling, and managing different types of contracts.
+   *
+   * @class Contracts
+   */
+  constructor(public client: Client) {
+    super(client);
+    this.client = client;
+  }
+
+  /**
+   * Creates a node contract.
+   * This method creates a node contract extrinsic with the specified `nodeId`, `hash`, `data`, `numberOfPublicIps`, and `solutionProviderId`.
+   *
+   * @param {CreateNodeOptions} options - The options object containing the `nodeId`, `hash`, `data`, `numberOfPublicIps`, and `solutionProviderId` for creating the node contract.
+   * @returns {Promise<ExtrinsicResult<Contract>>} A promise that resolves to the created Contract extrinsic.
+
+   * @returns {Promise<ExtrinsicResult<Contract>>} A promise that resolves to the created Contract object.
+   */
+  @checkConnection
+  async createNode(options: CreateNodeOptions): Promise<ExtrinsicResult<Contract>> {
+    const extrinsic = await this.client.api.tx.smartContractModule.createNodeContract(
+      options.nodeId,
+      options.hash,
+      options.data,
+      options.numberOfPublicIps,
+      options.solutionProviderId,
+    );
+    return this.client.patchExtrinsic<Contract>(extrinsic);
+  }
+
+  /**
+   * Updates a node contract.
+   *
+   * This method updates a node contract identified by the provided `id` with the new `hash` and `data`.
+   *
+   * @param {UpdateNodeOptions} options - The options object containing the `id`, `hash`, and `data` for updating the node contract.
+   * @returns {Promise<ExtrinsicResult<Contract>>} A promise that resolves to the updated Contract extrinsic.
+   */
+  @checkConnection
+  async updateNode(options: UpdateNodeOptions): Promise<ExtrinsicResult<Contract>> {
+    const extrinsic = await this.client.api.tx.smartContractModule.updateNodeContract(
+      options.id,
+      options.hash,
+      options.data,
+    );
+    return this.client.patchExtrinsic<Contract>(extrinsic);
+  }
+
+  /**
+   * Creates a name contract extrinsic.
+   *
+   * This method creates a name contract with the specified `name`.
+   *
+   * @param {CreateNameOptions} options - The options object containing the `name` for creating the name contract.
+   * @returns {Promise<ExtrinsicResult<Contract>>} A promise that resolves to the created Contract extrinsic.
+   */
+  @checkConnection
+  async createName(options: CreateNameOptions): Promise<ExtrinsicResult<Contract>> {
+    const extrinsic = await this.client.api.tx.smartContractModule.createNameContract(options.name);
+    return this.client.patchExtrinsic<Contract>(extrinsic);
+  }
+
+  /**
+   * Creates a rent contract extrinsic.
+   *
+   * This method creates a rent contract for the specified `nodeId` and `solutionProviderId`.
+   *
+   * @param {CreateRentOptions} options - The options object containing the `nodeId` and optional `solutionProviderId`.
+   * @returns {Promise<ExtrinsicResult<Contract>>} A promise that resolves to the created Contract extrinsic.
+   */
+  @checkConnection
+  async createRent(options: CreateRentOptions): Promise<ExtrinsicResult<Contract>> {
+    const extrinsic = await this.client.api.tx.smartContractModule.createRentContract(
+      options.nodeId,
+      options.solutionProviderId,
+    );
+    return this.client.patchExtrinsic<Contract>(extrinsic);
+  }
+
+  /**
+   * Cancels a contract.
+   *
+   * This method cancels a contract identified by the provided `ID`.
+   *
+   * It first retrieves the contract using the `get` method,
+   * and if the contract exists, it cancels the contract by calling the `cancelContract` extrinsic. It then patches the extrinsic
+   * result with the `contract ID` and specific result events related to contract cancellation.
+   *
+   * @param {CancelOptions} options - The options object containing the `ID` of the contract to be canceled.
+   * @returns {Promise<ExtrinsicResult<number> | undefined>} A promise that resolves with the contract cancelling extrinsic,
+   * * or `undefined` if the contract does not exist.
+   */
+  @checkConnection
+  async cancel(options: CancelOptions): Promise<ExtrinsicResult<number> | undefined> {
+    const contract = await this.get(options);
+    if (!contract) {
+      return;
+    }
+    const extrinsic = await this.client.api.tx.smartContractModule.cancelContract(options.id);
+    return this.client.patchExtrinsic(extrinsic, {
+      resultEvents: ["NodeContractCanceled", "NameContractCanceled", "RentContractCanceled", "ContractCanceled"],
+    });
+  }
+
+  /**
+   * Cancels a contract.
+   *
+   * This method cancels a contract identified by the provided `ID` for any user.
+   * It's a council call that can't be executed by a normal user.
+   *
+   * @param {CancelOptions} options - The options object containing the `ID` of the contract to be canceled.
+   * @returns {Promise<ExtrinsicResult<number> | undefined>} A promise that resolves with the contract cancelling extrinsic,
+   * * or `undefined` if the contract does not exist.
+   */
+  @checkConnection
+  @requireCouncil
+  async cancelCollective(options: CancelOptions) {
+    const contract = await this.get(options);
+    if (!contract) {
+      return;
+    }
+    const extrinsic = await this.client.api.tx.smartContractModule.cancelContractCollective(options.id);
+    return this.client.patchExtrinsic(extrinsic, {
+      map: () => options.id,
+      resultEvents: ["NodeContractCanceled", "NameContractCanceled", "RentContractCanceled", "ContractCanceled"],
+    });
+  }
+
+  /** Creates a new service contract extrinsic.
+   *
+   * This method creates a new service contract extrinsic with the provided `serviceAccount` and `consumerAccount`.
+   *
+   * @param {CreateServiceOptions} options - The options object containing the `serviceAccount` and `consumerAccount` for creating the service contract.
+   * @returns {Promise<ExtrinsicResult<ServiceContract>>} A promise that resolves to the created ServiceContract extrinsic.
+   */
+  @checkConnection
+  async createService(options: CreateServiceOptions): Promise<ExtrinsicResult<ServiceContract>> {
+    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractCreate(
+      options.serviceAccount,
+      options.consumerAccount,
+    );
+    return this.client.patchExtrinsic<ServiceContract>(extrinsic);
+  }
+
+  /**
+   * Approves or rejects a service contract.
+   *
+   * This method either approves or rejects a service contract based on the provided `approve` flag in the `options` object.
+   *
+   * @param {ApproveServiceOptions} options - The options object containing the `serviceId` of the service contract and a boolean `approve` flag indicating whether to approve or reject the contract.
+   * @returns {Promise<ExtrinsicResult<ServiceContract>>} A promise that resolves to the updated ServiceContract extrinsic.
+   */
+  @checkConnection
+  async approveService(options: ApproveServiceOptions): Promise<ExtrinsicResult<ServiceContract>> {
+    let extrinsic: any;
+    if (options.approve) {
+      extrinsic = await this.client.api.tx.smartContractModule.serviceContractApprove(options.serviceId);
+    } else {
+      extrinsic = await this.client.api.tx.smartContractModule.serviceContractReject(options.serviceId);
+    }
+    return this.client.patchExtrinsic<ServiceContract>(extrinsic);
+  }
+
+  /**
+   * Creates an extrinsic for Billing a service contract.
+   *
+   * This method bills a service contract identified by the provided `serviceId` with the specified `variableAmount` and `metadata`.
+   *
+   * @param {BillServiceOptions} options - The options object containing the `serviceId`, `variableAmount`, and `metadata` for billing the service contract.
+   * @returns {Promise<ExtrinsicResult<ServiceContract>>} A promise that resolves to the extrinsic for billing the service contract.
+   */
+  @checkConnection
+  async billService(options: BillServiceOptions): Promise<ExtrinsicResult<ServiceContract>> {
+    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractBill(
+      options.serviceId,
+      options.variableAmount,
+      options.metadata,
+    );
+    return this.client.patchExtrinsic<ServiceContract>(extrinsic);
+  }
+
+  /**
+   * Creates an extrinsic for canceling a service contract.
+   *
+   * This method cancels a service contract identified by the provided `serviceId`.
+   *
+   * @param {CancelServiceOptions} options - The options object containing the `serviceId` of the service contract to be canceled.
+   * @returns {Promise<ExtrinsicResult<any>>} A promise that resolves to the extrinsic of the `service ID` for canceling the service contract.
+   */
+  @checkConnection
+  async cancelService(options: CancelServiceOptions): Promise<ExtrinsicResult<number>> {
+    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractCancel(options.serviceId);
+    return this.client.patchExtrinsic(extrinsic, { map: () => options.serviceId });
+  }
+
+  /**
+   * Sets the service fees for a service contract.
+   *
+   * This method sets the base fee and variable fee for a service contract identified by the provided `serviceId`.
+   *
+   * @param {SetServiceFeesOptions} options - The options object containing the `serviceId`, `baseFee`, and `variableFee` to be set.
+   * @returns {Promise<ExtrinsicResult<ServiceContract>>} A promise that resolves to the extrinsic for setting the fees.
+   */
+  @checkConnection
+  async setServiceFees(options: SetServiceFeesOptions): Promise<ExtrinsicResult<ServiceContract>> {
+    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractSetFees(
+      options.serviceId,
+      options.baseFee,
+      options.variableFee,
+    );
+    return this.client.patchExtrinsic<ServiceContract>(extrinsic);
+  }
+
+  /**
+   * Sets the extra fee for a dedicated node.
+   *
+   * This method sets the extra fee for a dedicated node identified by the provided nodeId.
+   *
+   * @param {SetDedicatedNodeExtraFeesOptions} options - The options object containing the nodeId and extraFee to be set.
+   * @returns {Promise<number>} A promise that resolves to the extrinsic `node ID` for setting the extra fee for the dedicated node.
+   */
+  @checkConnection
+  async setDedicatedNodeExtraFee(options: SetDedicatedNodeExtraFeesOptions): Promise<ExtrinsicResult<number>> {
+    const extrinsic = this.client.api.tx.smartContractModule.setDedicatedNodeExtraFee(options.nodeId, options.extraFee);
+    return this.client.patchExtrinsic<number>(extrinsic);
+  }
+
+  /**
+   * Opts out of billing for a v3 node.
+   *
+   * This method allows farmers to stop billing flows for a specific v3 node.
+   * After opting out, only Threefold admins will be able to create contracts on that node.
+   *
+   * @param {OptOutV3BillingOptions} options - The options object containing the nodeId to opt out of billing.
+   * @returns {Promise<ExtrinsicResult<number>>} A promise that resolves to the extrinsic `node ID` for opting out of billing.
+   */
+  @checkConnection
+  async optOutV3Billing(options: OptOutV3BillingOptions): Promise<ExtrinsicResult<number>> {
+    // Using type assertion since the method may not be in generated types yet
+    const tfgridModule = this.client.api.tx.tfgridModule as any;
+    const extrinsic = tfgridModule.optOutOfV3Billing(options.nodeId);
+    return this.client.patchExtrinsic<number>(extrinsic);
+  }
+
+  /**
+   * Sets the metadata for a service contract.
+   *
+   * This method sets the metadata for a service contract identified by the provided serviceId.
+   *
+   * @param {SetServiceMetadataOptions} options - The options object containing the serviceId and metadata to be set.
+   * @returns {Promise<ExtrinsicResult<ServiceContract>>} A promise that resolves to the extrinsic for setting the metadata.
+   */
+  @checkConnection
+  async setServiceMetadata(options: SetServiceMetadataOptions): Promise<ExtrinsicResult<ServiceContract>> {
+    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractSetMetadata(
+      options.serviceId,
+      options.metadata,
+    );
+    return this.client.patchExtrinsic<ServiceContract>(extrinsic);
+  }
+
+  /**
+   * unlocks a smart contract by triggering the billing of a contract on this block.
+   *
+   *
+   * @param {number} contractId - Contract ID to be unlocked.
+   * @returns {Promise<ExtrinsicResult<number>>} A promise that resolves to a `ExtrinsicResult<number>` as the `contract ID`.
+   * @note This call doesn't guarantee that the contract will be resumed, it just triggers the billing of it,
+   * if the accounts has enough funds the contract will be resumed
+   *
+   */
+  @checkConnection
+  async unlock(contractId: number): Promise<ExtrinsicResult<number>> {
+    const extrinsic = await this.client.api.tx.smartContractModule.billContractForBlock(contractId);
+    return this.client.patchExtrinsic(extrinsic, {
+      map: () => contractId,
+      resultEvents: ["ContractGracePeriodEnded"],
+    });
+  }
+}
+
+export {
+  Contracts,
+  Contract,
+  QueryContracts,
+  ContractType,
+  State,
+  ServiceContract,
+  NameContract,
+  NodeContract,
+  RentContract,
+  ServiceState,
+};

From c1196bd664c4ef2bf995d2dde4509af0373daef1 Mon Sep 17 00:00:00 2001
From: zaelgohary <zainabelgohary96@gmail.com>
Date: Mon, 23 Feb 2026 11:18:13 +0200
Subject: [PATCH 2/2] Disable extra-fee actions on opted-out v3 nodes

---
 packages/grid_client/src/modules/contracts.ts |  8 ++++
 packages/grid_client/src/modules/models.ts    |  5 +++
 .../src/dashboard/components/node_actions.vue | 45 +++++++++++++++++++
 .../components/opt_out_v3_billing.vue         | 37 ++++++++-------
 .../dashboard/components/set_extra_fee.vue    | 27 ++++++-----
 .../src/dashboard/components/user_nodes.vue   | 15 ++-----
 packages/tfchain_client/src/contracts.ts      | 12 +++++
 7 files changed, 111 insertions(+), 38 deletions(-)
 create mode 100644 packages/playground/src/dashboard/components/node_actions.vue

diff --git a/packages/grid_client/src/modules/contracts.ts b/packages/grid_client/src/modules/contracts.ts
index 2a122c9413..89f9fd441c 100644
--- a/packages/grid_client/src/modules/contracts.ts
+++ b/packages/grid_client/src/modules/contracts.ts
@@ -43,6 +43,7 @@ import {
   GetActiveContractsModel,
   GetDedicatedNodePriceModel,
   GetServiceContractModel,
+  IsNodeOptedOutOfV3BillingModel,
   NameContractCreateModel,
   NameContractGetModel,
   NodeContractCreateModel,
@@ -216,6 +217,13 @@ class Contracts {
     return await this.client.contracts.getDedicatedNodeExtraFee(options);
   }
 
+  /** Returns whether the node has opted out of v3 billing. */
+  @expose
+  @validateInput
+  async isNodeOptedOutOfV3Billing(options: IsNodeOptedOutOfV3BillingModel): Promise<boolean> {
+    return await this.client.contracts.isNodeOptedOutOfV3Billing(options);
+  }
+
   /**
    * Retrieves active `contract IDs` based on the provided node ID.
    *
diff --git a/packages/grid_client/src/modules/models.ts b/packages/grid_client/src/modules/models.ts
index 3a19a2fc89..311157e3bc 100644
--- a/packages/grid_client/src/modules/models.ts
+++ b/packages/grid_client/src/modules/models.ts
@@ -869,6 +869,10 @@ class GetDedicatedNodePriceModel {
   @Expose() @IsInt() @IsNotEmpty() @Min(1) nodeId: number;
 }
 
+class IsNodeOptedOutOfV3BillingModel {
+  @Expose() @IsInt() @IsNotEmpty() @Min(1) nodeId: number;
+}
+
 class SwapToStellarModel {
   @Expose() @IsNotEmpty() @IsString() target: string;
   @Expose() @IsNotEmpty() @Min(1) amount: number;
@@ -1073,6 +1077,7 @@ export {
   SetDedicatedNodeExtraFeesModel,
   OptOutV3BillingModel,
   GetDedicatedNodePriceModel,
+  IsNodeOptedOutOfV3BillingModel,
   SwapToStellarModel,
   ListenToMintCompletedModel,
   AddFarmIPModel,
diff --git a/packages/playground/src/dashboard/components/node_actions.vue b/packages/playground/src/dashboard/components/node_actions.vue
new file mode 100644
index 0000000000..79b56aee17
--- /dev/null
+++ b/packages/playground/src/dashboard/components/node_actions.vue
@@ -0,0 +1,45 @@
+<template>
+  <span>
+    <PublicConfig
+      class="me-2"
+      :node-id="nodeId"
+      :farm-id="farmId"
+      @remove-config="$emit('remove-config', $event)"
+      @add-config="$emit('add-config', $event)"
+    />
+    <SetExtraFee class="me-2" :node-id="nodeId" :is-opted-out="isOptedOut" />
+    <OptOutV3Billing class="me-2" :node-id="nodeId" :is-opted-out="isOptedOut" @opted-out="markOptedOut" />
+  </span>
+</template>
+
+<script lang="ts">
+import { ref, watch } from "vue";
+import { useGrid } from "../../stores";
+import OptOutV3Billing from "./opt_out_v3_billing.vue";
+import PublicConfig from "./public_config.vue";
+import SetExtraFee from "./set_extra_fee.vue";
+
+export default {
+  name: "NodeActions",
+  components: { OptOutV3Billing, PublicConfig, SetExtraFee },
+  props: { nodeId: { type: Number, required: true }, farmId: { type: Number, required: true } },
+  emits: ["add-config", "remove-config"],
+  setup(props) {
+    const gridStore = useGrid();
+    const isOptedOut = ref(false);
+    async function fetchOptedOut() {
+      if (!gridStore.grid) return;
+      try {
+        isOptedOut.value = await gridStore.grid.contracts.isNodeOptedOutOfV3Billing({ nodeId: props.nodeId });
+      } catch {
+        isOptedOut.value = false;
+      }
+    }
+    function markOptedOut() {
+      isOptedOut.value = true;
+    }
+    watch(() => props.nodeId, fetchOptedOut, { immediate: true });
+    return { isOptedOut, markOptedOut };
+  },
+};
+</script>
diff --git a/packages/playground/src/dashboard/components/opt_out_v3_billing.vue b/packages/playground/src/dashboard/components/opt_out_v3_billing.vue
index a31b56a5ca..baf1c372fb 100644
--- a/packages/playground/src/dashboard/components/opt_out_v3_billing.vue
+++ b/packages/playground/src/dashboard/components/opt_out_v3_billing.vue
@@ -1,17 +1,17 @@
 <template>
   <span>
-    <v-tooltip text="Opt Out of V3 Billing">
+    <v-tooltip :text="tooltipText">
       <template #activator="{ props: tooltipProps }">
-        <v-icon
-          class="mx-1"
-          v-bind="tooltipProps"
-          size="large"
-          :disabled="loading"
-          :loading="loading"
-          @click.stop="showDialog = true"
-        >
-          mdi-cash-off
-        </v-icon>
+        <span class="d-inline-block mx-1" v-bind="tooltipProps">
+          <v-icon
+            size="large"
+            :disabled="loading || isOptedOut"
+            :loading="loading"
+            @click.stop="!isOptedOut && (showDialog = true)"
+          >
+            mdi-cash-off
+          </v-icon>
+        </span>
       </template>
     </v-tooltip>
 
@@ -22,8 +22,7 @@
           <v-alert type="warning" class="mb-4"> <strong>Warning:</strong> This action cannot be undone. </v-alert>
           <p>
             By opting out of billing for node {{ nodeId }}, you are giving up control of the node to Threefold admins.
-            Billing flows will be stopped, and only users in the Threefold admin list will be able to create contracts
-            on this node.
+            Billing flows will be stopped, and only Threefold admins will be able to create contracts on this node.
           </p>
         </v-card-text>
         <v-card-actions class="justify-end my-1 mr-2">
@@ -36,7 +35,7 @@
 </template>
 
 <script lang="ts">
-import { ref } from "vue";
+import { computed, ref } from "vue";
 
 import { useGrid } from "../../stores";
 import { createCustomToast, ToastType } from "../../utils/custom_toast";
@@ -45,11 +44,16 @@ export default {
   name: "OptOutV3Billing",
   props: {
     nodeId: { type: Number, required: true },
+    isOptedOut: { type: Boolean, default: false },
   },
-  setup(props) {
+  emits: ["opted-out"],
+  setup(props, { emit }) {
     const showDialog = ref(false);
     const loading = ref(false);
     const gridStore = useGrid();
+    const tooltipText = computed(() =>
+      props.isOptedOut ? "Opt Out of V3 Billing (already opted out)" : "Opt Out of V3 Billing",
+    );
 
     async function handleOptOut() {
       try {
@@ -57,6 +61,7 @@ export default {
         await gridStore.grid.contracts.optOutV3Billing({ nodeId: props.nodeId });
         createCustomToast("Successfully opted out of billing for this node.", ToastType.success);
         showDialog.value = false;
+        emit("opted-out", props.nodeId);
       } catch (error) {
         console.error("Opt out billing error:", error);
         createCustomToast("Failed to opt out of billing.", ToastType.danger);
@@ -65,7 +70,7 @@ export default {
       }
     }
 
-    return { showDialog, loading, handleOptOut };
+    return { showDialog, loading, tooltipText, handleOptOut };
   },
 };
 </script>
diff --git a/packages/playground/src/dashboard/components/set_extra_fee.vue b/packages/playground/src/dashboard/components/set_extra_fee.vue
index 660e1a9b8c..77fc8c62a0 100644
--- a/packages/playground/src/dashboard/components/set_extra_fee.vue
+++ b/packages/playground/src/dashboard/components/set_extra_fee.vue
@@ -1,17 +1,17 @@
 <template>
   <span>
-    <v-tooltip text="Set Additional Fees">
+    <v-tooltip :text="tooltipText">
       <template #activator="{ props: tooltipProps }">
-        <v-icon
-          class="mx-1"
-          v-bind="tooltipProps"
-          size="large"
-          :disabled="isAdding"
-          :loading="isAdding"
-          @click.stop="setupDialog()"
-        >
-          mdi-currency-usd
-        </v-icon>
+        <span class="d-inline-block mx-1" v-bind="tooltipProps">
+          <v-icon
+            size="large"
+            :disabled="isAdding || isOptedOut"
+            :loading="isAdding"
+            @click.stop="!isOptedOut && setupDialog()"
+          >
+            mdi-currency-usd
+          </v-icon>
+        </span>
       </template>
     </v-tooltip>
 
@@ -83,12 +83,16 @@ export default {
       type: Number,
       required: true,
     },
+    isOptedOut: { type: Boolean, default: false },
   },
   setup(props) {
     const showDialogue = ref(false);
     const isAdding = ref(false);
     const gridStore = useGrid();
     const valid = ref(false);
+    const tooltipText = computed(() =>
+      props.isOptedOut ? "Set Additional Fees (unavailable - node opted out of v3 billing)" : "Set Additional Fees",
+    );
     const isSetting = ref(false);
     const inputFee = ref(0);
     const isDisabled = computed(() => {
@@ -143,6 +147,7 @@ export default {
       inputFee,
       isSetting,
       isDisabled,
+      tooltipText,
       setExtraFee,
       setupDialog,
       loading,
diff --git a/packages/playground/src/dashboard/components/user_nodes.vue b/packages/playground/src/dashboard/components/user_nodes.vue
index 9c3ec00451..646619bc0d 100644
--- a/packages/playground/src/dashboard/components/user_nodes.vue
+++ b/packages/playground/src/dashboard/components/user_nodes.vue
@@ -70,15 +70,12 @@
       </template>
 
       <template #[`item.actions`]="{ item }">
-        <PublicConfig
-          class="me-2"
+        <NodeActions
           :node-id="item.nodeId"
           :farm-id="item.farmId"
           @remove-config="config => toggleConfig(item, config)"
           @add-config="config => toggleConfig(item, config)"
         />
-        <SetExtraFee class="me-2" :node-id="item.nodeId" />
-        <OptOutV3Billing class="me-2" :node-id="item.nodeId" />
       </template>
 
       <template #[`item.country`]="{ item }">
@@ -107,18 +104,14 @@ import { calculateUptime, getNodeAvailability, getNodeMintingFixupReceipts, type
 
 import NodeResources from "../../components/node_resources.vue";
 import NodeMintingDetails from "./NodeMintingDetails.vue";
-import OptOutV3Billing from "./opt_out_v3_billing.vue";
-import PublicConfig from "./public_config.vue";
-import SetExtraFee from "./set_extra_fee.vue";
+import NodeActions from "./node_actions.vue";
 
 export default {
   name: "UserNodes",
   components: {
-    NodeMintingDetails,
-    OptOutV3Billing,
-    PublicConfig,
-    SetExtraFee,
     CardDetails,
+    NodeActions,
+    NodeMintingDetails,
     NodeResources,
   },
   setup() {
diff --git a/packages/tfchain_client/src/contracts.ts b/packages/tfchain_client/src/contracts.ts
index eeb4fa6ad4..5bb7c5de00 100644
--- a/packages/tfchain_client/src/contracts.ts
+++ b/packages/tfchain_client/src/contracts.ts
@@ -284,6 +284,14 @@ class QueryContracts {
     const res = await this.client.api.query.smartContractModule.contractBillingInformationByID(contractId);
     return res.toPrimitive() as unknown as BillingInformation;
   }
+
+  /** Returns whether the node has opted out of v3 billing. */
+  @checkConnection
+  async isNodeOptedOutOfV3Billing(options: IsNodeOptedOutOfV3BillingOptions): Promise<boolean> {
+    const tfgridModule = this.client.api.query.tfgridModule as any;
+    const res = await tfgridModule.nodeV3BillingOptOut(options.nodeId);
+    return res ? res.isSome : false;
+  }
 }
 
 export interface CreateNodeOptions {
@@ -335,6 +343,10 @@ export interface OptOutV3BillingOptions {
   nodeId: number;
 }
 
+export interface IsNodeOptedOutOfV3BillingOptions {
+  nodeId: number;
+}
+
 export interface GetDedicatedNodePriceOptions {
   nodeId: number;
 }