Add set & get dedicated node extra fees in chain & client

packages/grid_client/scripts/extraFees.ts

@@ -0,0 +1,26 @@
+import { getClient } from "./client_loader";
+import { log } from "./utils";
+
+async function main() {
+  const grid3 = await getClient();
+
+  const node = { nodeId: 11 };
+
+  // const extraFees = await grid3.contracts.setDedicatedNodeExtraFee({ ...node, extraFee: 5 });
+
+  // console.log(extraFees);
+
+  grid3.contracts
+    .getDedicatedNodeExtraFee(node)
+    .then(res => {
+      log(res);
+    })
+    .catch(err => {
+      throw err;
+    })
+    .finally(() => {
+      grid3.disconnect();
+    });
+}
+
+main();

packages/grid_client/src/modules/contracts.ts

@@ -18,6 +18,7 @@ import {
   ContractsByTwinId,
   ContractState,
   CreateServiceContractModel,
+  GetDedicatedNodePriceModel,
   GetServiceContractModel,
   NameContractCreateModel,
   NameContractGetModel,
@@ -27,6 +28,7 @@ import {
   ServiceContractApproveModel,
   ServiceContractBillModel,
   ServiceContractCancelModel,
+  SetDedicatedNodeExtraFeesModel,
   SetServiceContractFeesModel,
   SetServiceContractMetadataModel,
 } from "./models";
@@ -178,14 +180,27 @@ class Contracts {
   @expose
   @validateInput
   @checkBalance
-  async setMetadataServiceContract(options: SetServiceContractMetadataModel) {
-    return (await this.client.contracts.setServiceMetadata(options)).apply();
+  async setDedicatedNodeExtraFee(options: SetDedicatedNodeExtraFeesModel) {
+    return (await this.client.contracts.setDedicatedNodeExtraFee(options)).apply();
   }
   @expose
   @validateInput
   async getServiceContract(options: GetServiceContractModel) {
     return this.client.contracts.getService(options);
   }
+
+  @expose
+  @validateInput
+  @checkBalance
+  async setMetadataServiceContract(options: SetServiceContractMetadataModel) {
+    return (await this.client.contracts.setServiceMetadata(options)).apply();
+  }
+
+  @expose
+  @validateInput
+  async getDedicatedNodeExtraFee(options: GetDedicatedNodePriceModel) {
+    return this.client.contracts.getDedicatedNodeExtraFee(options);
+  }
   /**
    * WARNING: Please be careful when executing this method, it will delete all your contracts.
    * @returns Promise

packages/grid_client/src/modules/models.ts

@@ -605,6 +605,15 @@ class NetworkGetModel {
   @Expose() @IsString() @IsNotEmpty() @IsAlphanumeric() @MaxLength(NameLength) name: string;
 }
 
+class SetDedicatedNodeExtraFeesModel {
+  @Expose() @IsInt() @IsNotEmpty() @Min(1) nodeId: number;
+  @Expose() @IsInt() @IsNotEmpty() @Min(1) extraFee: number;
+}
+
+class GetDedicatedNodePriceModel {
+  @Expose() @IsInt() @IsNotEmpty() @Min(1) nodeId: number;
+}
+
 export {
   AlgorandAccountCreateModel,
   AlgorandAccountInitModel,
@@ -720,4 +729,6 @@ export {
   GetServiceContractModel,
   NetworkGetModel,
   NodeGetModel,
+  SetDedicatedNodeExtraFeesModel,
+  GetDedicatedNodePriceModel,
 };

packages/tfchain_client/src/contracts.ts

@@ -188,6 +188,14 @@ export interface SetServiceFeesOptions {
   baseFee: number;
   variableFee: number;
 }
+export interface SetDedicatedNodeExtraFeesOptions {
+  nodeId: number;
+  extraFee: number;
+}
+
+export interface GetDedicatedNodePriceOptions {
+  nodeId: number;
+}
 
 export interface SetServiceMetadataOptions {
   serviceId: number;
@@ -214,7 +222,7 @@ class Contracts extends QueryContracts {
 
   @checkConnection
   async createNode(options: CreateNodeOptions) {
-    const extrinsic = await this.client.api.tx.smartContractModule.createNodeContract(
+    const extrinsic = this.client.api.tx.smartContractModule.createNodeContract(
       options.nodeId,
       options.hash,
       options.data,
@@ -226,23 +234,19 @@ class Contracts extends QueryContracts {
 
   @checkConnection
   async updateNode(options: UpdateNodeOptions) {
-    const extrinsic = await this.client.api.tx.smartContractModule.updateNodeContract(
-      options.id,
-      options.hash,
-      options.data,
-    );
+    const extrinsic = this.client.api.tx.smartContractModule.updateNodeContract(options.id, options.hash, options.data);
     return this.client.patchExtrinsic<Contract>(extrinsic);
   }
 
   @checkConnection
   async createName(options: CreateNameOptions) {
-    const extrinsic = await this.client.api.tx.smartContractModule.createNameContract(options.name);
+    const extrinsic = this.client.api.tx.smartContractModule.createNameContract(options.name);
     return this.client.patchExtrinsic<Contract>(extrinsic);
   }
 
   @checkConnection
   async createRent(options: CreateRentOptions) {
-    const extrinsic = await this.client.api.tx.smartContractModule.createRentContract(
+    const extrinsic = this.client.api.tx.smartContractModule.createRentContract(
       options.nodeId,
       options.solutionProviderId,
     );
@@ -255,7 +259,7 @@ class Contracts extends QueryContracts {
     if (!contract) {
       return;
     }
-    const extrinsic = await this.client.api.tx.smartContractModule.cancelContract(options.id);
+    const extrinsic = this.client.api.tx.smartContractModule.cancelContract(options.id);
     return this.client.patchExtrinsic(extrinsic, {
       map: () => options.id,
       resultEvents: ["NodeContractCanceled", "NameContractCanceled", "RentContractCanceled", "ContractCanceled"],
@@ -264,7 +268,7 @@ class Contracts extends QueryContracts {
 
   @checkConnection
   async createService(options: CreateServiceOptions) {
-    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractCreate(
+    const extrinsic = this.client.api.tx.smartContractModule.serviceContractCreate(
       options.serviceAccount,
       options.consumerAccount,
     );
@@ -275,16 +279,16 @@ class Contracts extends QueryContracts {
   async approveService(options: ApproveServiceOptions) {
     let extrinsic: any;
     if (options.approve) {
-      extrinsic = await this.client.api.tx.smartContractModule.serviceContractApprove(options.serviceId);
+      extrinsic = this.client.api.tx.smartContractModule.serviceContractApprove(options.serviceId);
     } else {
-      extrinsic = await this.client.api.tx.smartContractModule.serviceContractReject(options.serviceId);
+      extrinsic = this.client.api.tx.smartContractModule.serviceContractReject(options.serviceId);
     }
     return this.client.patchExtrinsic<ServiceContract>(extrinsic);
   }
 
   @checkConnection
   async billService(options: BillServiceOptions) {
-    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractBill(
+    const extrinsic = this.client.api.tx.smartContractModule.serviceContractBill(
       options.serviceId,
       options.variableAmount,
       options.metadata,
@@ -294,23 +298,35 @@ class Contracts extends QueryContracts {
 
   @checkConnection
   async cancelService(options: CancelServiceOptions) {
-    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractCancel(options.serviceId);
+    const extrinsic = this.client.api.tx.smartContractModule.serviceContractCancel(options.serviceId);
     return this.client.patchExtrinsic(extrinsic, { map: () => options.serviceId });
   }
 
   @checkConnection
   async setServiceFees(options: SetServiceFeesOptions) {
-    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractSetFees(
+    const extrinsic = this.client.api.tx.smartContractModule.serviceContractSetFees(
       options.serviceId,
       options.baseFee,
       options.variableFee,
     );
     return this.client.patchExtrinsic<ServiceContract>(extrinsic);
   }
 
+  @checkConnection
+  async setDedicatedNodeExtraFee(options: SetDedicatedNodeExtraFeesOptions) {
+    const extrinsic = this.client.api.tx.smartContractModule.setDedicatedNodeExtraFee(options.nodeId, options.extraFee);
+    return this.client.patchExtrinsic<RentContract>(extrinsic);
+  }
+
+  @checkConnection
+  async getDedicatedNodeExtraFee(options: GetDedicatedNodePriceOptions) {
+    const res = await this.client.api.query.smartContractModule.dedicatedNodesExtraFee(options.nodeId);
+    return res.toPrimitive() as number;
+  }
+
   @checkConnection
   async setServiceMetadata(options: SetServiceMetadataOptions) {
-    const extrinsic = await this.client.api.tx.smartContractModule.serviceContractSetMetadata(
+    const extrinsic = this.client.api.tx.smartContractModule.serviceContractSetMetadata(
       options.serviceId,
       options.metadata,
     );

packages/tfchain_client/src/nodes.ts

@@ -21,6 +21,7 @@ export interface Node {
   virtualized: boolean;
   serialNumber: string;
   connectionPrice: number;
+  hasGpu: number;
 }
 
 interface NetworkInterfaceType {
@@ -44,6 +45,7 @@ interface NodeResources {
   sru: number;
   cru: number;
   mru: number;
+  gpu: number;
 }
 
 interface NodeLocation {